diff --git a/.dockerignore b/.dockerignore
index b5924c32836..ff561a782b4 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,7 +1,20 @@
-node_modules/
+# Root folder of this turbo monorepo
+# Doesn't send useless context to Docker daemon
+.git
+.github
+about
+apps
+docker
+examples
+i18n
+**/node_modules
+spec
+supabase
+tests
+
+**/.next
 .vercel
-.next
-.env.local
-.env.production
-.env.dev
-.env.*
\ No newline at end of file
+.env.*
+
+.dockerignore
+studio/Dockerfile
diff --git a/.github/workflows/avoid-typos.yml b/.github/workflows/avoid-typos.yml
new file mode 100644
index 00000000000..cd8d982f4aa
--- /dev/null
+++ b/.github/workflows/avoid-typos.yml
@@ -0,0 +1,20 @@
+name: reviewdog
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, edited]
+
+jobs:
+  misspell:
+    name: runner / misspell
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code.
+        uses: actions/checkout@v1
+      - name: misspell
+        uses: reviewdog/action-misspell@v1
+        with:
+          github_token: ${{ secrets.github_token }}
+          locale: "US"
+          reporter: github-pr-review
+          level: error
+          exclude: "*.css"
diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml
index 0a4d1b1fd57..47563fba1ef 100644
--- a/.github/workflows/mirror.yml
+++ b/.github/workflows/mirror.yml
@@ -19,12 +19,16 @@ jobs:
     permissions:
       contents: read
       packages: write
+      id-token: write
     steps:
+      - name: configure aws credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          role-to-assume: ${{ secrets.PROD_AWS_ROLE }}
+          aws-region: us-east-1
       - uses: docker/login-action@v2
         with:
           registry: public.ecr.aws
-          username: ${{ secrets.PROD_ACCESS_KEY_ID }}
-          password: ${{ secrets.PROD_SECRET_ACCESS_KEY }}
       - uses: docker/login-action@v2
         with:
           registry: ghcr.io
diff --git a/LICENSE b/LICENSE
index 438f239eb5d..e029233d99c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 Supabase
+   Copyright 2023 Supabase
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/apps/docs/components/CustomHTMLElements/Heading.tsx b/apps/docs/components/CustomHTMLElements/Heading.tsx
index f1248c38d1c..74f3511b110 100644
--- a/apps/docs/components/CustomHTMLElements/Heading.tsx
+++ b/apps/docs/components/CustomHTMLElements/Heading.tsx
@@ -14,12 +14,22 @@ import { useInView } from 'react-intersection-observer'
  */
 
 interface Props {
-  tag: string
+  tag?: string
+  parseAnchors?: boolean
+  customAnchor?: string
 }
 
-const Heading: React.FC<Props> = ({ tag, children }) => {
+/**
+ * This TOC is used in .mdx files and in .tsx files.
+ * In mdx files, we need to parse the content and format them to match the
+ * expected tocList format (text, link,level).
+ *
+ * In tsx files, we can generate this tocList directly. For these files, we don't
+ * need to parse the <a> and generate anchors
+ */
+const Heading: React.FC<Props> = ({ tag, parseAnchors = false, customAnchor, children }) => {
   const HeadingTag = `${tag}` as any
-  const anchor = getAnchor(children)
+  const anchor = customAnchor ? customAnchor : getAnchor(children)
   const link = `#${anchor}`
 
   const { ref } = useInView({
@@ -33,7 +43,7 @@ const Heading: React.FC<Props> = ({ tag, children }) => {
 
   return (
     <HeadingTag id={anchor} ref={ref} className="group scroll-mt-24">
-      {removeAnchor(children)}
+      {parseAnchors ? removeAnchor(children) : children}
       {anchor && (
         <a href={link} className="ml-2 opacity-0 group-hover:opacity-100 transition">
           #
diff --git a/apps/docs/components/JwtGenerator.js b/apps/docs/components/JwtGenerator.js
index 46dd4758e31..4ac1b05e255 100644
--- a/apps/docs/components/JwtGenerator.js
+++ b/apps/docs/components/JwtGenerator.js
@@ -1,7 +1,7 @@
 import React, { useState } from 'react'
 import KJUR from 'jsrsasign'
 import CodeBlock from './CodeBlock/CodeBlock'
-import { Button } from 'ui'
+import { Button, Select, Input } from 'ui'
 
 const JWT_HEADER = { alg: 'HS256', typ: 'JWT' }
 const now = new Date()
@@ -46,9 +46,8 @@ export default function JwtGenerator({}) {
     <div>
       <div className="grid mb-8">
         <label for="secret">JWT Secret:</label>
-        <input
+        <Input
           id="secret"
-          className="border rounded bg-gray-200 w-full"
           type="text"
           placeholder="JWT Secret (at least 32 characters)"
           value={jwtSecret}
@@ -57,19 +56,15 @@ export default function JwtGenerator({}) {
       </div>
       <div className="grid mb-8">
         <label for="service">Preconfigured Payload:</label>
-        <select
-          id="service"
-          onChange={handleKeySelection}
-          className="border rounded bg-gray-200 w-full"
-        >
-          <option value="anon">ANON_KEY</option>
-          <option value="service">SERVICE_KEY</option>
-        </select>
+        <Select id="service" onChange={handleKeySelection}>
+          <Select.Option value="anon">ANON_KEY</Select.Option>
+          <Select.Option value="service">SERVICE_KEY</Select.Option>
+        </Select>
       </div>
 
       <div className="grid mb-8">
         <label for="token">Payload:</label>
-        <textarea
+        <Input.TextArea
           id="token"
           type="text"
           rows="5"
diff --git a/apps/docs/components/MDX/storage_management.mdx b/apps/docs/components/MDX/storage_management.mdx
new file mode 100644
index 00000000000..d9df719486d
--- /dev/null
+++ b/apps/docs/components/MDX/storage_management.mdx
@@ -0,0 +1,108 @@
+If you upload additional profile photos, they'll accumulate
+in the `avatars` bucket because of their random names with only the latest being referenced
+from `public.profiles` and the older versions getting orphaned.
+
+To automatically remove obsolete storage objects, extend the database
+triggers. Note that it is not sufficient to delete the objects from the
+`storage.objects` table because that would orphan and leak the actual storage objects in
+the S3 backend. Instead, invoke the storage API within Postgres via the `http` extension. 
+
+Enable the [http extension for the `extensions` schema](https://app.supabase.com/project/_/database/extensions) in the Dashboard.
+Then, define the following SQL functions in the SQL Editor to delete
+storage objects via the API:
+
+```SQL
+create or replace function delete_storage_object(bucket text, object text, out status int, out content varchar)
+returns record
+language 'plpgsql'
+security definer
+as $$
+declare
+  project_url varchar := '<YOURPROJECTURL>';
+  service_role_key varchar := '<YOURSERVICEROLEKEY>'; --  full access needed
+  url varchar := project_url||'/storage/v1/object/'||bucket||'/'||object;
+begin
+  select
+      into status, content
+           result.status::int, result.content::varchar
+      FROM extensions.http((
+    'DELETE',
+    url,
+    ARRAY[extensions.http_header('authorization','Bearer '||service_role_key)],
+    NULL,
+    NULL)::extensions.http_request) as result;
+end;
+$$;
+
+create or replace function delete_avatar(avatar_url text, out status int, out content varchar)
+returns record
+language 'plpgsql'
+security definer
+as $$
+begin
+  select
+      into status, content
+           result.status, result.content
+      from public.delete_storage_object('avatars', avatar_url) as result;
+end;
+$$;
+
+```
+
+Next, add a trigger that removes any obsolete avatar whenever the
+profile is updated or deleted:
+
+```SQL
+create or replace function delete_old_avatar()
+returns trigger
+language 'plpgsql'
+security definer
+as $$
+declare
+  status int;
+  content varchar;
+begin
+  if coalesce(old.avatar_url, '') <> ''
+      and (tg_op = 'DELETE' or (old.avatar_url <> new.avatar_url)) then
+    select
+      into status, content
+      result.status, result.content
+      from public.delete_avatar(old.avatar_url) as result;
+    if status <> 200 then
+      raise warning 'Could not delete avatar: % %', status, content;
+    end if;
+  end if;
+  if tg_op = 'DELETE' then
+    return old;
+  end if;
+  return new;
+end;
+$$;
+
+create trigger before_profile_changes
+  before update of avatar_url or delete on public.profiles
+  for each row execute function public.delete_old_avatar();
+
+```
+
+Finally, delete the `public.profile` row before a user is deleted.
+If this step is omitted, you won't be able to delete users without
+first manually deleting their avatar image.
+
+```SQL
+create or replace function delete_old_profile()
+returns trigger
+language 'plpgsql'
+security definer
+as $$
+begin
+  delete from public.profiles where id = old.id;
+  return old;
+end;
+$$;
+
+create trigger before_delete_user
+  before delete on auth.users
+  for each row execute function public.delete_old_profile();
+
+```
diff --git a/apps/docs/components/Navigation/Navigation.constants.ts b/apps/docs/components/Navigation/Navigation.constants.ts
index ab1a7dce36e..43335fc1900 100644
--- a/apps/docs/components/Navigation/Navigation.constants.ts
+++ b/apps/docs/components/Navigation/Navigation.constants.ts
@@ -264,6 +264,7 @@ export const menuItems: NavMenu = {
         { name: 'Compute Add-ons', url: '/guides/platform/compute-add-ons', items: [] },
         { name: 'Custom Domains', url: '/guides/platform/custom-domains', items: [] },
         { name: 'Database Usage', url: '/guides/platform/database-usage', items: [] },
+        { name: 'HTTP Status Codes', url: '/guides/platform/http-status-codes', items: [] },
         { name: 'Logging', url: '/guides/platform/logs', items: [] },
         { name: 'Metrics', url: '/guides/platform/metrics', items: [] },
         {
@@ -275,6 +276,7 @@ export const menuItems: NavMenu = {
         { name: 'Performance Tuning', url: '/guides/platform/performance', items: [] },
         { name: 'Permissions', url: '/guides/platform/permissions', items: [] },
         { name: 'Production Readiness', url: '/guides/platform/going-into-prod', items: [] },
+        { name: 'Troubleshooting', url: '/guides/platform/troubleshooting', items: [] },
       ],
     },
     {
@@ -339,6 +341,7 @@ export const menuItems: NavMenu = {
             { name: 'Draftbit', url: '/guides/integrations/draftbit', items: [] },
             { name: 'Plasmic', url: '/guides/integrations/plasmic', items: [] },
             { name: 'WeWeb', url: '/guides/integrations/weweb', items: [] },
+            { name: 'ILLA', url: '/guides/integrations/illa', items: [] },
           ],
         },
       ],
diff --git a/apps/docs/components/Navigation/NavigationMenu/HomeMenu.tsx b/apps/docs/components/Navigation/NavigationMenu/HomeMenu.tsx
index 9a1f712f859..dc2baf6ffbb 100644
--- a/apps/docs/components/Navigation/NavigationMenu/HomeMenu.tsx
+++ b/apps/docs/components/Navigation/NavigationMenu/HomeMenu.tsx
@@ -95,7 +95,13 @@ const home = [
       level: 'reference_dart',
     },
     {
-      label: 'Tools Reference',
+      label: 'Python',
+      icon: '/img/icons/menu/reference-python',
+      href: '/reference/python/introduction',
+      level: 'reference_python',
+    },
+    {
+      label: 'Tools',
     },
     {
       label: 'Management API',
@@ -106,7 +112,7 @@ const home = [
     {
       label: 'Supabase CLI',
       icon: '/img/icons/menu/reference-cli',
-      href: '/reference/cli/introduction',
+      href: '/guides/cli',
       level: 'reference_javascript',
     },
   ],
diff --git a/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts b/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts
index 2e7b12d4aef..89c2dd1d3f9 100644
--- a/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts
+++ b/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts
@@ -48,6 +48,9 @@ export const gettingstarted = {
         { name: 'ReactJS', url: '/guides/getting-started/quickstarts/reactjs', items: [] },
         { name: 'NextJS', url: '/guides/getting-started/quickstarts/nextjs', items: [] },
         { name: 'Flutter', url: '/guides/getting-started/quickstarts/flutter', items: [] },
+        { name: 'SvelteKit', url: '/guides/getting-started/quickstarts/sveltekit', items: [] },
+        { name: 'SolidJS', url: '/guides/getting-started/quickstarts/solidjs', items: [] },
+        { name: 'Vue', url: '/guides/getting-started/quickstarts/vue', items: [] },
       ],
     },
     {
@@ -320,6 +323,11 @@ export const auth = {
         { name: 'Overview', url: '/guides/auth/auth-helpers', items: [] },
         { name: 'Auth UI', url: '/guides/auth/auth-helpers/auth-ui', items: [] },
         { name: 'Next.js', url: '/guides/auth/auth-helpers/nextjs', items: [] },
+        {
+          name: 'Next.js Server Components',
+          url: '/guides/auth/auth-helpers/nextjs-server-components',
+          items: [],
+        },
         { name: 'Remix', url: '/guides/auth/auth-helpers/remix', items: [] },
         { name: 'SvelteKit', url: '/guides/auth/auth-helpers/sveltekit', items: [] },
       ],
@@ -421,14 +429,30 @@ export const functions = {
   label: 'Edge Functions',
   url: '/guides/functions',
   items: [
+    { name: 'Quickstart', url: '/guides/functions/quickstart', items: [] },
     { name: 'Auth', url: '/guides/functions/auth', items: [] },
     { name: 'CI/CD Workflow', url: '/guides/functions/cicd-workflow', items: [] },
-    { name: 'Best Practices', url: '/guides/functions/best-practices', items: [] },
-    { name: 'Quickstart', url: '/guides/functions/quickstart', items: [] },
+    { name: 'CORS', url: '/guides/functions/cors', items: [] },
+    { name: 'Debugging', url: '/guides/functions/debugging', items: [] },
+    { name: 'Import Maps', url: '/guides/functions/import-maps', items: [] },
+    { name: 'Local Development', url: '/guides/functions/local-development', items: [] },
+    { name: 'Managing Secrets', url: '/guides/functions/secrets', items: [] },
+    { name: 'Schedule Functions', url: '/guides/functions/schedule-functions', items: [] },
     {
       name: 'Examples',
       url: '/guides/functions/examples',
-      items: [{ name: 'OG Image', url: '/guides/functions/examples/og-image', items: [] }],
+      items: [
+        {
+          name: 'Cloudflare Turnstile',
+          url: '/guides/functions/examples/cloudflare-turnstile',
+          items: [],
+        },
+        { name: 'GitHub Actions', url: '/guides/functions/examples/github-actions', items: [] },
+        { name: 'OG Image', url: '/guides/functions/examples/og-image', items: [] },
+        { name: 'Storage Caching', url: '/guides/functions/examples/storage-caching', items: [] },
+        { name: 'Stripe Webhooks', url: '/guides/functions/examples/stripe-webhooks', items: [] },
+        { name: 'Telegram Bot', url: '/guides/functions/examples/telegram-bot', items: [] },
+      ],
     },
   ],
 }
@@ -464,6 +488,25 @@ export const storage = {
   ],
 }
 
+export const supabase_cli = {
+  icon: 'reference-cli',
+  title: 'Supabase CLI',
+  url: '/guides/cli',
+  items: [
+    { name: 'Overview', url: '/guides/cli', items: [] },
+    { name: 'Local Development', url: '/guides/cli/local-development', items: [] },
+    { name: 'Managing Environments', url: '/guides/cli/managing-environments', items: [] },
+    {
+      name: 'Reference',
+      url: undefined,
+      items: [
+        { name: 'Commands', url: '/reference/cli/introduction', items: [] },
+        { name: 'Configuration', url: '/reference/cli/config', items: [] },
+      ],
+    },
+  ],
+}
+
 export const platform = {
   icon: 'platform',
   label: 'Platform',
@@ -484,6 +527,7 @@ export const platform = {
       items: [
         { name: 'Access Control', url: '/guides/platform/access-control', items: [] },
         { name: 'Database Usage', url: '/guides/platform/database-usage', items: [] },
+        { name: 'HTTP Status Codes', url: '/guides/platform/http-status-codes', items: [] },
         { name: 'Logging', url: '/guides/platform/logs', items: [] },
         { name: 'Metrics', url: '/guides/platform/metrics', items: [] },
         {
@@ -519,6 +563,17 @@ export const platform = {
       url: undefined,
       items: [{ name: 'Production Readiness', url: '/guides/platform/going-into-prod', items: [] }],
     },
+    {
+      name: 'Troubleshooting',
+      url: undefined,
+      items: [
+        {
+          name: 'HTTP and Project Issues',
+          url: '/guides/platform/troubleshooting',
+          items: [],
+        },
+      ],
+    },
   ],
 }
 
@@ -556,26 +611,6 @@ export const resources = {
         },
       ],
     },
-    {
-      name: 'Supabase CLI',
-      items: [
-        {
-          name: 'Overview',
-          url: '/guides/resources/supabase-cli',
-          items: [],
-        },
-        {
-          name: 'Local Development',
-          url: '/guides/resources/supabase-cli/local-development',
-          items: [],
-        },
-        {
-          name: 'Managing Environments',
-          url: '/guides/resources/supabase-cli/managing-environments',
-          items: [],
-        },
-      ],
-    },
   ],
 }
 
@@ -672,6 +707,7 @@ export const integrations = {
         { name: 'Directus', url: '/guides/integrations/directus', items: [] },
         { name: 'Draftbit', url: '/guides/integrations/draftbit', items: [] },
         { name: 'Plasmic', url: '/guides/integrations/plasmic', items: [] },
+        { name: 'ILLA', url: '/guides/integrations/illa', items: [] },
       ],
     },
     {
@@ -748,17 +784,24 @@ export const reference_javascript_v2 = {
 
 export const reference_dart_v0 = {
   icon: 'reference-dart',
-  title: 'dart',
+  title: 'Flutter',
   url: '/guides/reference/dart',
   parent: '/reference',
 }
 export const reference_dart_v1 = {
   icon: 'reference-dart',
-  title: 'dart',
+  title: 'Flutter',
   url: '/guides/reference/dart',
   parent: '/reference',
 }
 
+export const reference_python_v2 = {
+  icon: 'reference-python',
+  title: 'Python',
+  url: '/guides/reference/python',
+  parent: '/reference',
+}
+
 export const reference_cli = {
   icon: 'reference-cli',
   title: 'Supabase CLI',
diff --git a/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.tsx b/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.tsx
index cfb4d87b143..ad8e934e6e6 100644
--- a/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.tsx
+++ b/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.tsx
@@ -11,6 +11,9 @@ import spec_js_v1 from '~/../../spec/supabase_js_v1.yml' assert { type: 'yml' }
 import spec_dart_v1 from '~/../../spec/supabase_dart_v1.yml' assert { type: 'yml' }
 // @ts-expect-error
 import spec_dart_v0 from '~/../../spec/supabase_dart_v0.yml' assert { type: 'yml' }
+// @ts-expect-error
+import spec_python_v2 from '~/../../spec/supabase_py_v2.yml' assert { type: 'yml' }
+
 // import { gen_v3 } from '~/lib/refGenerator/helpers'
 import apiCommonSections from '~/../../spec/common-api-sections.json'
 import cliCommonSections from '~/../../spec/common-cli-sections.json'
@@ -47,6 +50,7 @@ export type RefIdOptions =
   | 'reference_javascript_v2'
   | 'reference_dart_v0'
   | 'reference_dart_v1'
+  | 'reference_python_v2'
   | 'reference_cli'
   | 'reference_api'
   | 'reference_self_hosting_auth'
@@ -56,6 +60,7 @@ export type RefIdOptions =
 export type RefKeyOptions =
   | 'javascript'
   | 'dart'
+  | 'python'
   | 'cli'
   | 'api'
   | 'self-hosting-auth'
@@ -65,16 +70,6 @@ export type RefKeyOptions =
 const NavigationMenu = () => {
   const router = useRouter()
 
-  let version = ''
-
-  if (router.asPath.includes('v1')) {
-    version = '_v1'
-  }
-
-  if (router.asPath.includes('v0')) {
-    version = '_v0'
-  }
-
   function handleRouteChange(url: string) {
     switch (url) {
       case `/docs`:
@@ -110,6 +105,9 @@ const NavigationMenu = () => {
       case url.includes(`/docs/guides/integrations`) && url:
         menuState.setMenuLevelId('integrations')
         break
+      case url.includes(`/docs/guides/cli`) && url:
+        menuState.setMenuLevelId('supabase_cli')
+        break
       // JS v1
       case url.includes(`/docs/reference/javascript/v1`) && url:
         menuState.setMenuLevelId('reference_javascript_v1')
@@ -126,6 +124,13 @@ const NavigationMenu = () => {
       case url.includes(`/docs/reference/dart`) && url:
         menuState.setMenuLevelId('reference_dart_v1')
         break
+      // puthon v2 (latest)
+      case url.includes(`/docs/reference/python`) && url:
+        menuState.setMenuLevelId('reference_python_v2')
+        break
+      case url.includes(`/docs/reference/cli/config`) && url:
+        menuState.setMenuLevelId('supabase_cli')
+        break
       case url.includes(`/docs/reference/cli`) && url:
         menuState.setMenuLevelId('reference_cli')
         break
@@ -165,6 +170,7 @@ const NavigationMenu = () => {
   const isFunctionsActive = 'functions' === level
   const isRealtimeActive = 'realtime' === level
   const isStorageActive = 'storage' === level
+  const issupabase_cliActive = 'supabase_cli' === level
   const isPlatformActive = 'platform' === level
   const isResourcesActive = 'resources' === level
   const isSelfHosting = 'self_hosting' === level
@@ -175,6 +181,7 @@ const NavigationMenu = () => {
   const isReference_Javascript_V2 = 'reference_javascript_v2' === level
   const isReference_Dart_V0 = 'reference_dart_v0' === level
   const isReference_Dart_V1 = 'reference_dart_v1' === level
+  const isReference_Python_V2 = 'reference_python_v2' === level
   const isReference_Cli = 'reference_cli' === level
   const isReference_Api = 'reference_api' === level
   const isReference_Self_Hosting_Auth = 'reference_self_hosting_auth' === level
@@ -191,6 +198,7 @@ const NavigationMenu = () => {
       <NavigationMenuGuideList id={'functions'} active={isFunctionsActive} />
       <NavigationMenuGuideList id={'realtime'} active={isRealtimeActive} />
       <NavigationMenuGuideList id={'storage'} active={isStorageActive} />
+      <NavigationMenuGuideList id={'supabase_cli'} active={issupabase_cliActive} />
       <NavigationMenuGuideList id={'platform'} active={isPlatformActive} />
       <NavigationMenuGuideList id={'resources'} active={isResourcesActive} />
       <NavigationMenuGuideList id={'self_hosting'} active={isSelfHosting} />
@@ -229,6 +237,14 @@ const NavigationMenu = () => {
         lib="dart"
         spec={spec_dart_v1}
       />
+      <NavigationMenuRefList
+        key={'reference-python-menu-v2'}
+        id={'reference_python_v2'}
+        active={isReference_Python_V2}
+        commonSections={libCommonSections}
+        lib="python"
+        spec={spec_python_v2}
+      />
       {/* // Tools */}
       <NavigationMenuRefList
         key={'reference-cli-menu'}
diff --git a/apps/docs/components/Navigation/NavigationMenu/NavigationMenuRefList.tsx b/apps/docs/components/Navigation/NavigationMenu/NavigationMenuRefList.tsx
index 206a50d2230..d3c527b8032 100644
--- a/apps/docs/components/Navigation/NavigationMenu/NavigationMenuRefList.tsx
+++ b/apps/docs/components/Navigation/NavigationMenu/NavigationMenuRefList.tsx
@@ -25,6 +25,10 @@ const NavigationMenuRefList: React.FC<INavigationMenuRefList> = ({
   active,
   spec,
 }) => {
+  const filteredSections = commonSections.filter((section) => {
+    return !section.excludes?.includes(id)
+  })
+
   return (
     <div
       className={[
@@ -38,7 +42,7 @@ const NavigationMenuRefList: React.FC<INavigationMenuRefList> = ({
         !active ? 'opacity-0 invisible absolute h-0 overflow-hidden' : '',
       ].join(' ')}
     >
-      <NavigationMenuRefListItems id={id} lib={lib} commonSections={commonSections} spec={spec} />
+      <NavigationMenuRefListItems id={id} lib={lib} commonSections={filteredSections} spec={spec} />
     </div>
   )
 }
diff --git a/apps/docs/components/Navigation/NavigationMenu/NavigationMenuRefListItems.tsx b/apps/docs/components/Navigation/NavigationMenu/NavigationMenuRefListItems.tsx
index 123a34e27ad..27f1e69ba99 100644
--- a/apps/docs/components/Navigation/NavigationMenu/NavigationMenuRefListItems.tsx
+++ b/apps/docs/components/Navigation/NavigationMenu/NavigationMenuRefListItems.tsx
@@ -179,7 +179,7 @@ const Content: React.FC<INavigationMenuRefList> = ({ id, lib, commonSections, sp
   if (!sections) console.error('no common sections imported')
 
   const menu = NavItems[id]
-
+  //console.log(menu)
   const databaseFunctions = find(sections, { title: 'Database' })
     ? find(sections, { title: 'Database' }).items
     : []
diff --git a/apps/docs/components/index.tsx b/apps/docs/components/index.tsx
index 587a5cfee32..0097630387b 100644
--- a/apps/docs/components/index.tsx
+++ b/apps/docs/components/index.tsx
@@ -20,6 +20,7 @@ import QuickstartIntro from './MDX/quickstart_intro.mdx'
 import ProjectSetup from './MDX/project_setup.mdx'
 import SocialProviderSetup from './MDX/social_provider_setup.mdx'
 import SocialProviderSettingsSupabase from './MDX/social_provider_settings_supabase.mdx'
+import StorageManagement from './MDX/storage_management.mdx'
 import { Mermaid } from 'mdx-mermaid/lib/Mermaid'
 import InlineCodeTag from './CustomHTMLElements/InlineCode'
 import React from 'react'
@@ -49,6 +50,7 @@ const components = {
   ProjectSetup,
   SocialProviderSetup,
   SocialProviderSettingsSupabase,
+  StorageManagement,
   Mermaid,
   Extensions,
   Alert: (props: any) => (
diff --git a/apps/docs/components/reference/CLICommandSection.tsx b/apps/docs/components/reference/CLICommandSection.tsx
index f7e86190b4e..9217dd4980f 100644
--- a/apps/docs/components/reference/CLICommandSection.tsx
+++ b/apps/docs/components/reference/CLICommandSection.tsx
@@ -1,25 +1,12 @@
-import { IconChevronRight } from '~/../../packages/ui'
+import ReactMarkdown from 'react-markdown'
+import { IconChevronRight, Tabs } from '~/../../packages/ui'
 // @ts-expect-error
 import spec from '~/../../spec/cli_v1_commands.yaml' assert { type: 'yml' }
 import CodeBlock from '~/components/CodeBlock/CodeBlock'
 import Options from '~/components/Options'
 import Param from '~/components/Params'
 import RefSubLayout from '~/layouts/ref/RefSubLayout'
-
-interface ICommonFunc {
-  id: string
-  title: string
-  slug: string
-  product: string
-  libs: string
-  items: ICommonFunc[]
-}
-
-interface IRefFunctionSection {
-  funcData: ICommonFunc
-  commonFuncData: ICommonFunc
-  spec: any
-}
+import RefDetailCollapse from './RefDetailCollapse'
 
 export type Flag = {
   id: string
@@ -37,16 +24,25 @@ export type AcceptedValue = {
   description?: string
 }
 
+export type Example = {
+  id: string
+  name: string
+  code: string
+  response: string
+  description?: string
+}
+
 export type Command = {
   id: string
   title: string
   description: string
   flags?: Flag[]
   summary: string
-  tags?: []
-  links?: []
-  subcommands?: []
+  tags?: string[]
+  links?: string[]
+  subcommands?: string[]
   usage?: string
+  examples?: Example[]
 }
 
 const CliCommandSection = (props) => {
@@ -70,17 +66,17 @@ const CliCommandSection = (props) => {
                 ' mb-16',
               ].join(' ')}
             >
-              <p className="capitalize mb-4 scroll-mt-16 mt-0 text-scale-1100 text-base">
-                {command.summary}
-              </p>
+              {command.description ? (
+                <div className="prose">
+                  <ReactMarkdown>{command.description}</ReactMarkdown>
+                </div>
+              ) : (
+                <p className="capitalize mb-4 scroll-mt-16 mt-0 text-scale-1100 text-base">
+                  {command.summary}
+                </p>
+              )}
             </header>
 
-            {/* {command.usage && (
-                        <CodeBlock language="bash" className="relative">
-                          {command.usage}
-                        </CodeBlock>
-                      )} */}
-
             {command.subcommands.length > 0 && (
               <div className="mb-3">
                 <h3 className="text-lg text-scale-1200 mb-3">Available Commands</h3>
@@ -126,13 +122,82 @@ const CliCommandSection = (props) => {
           </div>
         </div>
       </RefSubLayout.Details>
-      <RefSubLayout.Examples>
-        {command.usage && (
-          <CodeBlock language="bash" className="relative">
-            {command.usage}
-          </CodeBlock>
-        )}
-      </RefSubLayout.Examples>
+      {(command.examples || command.usage) && (
+        <RefSubLayout.Examples>
+          <div className="overflow-hidden w-full">
+            <Tabs
+              defaultActiveId={`${command.id}-basic-usage`}
+              size="tiny"
+              type="rounded-pills"
+              scrollable
+            >
+              {command.examples ? (
+                command.examples.map((example) => {
+                  const exampleId = `${command.id}-${example.id}`
+                  return (
+                    <Tabs.Panel
+                      id={exampleId}
+                      key={exampleId}
+                      label={example.name}
+                      className="flex flex-col gap-3"
+                    >
+                      <CodeBlock
+                        className="useless-code-block-class"
+                        language="bash"
+                        hideLineNumbers={true}
+                      >
+                        {example.code}
+                      </CodeBlock>
+
+                      <RefDetailCollapse
+                        id={`${exampleId}-response`}
+                        label="Response"
+                        defaultOpen={false}
+                      >
+                        <CodeBlock
+                          className="useless-code-block-class rounded !rounded-tl-none !rounded-tr-none border border-scale-500"
+                          language="bash"
+                          hideLineNumbers={true}
+                        >
+                          {example.response}
+                        </CodeBlock>
+                      </RefDetailCollapse>
+
+                      {example.description && (
+                        <RefDetailCollapse
+                          id={`${exampleId}-notes`}
+                          label="Notes"
+                          defaultOpen={false}
+                        >
+                          <div className="bg-scale-300 border border-scale-500 rounded !rounded-tl-none !rounded-tr-none prose max-w-none px-5 py-2">
+                            <ReactMarkdown className="text-sm">{example.description}</ReactMarkdown>
+                          </div>
+                        </RefDetailCollapse>
+                      )}
+                    </Tabs.Panel>
+                  )
+                })
+              ) : (
+                // TODO: remove this block once all commands have examples
+                <Tabs.Panel
+                  id={`${command.id}-basic-usage`}
+                  key={`${command.id}-basic-usage`}
+                  label="Basic usage"
+                  className="flex flex-col gap-3"
+                >
+                  <CodeBlock
+                    className="useless-code-block-class"
+                    language="bash"
+                    hideLineNumbers={true}
+                  >
+                    {command.usage}
+                  </CodeBlock>
+                </Tabs.Panel>
+              )}
+            </Tabs>
+          </div>
+        </RefSubLayout.Examples>
+      )}
     </RefSubLayout.Section>
   )
 }
diff --git a/apps/docs/components/reference/RefFunctionSection.tsx b/apps/docs/components/reference/RefFunctionSection.tsx
index 14f74a45c44..59e0c0a6abd 100644
--- a/apps/docs/components/reference/RefFunctionSection.tsx
+++ b/apps/docs/components/reference/RefFunctionSection.tsx
@@ -143,18 +143,24 @@ const RefFunctionSection: React.FC<IRefFunctionSection> = (props) => {
                           label={example.name}
                           className="flex flex-col gap-3"
                         >
-                          {example.description && (
-                            <div className="prose">
-                              <ReactMarkdown className="text-sm">
-                                {example.description}
-                              </ReactMarkdown>
-                            </div>
-                          )}
+                          <CodeBlock
+                            className="useless-code-block-class"
+                            language={codeBlockLang}
+                            hideLineNumbers={true}
+                          >
+                            {exampleString +
+                              (example.code &&
+                                example.code
+                                  .replace(/```/g, '')
+                                  .replace('js', '')
+                                  .replace('ts', '')
+                                  .replace('dart', ''))}
+                          </CodeBlock>
 
                           {((tables && tables.length > 0) || sql) && (
                             <RefDetailCollapse
                               id={`${example.id}-${exampleIndex}-data`}
-                              label="Example data source"
+                              label="Data source"
                               defaultOpen={false}
                             >
                               <>
@@ -189,28 +195,14 @@ const RefFunctionSection: React.FC<IRefFunctionSection> = (props) => {
                             </RefDetailCollapse>
                           )}
 
-                          <CodeBlock
-                            className="useless-code-block-class"
-                            language={codeBlockLang}
-                            hideLineNumbers={true}
-                          >
-                            {exampleString +
-                              (example.code &&
-                                example.code
-                                  .replace(/```/g, '')
-                                  .replace('js', '')
-                                  .replace('ts', '')
-                                  .replace('dart', ''))}
-                          </CodeBlock>
-
                           {response && (
                             <RefDetailCollapse
                               id={`${example.id}-${exampleIndex}-response`}
-                              label="Example response"
+                              label="Response"
                               defaultOpen={false}
                             >
                               <CodeBlock
-                                className="useless-code-block-class"
+                                className="useless-code-block-class rounded !rounded-tl-none !rounded-tr-none border border-scale-500"
                                 language={codeBlockLang}
                                 hideLineNumbers={true}
                               >
@@ -218,6 +210,20 @@ const RefFunctionSection: React.FC<IRefFunctionSection> = (props) => {
                               </CodeBlock>
                             </RefDetailCollapse>
                           )}
+
+                          {example.description && (
+                            <RefDetailCollapse
+                              id={`${example.id}-${exampleIndex}-notes`}
+                              label="Notes"
+                              defaultOpen={false}
+                            >
+                              <div className="bg-scale-300 border border-scale-500 rounded !rounded-tl-none !rounded-tr-none prose max-w-none px-5 py-2">
+                                <ReactMarkdown className="text-sm">
+                                  {example.description}
+                                </ReactMarkdown>
+                              </div>
+                            </RefDetailCollapse>
+                          )}
                         </Tabs.Panel>
                       )
                     })}
diff --git a/apps/docs/components/reference/enrichments/cli/CliGlobalFlagsHandler.tsx b/apps/docs/components/reference/enrichments/cli/CliGlobalFlagsHandler.tsx
index 778f518b173..1de9c1971d0 100644
--- a/apps/docs/components/reference/enrichments/cli/CliGlobalFlagsHandler.tsx
+++ b/apps/docs/components/reference/enrichments/cli/CliGlobalFlagsHandler.tsx
@@ -15,6 +15,7 @@ const CliGlobalFlagsHandler = () => {
             return (
               <Param
                 {...flag}
+                id={`${spec.id}-${flag.id}`}
                 isOptional={flag.required === undefined ? true : !flag.required}
               ></Param>
             )
diff --git a/apps/docs/data/extensions.json b/apps/docs/data/extensions.json
index 4014e6eeabc..24a76d1a821 100644
--- a/apps/docs/data/extensions.json
+++ b/apps/docs/data/extensions.json
@@ -468,6 +468,13 @@
     "installed_version": "1.1",
     "comment": "generate universally unique identifiers (UUIDs)"
   },
+  {
+    "name": "vector",
+    "schema": "extensions",
+    "default_version": "0.4.0",
+    "installed_version": null,
+    "comment": "vector data type with similarity search"
+  },
   {
     "name": "xml2",
     "schema": null,
diff --git a/apps/docs/data/nonGeneratedReferencePages.ts b/apps/docs/data/nonGeneratedReferencePages.ts
index fd5ba84d1f5..01b060055c7 100644
--- a/apps/docs/data/nonGeneratedReferencePages.ts
+++ b/apps/docs/data/nonGeneratedReferencePages.ts
@@ -2,7 +2,7 @@ const nonGeneratedReferencePages = [
   'docs/reference/javascript',
   'docs/reference/javascript/installing',
   'docs/reference/javascript/release-notes',
-  'docs/reference/javascript/upgrade-guide',
+  'docs/reference/javascript/v1/upgrade-guide',
   'docs/reference/javascript/typescript-support',
   'docs/reference/javascript/v1',
   'docs/reference/javascript/v1/installing',
@@ -11,7 +11,7 @@ const nonGeneratedReferencePages = [
   'docs/reference/dart',
   'docs/reference/dart/installing',
   'docs/reference/dart/initializing',
-  'docs/reference/dart/upgrade-guide',
+  'docs/reference/dart/v0/upgrade-guide',
   'docs/reference/dart/v0',
   'docs/reference/api',
   'docs/reference/api/release-notes',
diff --git a/apps/docs/docs/ref/cli/introduction.mdx b/apps/docs/docs/ref/cli/introduction.mdx
index e204038abae..010c563ea35 100644
--- a/apps/docs/docs/ref/cli/introduction.mdx
+++ b/apps/docs/docs/ref/cli/introduction.mdx
@@ -17,7 +17,7 @@ hideTitle: true
     The Supabase CLI provides tools to develop your project locally and deploy to the Supabase Platform.
     The CLI is still under development, but it contains all the functionality for working with your Supabase projects and the Supabase Platform.
 
-    - Run Supabase locally: [`supabase start`](/docs/reference/cli/usage#supabase-start)
+    - Run Supabase locally: [`supabase init`](/docs/reference/cli/usage#supabase-init) and [`supabase start`](/docs/reference/cli/usage#supabase-start)
     - Manage database migrations: [`supabase migration`](/docs/reference/cli/usage#supabase-migration)
     - CI/CD for releasing to production: [`supabase db push`](/docs/reference/cli/usage#supabase-db-push)
     - Manage your Supabase projects: [`supabase projects`](/docs/reference/cli/usage#supabase-projects)
diff --git a/apps/docs/docs/ref/dart/initializing.mdx b/apps/docs/docs/ref/dart/initializing.mdx
deleted file mode 100644
index 501efaef48f..00000000000
--- a/apps/docs/docs/ref/dart/initializing.mdx
+++ /dev/null
@@ -1,50 +0,0 @@
----
-id: initializing
-title: 'Initializing'
-slug: initializing
----
-
-<RefSubLayout.EducationRow>
-  <RefSubLayout.Details>
-
-    Initialize Supabase with the static `initialize()` method on `Supabase` class.
-
-  </RefSubLayout.Details>
-
-  <RefSubLayout.Examples>
-
-    <Tabs
-      size="small"
-      type="underlined"
-      defaultActiveId="flutter"
-    >
-      <TabPanel id="flutter" label="Flutter">
-
-        ```dart main.dart
-        Future<void> main() async {
-          WidgetsFlutterBinding.ensureInitialized();
-
-          await Supabase.initialize(
-            url: 'https://xyzcompany.supabase.co',
-            anonKey: 'public-anon-key',
-          );
-
-          runApp(MyApp());
-        }
-        ```
-
-      </TabPanel>
-      <TabPanel id="dart" label="Other Dart Project">
-
-        ```dart
-        final supabase = SupabaseClient(
-          'https://xyzcompany.supabase.co',
-          'public-anon-key',
-        );
-        ```
-
-      </TabPanel>
-    </Tabs>
-
-  </RefSubLayout.Examples>
-</RefSubLayout.EducationRow>
diff --git a/apps/docs/docs/ref/dart/introduction.mdx b/apps/docs/docs/ref/dart/introduction.mdx
index 8dabccf22b2..e183e37889e 100644
--- a/apps/docs/docs/ref/dart/introduction.mdx
+++ b/apps/docs/docs/ref/dart/introduction.mdx
@@ -13,11 +13,12 @@ hideTitle: true
 </div>
 
 <div className="max-w-xl">
-  This reference documents every object and method available in Supabase's Flutter
-  library, [supabase-flutter](https://pub.dev/packages/supabase_flutter). You can
-  use supabase-flutter to interact with your Postgres database, listen to database changes, invoke
-  Deno Edge Functions, build login and user management functionality, and manage large files.
-  <br />
-  <br />
-  We also provide [supabase](https://pub.dev/packages/supabase) package for non-Flutter projects.
+
+This reference documents every object and method available in Supabase's Flutter
+library, [supabase-flutter](https://pub.dev/packages/supabase_flutter). You can
+use supabase-flutter to interact with your Postgres database, listen to database changes, invoke
+Deno Edge Functions, build login and user management functionality, and manage large files.
+
+We also provide a [supabase](https://pub.dev/packages/supabase) package for non-Flutter projects.
+
 </div>
diff --git a/apps/docs/docs/ref/dart/v0/introduction.mdx b/apps/docs/docs/ref/dart/v0/introduction.mdx
new file mode 100644
index 00000000000..fdbb9d766a5
--- /dev/null
+++ b/apps/docs/docs/ref/dart/v0/introduction.mdx
@@ -0,0 +1,28 @@
+---
+id: introduction
+title: Introduction
+hideTitle: true
+---
+
+<div className="flex items-start gap-6 not-prose" id="introduction">
+  <img src="/docs/img/icons/menu/reference-dart.svg" className="w-8 h-8 rounded" />
+  <div className="flex flex-col gap-2">
+    <h1 className="text-3xl text-scale-1200 m-0">Flutter Client Library</h1>
+    <h2 className="text-base font-mono text-scale-1100">supabase-flutter</h2>
+  </div>
+</div>
+
+<div className="max-w-xl">
+
+<Admonition type="caution">
+  You're viewing the docs for an older version of the `supabase-flutter` library. Learn how to
+  [upgrade to the latest version](/docs/reference/dart/v0/upgrade-guide).
+</Admonition>
+
+This reference documents every object and method available in Supabase's Flutter library, [supabase-flutter](https://pub.dev/packages/supabase_flutter).
+You can use supabase-flutter to interact with your Postgres database, listen to database changes, invoke
+Deno Edge Functions, build login and user management functionality, and manage large files.
+
+We also provide a [supabase](https://pub.dev/packages/supabase) package for non-Flutter projects.
+
+</div>
diff --git a/apps/docs/docs/reference/dart/upgrade-guide.mdx b/apps/docs/docs/ref/dart/v0/upgrade-guide.mdx
similarity index 68%
rename from apps/docs/docs/reference/dart/upgrade-guide.mdx
rename to apps/docs/docs/ref/dart/v0/upgrade-guide.mdx
index 707cdd06129..6da7b0c0fe5 100644
--- a/apps/docs/docs/reference/dart/upgrade-guide.mdx
+++ b/apps/docs/docs/ref/dart/v0/upgrade-guide.mdx
@@ -4,23 +4,35 @@ title: Upgrade to supabase-flutter v1
 description: 'Learn how to upgrade to supabase-flutter v1.'
 ---
 
-import Tabs from '@theme/Tabs'
-import TabItem from '@theme/TabItem'
-
-supabase-flutter focuses on improving the developer experience and making it easier to use. This guide will help you upgrade from supabase-flutter v0 to v1.
+supabase-flutter focuses on improving the developer experience and making it easier to use. This guide demonstrates how to upgrade from supabase-flutter v0 to v1.
 
 ## Upgrade the client library
 
+<RefSubLayout.EducationRow>
+  <RefSubLayout.Details>
+
 Update the package in your pubspec.yaml file.
 
+  </RefSubLayout.Details>
+  <RefSubLayout.Examples>
+
 ```yaml
 supabase_flutter: ^1.0.0
 ```
 
+  </RefSubLayout.Examples>
+</RefSubLayout.EducationRow>
+
 ## Error handling
 
+<RefSubLayout.EducationRow>
+  <RefSubLayout.Details>
+
 The way supabase-flutter throws error has changed in v1. In v0, errors were returned as a response. In v1, errors are thrown as exceptions. This makes it more intuitive as a Flutter developer to handle errors.
 
+  </RefSubLayout.Details>
+  <RefSubLayout.Examples>
+
 <Tabs
   scrollable
   size="small"
@@ -52,11 +64,20 @@ try {
 </TabPanel>
 </Tabs>
 
-## Auth classes / methods
+  </RefSubLayout.Examples>
+</RefSubLayout.EducationRow>
+
+## Auth classes and methods
 
 ### Usage of `SupabaseAuthState` and `SupabaseAuthRequiredState` classes
 
-In v0, `SupabaseAuthState` and `SupabaseAuthRequiredState` were required to handle automatic token refresh and to listen to auth state change. In v1, `SupabaseAuthState` and `SupabaseAuthRequiredState` are deprecated, and token refresh will happen automatically just by initializing Supabase. [`onAuthStateChange`](/docs/reference/dart/upgrade-guide#listening-to-auth-state-change) can be used to action on auth state change.
+<RefSubLayout.EducationRow>
+  <RefSubLayout.Details>
+
+In v0, `SupabaseAuthState` and `SupabaseAuthRequiredState` were required to handle automatic token refresh and to listen to auth state change. In v1, `SupabaseAuthState` and `SupabaseAuthRequiredState` are deprecated, and token refresh will happen automatically just by initializing Supabase. [`onAuthStateChange`](#listening-to-auth-state-change) can be used to action on auth state change.
+
+  </RefSubLayout.Details>
+  <RefSubLayout.Examples>
 
 <Tabs
   scrollable
@@ -97,10 +118,19 @@ await Supabase.initialize(
 </TabPanel>
 </Tabs>
 
+  </RefSubLayout.Examples>
+</RefSubLayout.EducationRow>
+
 ### Listening to auth state change
 
+<RefSubLayout.EducationRow>
+  <RefSubLayout.Details>
+
 `onAuthStateChange` now returns a `Stream`.
 
+  </RefSubLayout.Details>
+  <RefSubLayout.Examples>
+
 <Tabs
   scrollable
   size="small"
@@ -135,9 +165,18 @@ authSubscription.cancel();
 </TabPanel>
 </Tabs>
 
+  </RefSubLayout.Examples>
+</RefSubLayout.EducationRow>
+
 ### Sign in with email and password
 
-The signIn() method has been deprecated in favor of more explicit method signatures to help with type hinting. Previously it was difficult for developers to know what they were missing (e.g., a lot of developers didn't realize they could use passwordless magic links).
+<RefSubLayout.EducationRow>
+  <RefSubLayout.Details>
+
+`signIn()` has been deprecated in favor of more explicit method signatures to help with type hinting. Previously it was difficult for developers to know what they were missing (e.g., a lot of developers didn't realize they could use passwordless magic links).
+
+  </RefSubLayout.Details>
+  <RefSubLayout.Examples>
 
 <Tabs
   scrollable
@@ -161,8 +200,17 @@ await supabase.auth.signInWithPassword(email: email, password: password);
 </TabPanel>
 </Tabs>
 
+  </RefSubLayout.Examples>
+</RefSubLayout.EducationRow>
+
+<RefSubLayout.EducationRow>
+  <RefSubLayout.Details>
+
 ### Sign in with magic link
 
+  </RefSubLayout.Details>
+  <RefSubLayout.Examples>
+
 <Tabs
   scrollable
   size="small"
@@ -185,8 +233,17 @@ await supabase.auth.signInWithOtp(email: email);
 </TabPanel>
 </Tabs>
 
+  </RefSubLayout.Examples>
+</RefSubLayout.EducationRow>
+
+<RefSubLayout.EducationRow>
+  <RefSubLayout.Details>
+
 ### Sign in with a third-party OAuth provider
 
+  </RefSubLayout.Details>
+  <RefSubLayout.Examples>
+
 <Tabs
   scrollable
   size="small"
@@ -218,8 +275,17 @@ await supabase.auth.signInWithOAuth(
 </TabPanel>
 </Tabs>
 
+  </RefSubLayout.Examples>
+</RefSubLayout.EducationRow>
+
+<RefSubLayout.EducationRow>
+  <RefSubLayout.Details>
+
 ### Sign in with phone
 
+  </RefSubLayout.Details>
+  <RefSubLayout.Examples>
+
 <Tabs
   scrollable
   size="small"
@@ -248,8 +314,17 @@ await supabase.auth.signInWithPassword(
 </TabPanel>
 </Tabs>
 
+  </RefSubLayout.Examples>
+</RefSubLayout.EducationRow>
+
+<RefSubLayout.EducationRow>
+  <RefSubLayout.Details>
+
 ### Sign in with phone using OTP
 
+  </RefSubLayout.Details>
+  <RefSubLayout.Examples>
+
 <Tabs
   scrollable
   size="small"
@@ -281,8 +356,17 @@ await supabase.auth.verifyOTP(
 </TabPanel>
 </Tabs>
 
+  </RefSubLayout.Examples>
+</RefSubLayout.EducationRow>
+
+<RefSubLayout.EducationRow>
+  <RefSubLayout.Details>
+
 ### Reset password for email
 
+  </RefSubLayout.Details>
+  <RefSubLayout.Examples>
+
 <Tabs
   scrollable
   size="small"
@@ -312,8 +396,17 @@ await supabase.auth.resetPasswordForEmail(
 </TabPanel>
 </Tabs>
 
+  </RefSubLayout.Examples>
+</RefSubLayout.EducationRow>
+
+<RefSubLayout.EducationRow>
+  <RefSubLayout.Details>
+
 ### Get the user's current session
 
+  </RefSubLayout.Details>
+  <RefSubLayout.Examples>
+
 <Tabs
   scrollable
   size="small"
@@ -336,8 +429,17 @@ final Session? session = supabase.auth.currentSession;
 </TabPanel>
 </Tabs>
 
+  </RefSubLayout.Examples>
+</RefSubLayout.EducationRow>
+
+<RefSubLayout.EducationRow>
+  <RefSubLayout.Details>
+
 ### Get the logged-in user
 
+  </RefSubLayout.Details>
+  <RefSubLayout.Examples>
+
 <Tabs
   scrollable
   size="small"
@@ -360,8 +462,17 @@ final User? user = supabase.auth.currentUser;
 </TabPanel>
 </Tabs>
 
+  </RefSubLayout.Examples>
+</RefSubLayout.EducationRow>
+
+<RefSubLayout.EducationRow>
+  <RefSubLayout.Details>
+
 ### Update user data for a logged-in user
 
+  </RefSubLayout.Details>
+  <RefSubLayout.Examples>
+
 <Tabs
   scrollable
   size="small"
@@ -390,16 +501,23 @@ await supabase.updateUser(
 </TabPanel>
 </Tabs>
 
+  </RefSubLayout.Examples>
+</RefSubLayout.EducationRow>
+
 ## Data methods
 
-`.insert()` / `.upsert()` / `.update()` / `.delete()` don't return rows by default.
+`.insert()` / `.upsert()` / `.update()` / `.delete()` no longer return rows by default. Previously, these methods return inserted/updated/deleted rows by default (which caused [some confusion](https://github.com/supabase/supabase/discussions/1548)), and you can opt to not return it by specifying `returning: 'minimal'`. Now the default behavior is to not return rows. To return inserted/updated/deleted rows, add a `.select()` call at the end.
 
-Previously, these methods return inserted/updated/deleted rows by default (which caused [some confusion](https://github.com/supabase/supabase/discussions/1548)), and you can opt to not return it by specifying `returning: 'minimal'`. Now the default behavior is to not return rows. To return inserted/updated/deleted rows, add a `.select()` call at the end.
+Also, calling `.execute()` at the end of the query was a requirement in v0, but deprecated in v1.
 
-Also, calling `.execute()` at the end of the query was a requirement in v0, but in v1 `.execute` is deperecated.
+<RefSubLayout.EducationRow>
+  <RefSubLayout.Details>
 
 ### Insert without returning inserted data
 
+  </RefSubLayout.Details>
+  <RefSubLayout.Examples>
+
 <Tabs
   scrollable
   size="small"
@@ -426,8 +544,17 @@ await supabase.from('my_table').insert(data);
 </TabPanel>
 </Tabs>
 
+  </RefSubLayout.Examples>
+</RefSubLayout.EducationRow>
+
+<RefSubLayout.EducationRow>
+  <RefSubLayout.Details>
+
 ### Insert with returning inserted data
 
+  </RefSubLayout.Details>
+  <RefSubLayout.Examples>
+
 <Tabs
   scrollable
   size="small"
@@ -453,12 +580,21 @@ final insertedData = await supabase.from('my_table').insert(data).select();
 </TabPanel>
 </Tabs>
 
+  </RefSubLayout.Examples>
+</RefSubLayout.EducationRow>
+
 ## Realtime methods
 
+<RefSubLayout.EducationRow>
+  <RefSubLayout.Details>
+
 ### Stream
 
 `.stream()` no longer needs the `.execute()` at the end. Also, filtering by `eq` is a lot easier now. `primaryKey` is now a named parameter to make it more obvious what to pass.
 
+  </RefSubLayout.Details>
+  <RefSubLayout.Examples>
+
 <Tabs
   scrollable
   size="small"
@@ -486,8 +622,17 @@ supabase.from('my_table')
 </TabPanel>
 </Tabs>
 
+  </RefSubLayout.Examples>
+</RefSubLayout.EducationRow>
+
+<RefSubLayout.EducationRow>
+  <RefSubLayout.Details>
+
 ### Subscribe
 
+  </RefSubLayout.Details>
+  <RefSubLayout.Examples>
+
 <Tabs
   scrollable
   size="small"
@@ -522,8 +667,17 @@ channel.on(
 </TabPanel>
 </Tabs>
 
+  </RefSubLayout.Examples>
+</RefSubLayout.EducationRow>
+
+<RefSubLayout.EducationRow>
+  <RefSubLayout.Details>
+
 ### Unsubscribe
 
+  </RefSubLayout.Details>
+  <RefSubLayout.Examples>
+
 <Tabs
   scrollable
   size="small"
@@ -545,3 +699,6 @@ await supabase.removeChannel(channel);
 
 </TabPanel>
 </Tabs>
+
+  </RefSubLayout.Examples>
+</RefSubLayout.EducationRow>
diff --git a/apps/docs/docs/ref/javascript/v1/introduction.mdx b/apps/docs/docs/ref/javascript/v1/introduction.mdx
index 3e1af1ff9dd..a62134bdd69 100644
--- a/apps/docs/docs/ref/javascript/v1/introduction.mdx
+++ b/apps/docs/docs/ref/javascript/v1/introduction.mdx
@@ -13,8 +13,15 @@ hideTitle: true
 </div>
 
 <div className="max-w-xl">
-  This reference documents every object and method available in Supabase's isomorphic JavaScript
-  library, supabase-js. You can use supabase-js to interact with your Postgres database, listen to
-  database changes, invoke Deno Edge Functions, build login and user management functionality, and
-  manage large files.
+
+<Admonition type="caution">
+  You're viewing the docs for an older version of the `supabase-js` library. Learn how to [upgrade
+  to the latest version](/docs/reference/javascript/v1/upgrade-guide).
+</Admonition>
+
+This reference documents every object and method available in Supabase's isomorphic JavaScript
+library, supabase-js. You can use supabase-js to interact with your Postgres database, listen to
+database changes, invoke Deno Edge Functions, build login and user management functionality, and
+manage large files.
+
 </div>
diff --git a/apps/docs/docs/ref/javascript/upgrade-guide.mdx b/apps/docs/docs/ref/javascript/v1/upgrade-guide.mdx
similarity index 100%
rename from apps/docs/docs/ref/javascript/upgrade-guide.mdx
rename to apps/docs/docs/ref/javascript/v1/upgrade-guide.mdx
diff --git a/apps/docs/docs/ref/python/introduction.mdx b/apps/docs/docs/ref/python/introduction.mdx
new file mode 100644
index 00000000000..cf0a9f0ee4f
--- /dev/null
+++ b/apps/docs/docs/ref/python/introduction.mdx
@@ -0,0 +1,21 @@
+---
+id: introduction
+title: Introduction
+hideTitle: true
+---
+
+<div className="flex items-start gap-6 not-prose" id="introduction">
+  <img src="/docs/img/icons/menu/reference-python.svg" className="w-8 h-8 rounded" />
+  <div className="flex flex-col gap-2">
+    <h1 className="text-3xl text-scale-1200 m-0">Python Client Library</h1>
+    <h2 className="text-base font-mono text-scale-1100">@supabase-community/supabase-py</h2>
+  </div>
+</div>
+
+<div className="max-w-xl">
+  This reference documents every object and method available in the
+  [supabase-py](https://github.com/supabase-community/supabase-py) library from the Supabase
+  community. You can use `supabase-py` to interact with your Postgres database, listen to database
+  changes, invoke Deno Edge Functions, build login and user management functionality, and manage
+  large files.
+</div>
diff --git a/apps/docs/docs/ref/python/release-notes.mdx b/apps/docs/docs/ref/python/release-notes.mdx
new file mode 100644
index 00000000000..1deb6705f7e
--- /dev/null
+++ b/apps/docs/docs/ref/python/release-notes.mdx
@@ -0,0 +1,10 @@
+---
+id: release-notes
+title: Release Notes
+---
+
+The community is actively working on the library and we will be upgrading the Authentication library, `gotrue-py`, to mirror the Supabase-js v2 lib.
+
+## Storage Transformations
+
+We currently support [image transformations](https://supabase.com/docs/guides/storage/image-transformations) in our storage library.
diff --git a/apps/docs/docs/reference/javascript/upgrade-guide.mdx b/apps/docs/docs/reference/javascript/upgrade-guide.mdx
deleted file mode 100644
index 282d66d4966..00000000000
--- a/apps/docs/docs/reference/javascript/upgrade-guide.mdx
+++ /dev/null
@@ -1,439 +0,0 @@
----
-id: upgrade-guide
-title: Upgrade to supabase-js v2
-description: 'Learn how to upgrade to supabase-js v2.'
----
-
-import Tabs from '@theme/Tabs'
-import TabItem from '@theme/TabItem'
-
-supabase-js v2 focuses on "quality-of-life" improvements for developers and addresses some of the largest pain points in v1. v2 includes type support, a rebuilt Auth library with async methods, improved errors, and more.
-
-No new features will be added to supabase-js v1 , but we'll continuing merging security fixes to v1, with maintenance patches for the next 3 months.
-
-## Upgrade the client library
-
-```sh
-npm install @supabase/supabase-js@2
-```
-
-_Optionally_ if you are using custom configuration with `createClient` then follow below:
-
-<Tabs
-  scrollable
-  size="small"
-  type="underlined"
-  defaultActiveId="1.0x"
->
-<TabPanel id="1.0x" label="Before">
-
-```ts title=src/supabaseClient.ts
-const supabase = createClient(SUPABASE_URL, SUPABASE_ANON_KEY, {
-  schema: 'custom',
-  persistSession: false,
-})
-```
-
-</TabPanel>
-<TabPanel id="2.0x" label="After">
-
-```ts title=src/supabaseClient.ts
-const supabase = createClient(SUPABASE_URL, SUPABASE_ANON_KEY, {
-  db: {
-    schema: 'custom',
-  },
-  auth: {
-    persistSession: true,
-  },
-})
-```
-
-</TabPanel>
-</Tabs>
-
-Read more about the [constructor options](/docs/reference/javascript/release-notes#explicit-constructor-options).
-
-### Auth methods
-
-The signIn() method has been deprecated in favor of more explicit method signatures to help with type hinting. Previously it was difficult for developers to know what they were missing (e.g., a lot of developers didn't realize they could use passwordless magic links).
-
-#### Sign in with email and password
-
-<Tabs
-  scrollable
-  size="small"
-  type="underlined"
-  defaultActiveId="1.0x"
->
-<TabPanel id="1.0x" label="Before">
-
-```ts
-const { user, error } = await supabase.auth.signIn({ email, password })
-```
-
-</TabPanel>
-<TabPanel id="2.0x" label="After">
-
-```ts
-const {
-  data: { user },
-  error,
-} = await supabase.auth.signInWithPassword({ email, password })
-```
-
-</TabPanel>
-</Tabs>
-
-#### Sign in with magic link
-
-<Tabs
-  scrollable
-  size="small"
-  type="underlined"
-  defaultActiveId="1.0x"
->
-<TabPanel id="1.0x" label="Before">
-
-```ts
-const { error } = await supabase.auth.signIn({ email })
-```
-
-</TabPanel>
-<TabPanel id="2.0x" label="After">
-
-```ts
-const { error } = await supabase.auth.signInWithOtp({ email })
-```
-
-</TabPanel>
-</Tabs>
-
-#### Sign in with a third-party provider
-
-<Tabs
-  scrollable
-  size="small"
-  type="underlined"
-  defaultActiveId="1.0x"
->
-<TabPanel id="1.0x" label="Before">
-
-```ts
-const { error } = await supabase.auth.signIn({ provider })
-```
-
-</TabPanel>
-<TabPanel id="2.0x" label="After">
-
-```ts
-const { error } = await supabase.auth.signInWithOAuth({ provider })
-```
-
-</TabPanel>
-</Tabs>
-
-#### Sign in with phone
-
-<Tabs
-  scrollable
-  size="small"
-  type="underlined"
-  defaultActiveId="1.0x"
->
-<TabPanel id="1.0x" label="Before">
-
-```ts
-const { error } = await supabase.auth.signIn({ phone, password })
-```
-
-</TabPanel>
-<TabPanel id="2.0x" label="After">
-
-```ts
-const { error } = await supabase.auth.signInWithPassword({ phone, password })
-```
-
-</TabPanel>
-</Tabs>
-
-#### Sign in with phone using OTP
-
-<Tabs
-  scrollable
-  size="small"
-  type="underlined"
-  defaultActiveId="1.0x"
->
-<TabPanel id="1.0x" label="Before">
-
-```ts
-const { error } = await supabase.auth.api.sendMobileOTP(phone)
-```
-
-</TabPanel>
-<TabPanel id="2.0x" label="After">
-
-```ts
-const { data, error } = await supabase.auth.signInWithOtp({ phone })
-
-// After receiving a SMS with a OTP.
-const { data, error } = await supabase.auth.verifyOtp({ phone, token })
-```
-
-</TabPanel>
-</Tabs>
-
-#### Reset password for email
-
-<Tabs
-  scrollable
-  size="small"
-  type="underlined"
-  defaultActiveId="1.0x"
->
-<TabPanel id="1.0x" label="Before">
-
-```ts
-const { data, error } = await supabase.auth.api.resetPasswordForEmail(email)
-```
-
-</TabPanel>
-<TabPanel id="2.0x" label="After">
-
-```ts
-const { data, error } = await supabase.auth.resetPasswordForEmail(email)
-```
-
-</TabPanel>
-</Tabs>
-
-#### Get the user's current session
-
-<Tabs
-  scrollable
-  size="small"
-  type="underlined"
-  defaultActiveId="1.0x"
->
-<TabPanel id="1.0x" label="Before">
-
-```ts
-const session = supabase.auth.session()
-```
-
-</TabPanel>
-<TabPanel id="2.0x" label="After">
-
-```ts
-const {
-  data: { session },
-} = await supabase.auth.getSession()
-```
-
-</TabPanel>
-</Tabs>
-
-#### Get the logged-in user
-
-<Tabs
-  scrollable
-  size="small"
-  type="underlined"
-  defaultActiveId="1.0x"
->
-<TabPanel id="1.0x" label="Before">
-
-```ts
-const user = supabase.auth.user()
-```
-
-</TabPanel>
-<TabPanel id="2.0x" label="After">
-
-```ts
-const {
-  data: { session },
-} = await supabase.auth.getSession()
-const { user } = session
-```
-
-</TabPanel>
-</Tabs>
-
-#### Update user data for a logged-in user
-
-<Tabs
-  scrollable
-  size="small"
-  type="underlined"
-  defaultActiveId="1.0x"
->
-<TabPanel id="1.0x" label="Before">
-
-```ts
-const { user, error } = await supabase.auth.update({ attributes })
-```
-
-</TabPanel>
-<TabPanel id="2.0x" label="After">
-
-```ts
-const {
-  data: { user },
-  error,
-} = await supabase.auth.updateUser({ attributes })
-```
-
-</TabPanel>
-</Tabs>
-
-#### Use a custom `access_token` JWT with Supabase
-
-<Tabs
-  scrollable
-  size="small"
-  type="underlined"
-  defaultActiveId="1.0x"
->
-<TabPanel id="1.0x" label="Before">
-
-```ts
-const { user, error } = supabase.auth.setAuth(access_token)
-```
-
-</TabPanel>
-<TabPanel id="2.0x" label="After">
-
-```ts
-const supabase = createClient(SUPABASE_URL, SUPABASE_ANON_KEY, {
-  global: {
-    headers: {
-      Authorization: `Bearer ${access_token}`,
-    },
-  },
-})
-```
-
-</TabPanel>
-</Tabs>
-
-#### Cookie methods
-
-The cookie-related methods like `setAuthCookie` and `getUserByCookie` have been removed.
-
-For Next.js you can use the [Auth Helpers](https://supabase.com/docs/guides/auth/auth-helpers/nextjs) to help you manage cookies.
-If you can't use the Auth Helpers, you can use [server-side rendering](https://supabase.com/docs/guides/auth/server-side-rendering).
-
-Some the [PR](https://github.com/supabase/gotrue-js/pull/340) for additional background information.
-
-### Data methods
-
-`.insert()` / `.upsert()` / `.update()` / `.delete()` don't return rows by default: [PR](https://github.com/supabase/postgrest-js/pull/276).
-
-Previously, these methods return inserted/updated/deleted rows by default (which caused [some confusion](https://github.com/supabase/supabase/discussions/1548)), and you can opt to not return it by specifying `returning: 'minimal'`. Now the default behavior is to not return rows. To return inserted/updated/deleted rows, add a `.select()` call at the end.
-
-#### Insert and return data
-
-<Tabs
-  scrollable
-  size="small"
-  type="underlined"
-  defaultActiveId="1.0x"
->
-<TabPanel id="1.0x" label="Before">
-
-```ts
-const { data, error } = await supabase.auth.insert({ new_data })
-```
-
-</TabPanel>
-<TabPanel id="2.0x" label="After">
-
-```ts
-const { data, error } = await supabase.auth.insert({ new_data }).select()
-```
-
-</TabPanel>
-</Tabs>
-
-#### Update and return data
-
-<Tabs
-  scrollable
-  size="small"
-  type="underlined"
-  defaultActiveId="1.0x"
->
-<TabPanel id="1.0x" label="Before">
-
-```ts
-const { data, error } = await supabase.auth.update({ new_data }).eq('id', id)
-```
-
-</TabPanel>
-<TabPanel id="2.0x" label="After">
-
-```ts
-const { data, error } = await supabase.auth.update({ new_data }).eq('id', id).select()
-```
-
-</TabPanel>
-</Tabs>
-
-### Realtime methods
-
-#### Subscribe
-
-<Tabs
-  scrollable
-  size="small"
-  type="underlined"
-  defaultActiveId="1.0x"
->
-<TabPanel id="1.0x" label="Before">
-
-```ts
-const userListener = supabase
-  .from('users')
-  .on('*', (payload) => handleAllEventsPayload(payload.new))
-  .subscribe()
-```
-
-</TabPanel>
-<TabPanel id="2.0x" label="After">
-
-```ts
-const userListener = supabase
-  .channel('public:user')
-  .on('postgres_changes', { event: '*', schema: 'public', table: 'user' }, (payload) =>
-    handleAllEventsPayload()
-  )
-  .subscribe()
-```
-
-</TabPanel>
-</Tabs>
-
-#### Unsubscribe
-
-<Tabs
-  scrollable
-  size="small"
-  type="underlined"
-  defaultActiveId="1.0x"
->
-<TabPanel id="1.0x" label="Before">
-
-```ts
-userListener.unsubscribe()
-```
-
-</TabPanel>
-<TabPanel id="2.0x" label="After">
-
-```ts
-supabase.removeChannel(userListener)
-```
-
-</TabPanel>
-</Tabs>
diff --git a/apps/docs/layouts/SiteLayout.tsx b/apps/docs/layouts/SiteLayout.tsx
index eb017378efd..cb31612a3da 100644
--- a/apps/docs/layouts/SiteLayout.tsx
+++ b/apps/docs/layouts/SiteLayout.tsx
@@ -39,6 +39,10 @@ const levelsData = {
     icon: '/docs/img/icons/menu/storage',
     name: 'Storage',
   },
+  supabase_cli: {
+    icon: '/docs/img/icons/menu/reference-cli',
+    name: 'Supabase CLI',
+  },
   platform: {
     icon: '/docs/img/icons/menu/platform',
     name: 'Platform',
@@ -71,6 +75,10 @@ const levelsData = {
     icon: '/docs/img/icons/menu/reference-dart',
     name: 'Dart Reference v0.0',
   },
+  reference_python_v2: {
+    icon: '/docs/img/icons/menu/reference-python',
+    name: 'Python Reference v2.0',
+  },
   reference_cli: {
     icon: '/docs/img/icons/menu/reference-cli',
     name: 'CLI Reference',
diff --git a/apps/docs/pages/getting-started.mdx b/apps/docs/pages/getting-started.mdx
deleted file mode 100644
index ccb7790f15e..00000000000
--- a/apps/docs/pages/getting-started.mdx
+++ /dev/null
@@ -1,161 +0,0 @@
-import Layout from '~/layouts/DefaultGuideLayout'
-
-export const meta = {
-  title: 'Overview',
-  description: 'An overview of Supabase\'s architecture and product principles.',
-}
-
-Supabase is open source. We choose open source tools which are scalable and make them simple to use.
-
-Supabase is not a 1-to-1 mapping of Firebase. While we are building many of the features that Firebase offers, we are not going about it the same way:
-our technological choices are quite different; everything we use is open source; and wherever possible, we use and support existing tools rather than developing from scratch.
-
-Most notably, we use Postgres rather than a NoSQL store. This choice was deliberate. We believe that no other database offers the functionality required to compete with Firebase,
-while maintaining the scalability required to go beyond it.
-
-## Architecture
-
-Each Supabase project consists of several tools:
-
-![Supabase Architecture](/docs/img/supabase-architecture.png)
-
-### PostgreSQL (Database)
-
-PostgreSQL is the core of Supabase. We do not abstract the PostgreSQL database — you can access it and use it with full privileges. We simply provide tools which makes PostgreSQL as easy to use as Firebase.
-
-- Official Docs: [postgresql.org/docs](https://www.postgresql.org/docs/current/index.html)
-- Source code: [github.com/postgres/postgres](https://github.com/postgres/postgres) (mirror)
-- License: [PostgreSQL Licence](https://www.postgresql.org/about/licence/)
-- Language: C
-
-### Studio (Dashboard)
-
-An open source Dashboard for managing your database and services.
-
-- Official Docs: [Supabase docs](/docs)
-- Source code: [github.com/supabase/supabase](https://github.com/supabase/supabase/tree/master/studio)
-- License: [Apache 2](https://github.com/supabase/supabase/blob/master/LICENSE)
-- Language: TypeScript
-
-### GoTrue (Auth)
-
-A JWT-based API for managing users and issuing access tokens. This integrates with PostgreSQL's Row Level Security and the API servers.
-
-- Official Docs: [Supabase Auth reference docs](/docs/reference/auth)
-- Source code: [github.com/supabase/gotrue](https://github.com/supabase/gotrue)
-- License: [MIT](https://github.com/supabase/gotrue/blob/master/LICENSE)
-- Language: Go
-
-### PostgREST (API)
-
-A standalone web server that turns your PostgreSQL database directly into a RESTful API.
-We use this with our [pg_graphql](https://github.com/supabase/pg_graphql) extension to provide a GraphQL API.
-
-- Official Docs: [postgrest.org](https://postgrest.org/)
-- Source code: [github.com/PostgREST/postgrest](https://github.com/PostgREST/postgrest)
-- License: [MIT](https://github.com/PostgREST/postgrest/blob/main/LICENSE)
-- Language: Haskel
-
-### Realtime (API & multiplayer)
-
-A scalable websocket engine for managing user Presence, broadcasting messages, and streaming database changes.
-
-- Official Docs: [Supabase Realtime docs](/docs/guides/realtime)
-- Source code: [github.com/supabase/realtime](https://github.com/supabase/realtime)
-- License: [Apache 2](https://github.com/supabase/realtime/blob/main/LICENSE)
-- Language: Elixir
-
-### Storage API (large file storage)
-
-An S3-compatible object storage service that stores metadata in Postgres.
-
-- Official Docs: [Supabase Storage reference docs](/docs/reference/storage)
-- Source code: [github.com/supabase/storage-api](https://github.com/supabase/storage-api)
-- License: [Apache 2.0](https://github.com/supabase/storage-api/blob/master/LICENSE)
-- Language: NodeJS / TypeScript
-
-### Deno (Edge Functions)
-
-A modern runtime for JavaScript and TypeScript.
-
-- Official Docs: [deno.land](https://deno.land/)
-- Source code: [github.com/denoland/deno](https://github.com/denoland/deno)
-- License: [MIT](https://github.com/denoland/deno/blob/main/LICENSE.md)
-- Language: TypeScript / Rust
-
-### postgres-meta (Database management)
-
-A RESTful API for managing your Postgres. Fetch tables, add roles, and run queries.
-
-- Official Docs: [supabase.github.io/postgres-meta](https://supabase.github.io/postgres-meta/)
-- Source code: [github.com/supabase/postgres-meta](https://github.com/supabase/postgres-meta)
-- License: [Apache 2.0](https://github.com/supabase/postgres-meta/blob/master/LICENSE)
-- Language: NodeJS / TypeScript
-
-### PgBouncer
-
-A lightweight connection pooler for PostgreSQL. This is useful for connecting to Postgres when using Serverless functions.
-
-- Official Docs: [pgbouncer.org](http://www.pgbouncer.org/)
-- Source code: [pgbouncer/pgbouncer](https://github.com/pgbouncer/pgbouncer)
-- License: [ISC](https://github.com/pgbouncer/pgbouncer/blob/master/COPYRIGHT)
-- Language: C
-
-### Kong (API Gateway)
-
-A cloud-native API gateway, built on top of Nginx.
-
-- Official Docs: [docs.konghq.com](https://docs.konghq.com/)
-- Source code: [github.com/kong/kong](https://github.com/kong/kong)
-- License: [Apache 2.0](https://github.com/Kong/kong/blob/master/LICENSE)
-- Language: Lua
-
-## Product Principles
-
-It is our goal to provide an architecture that any large-scale company would design for themselves,
-and then provide tooling around that architecture that is easy-to-use for indie-developers and small teams.
-
-We use a series of principles to ensure that scalability and usability are never mutually exclusive:
-
-### Everything works in isolation
-
-Each system must work as a standalone tool with as few moving parts as possible.
-The litmus test for this is: "Can a user run this product with nothing but a Postgres database?"
-
-### Everything is integrated
-
-Supabase is composable. Even though every product works in isolation, each product on the platform needs to 10x the other products.
-For integration, each tool should expose an API and Webhooks.
-
-### Everything is extensible
-
-We're deliberate about adding a new tool, and prefer instead to extend an existing one.
-This is the opposite of many cloud providers whose product offering expands into niche use-cases. We provide _primitives_ for developers, which allow them to achieve any goal.
-Less, but better.
-
-### Everything is portable
-
-To avoid lock-in, we make it easy to migrate in and out. Our cloud offering is compatible with our self-hosted product.
-We use existing standards to increase portability (like pg_dump an CSV files). If a new standard emerges which competes with a "Supabase" approach, we will deprecate the approach in favor of the standard.
-This forces us compete on experience. We aim to be the best Postgres hosting service.
-
-### Play the long game
-
-We sacrifice short-term wins for long-term gains. For example, it is tempting to run a fork of Postgres with additional functionality which only our customers need.
-Instead, we prefer to support efforts to upstream missing functionality so that the entire community benefits. This has the additional benefit of ensuring portability and longevity.
-
-### Build for developers
-
-"Developers" are a specific profile of user: they are _builders_.
-When assessing impact as a function of effort, developers have a large efficiency due to the type of products and systems they can build.
-As the profile of a developer changes over time, Supabase will continue to evolve the product to fit this evolving profile.
-
-### Support existing tools
-
-Supabase supports existing tools and communities wherever possible. Supabase is more like a "community of communities" - each tool typically has its own community
-which we work with.
-Open source is something we approach [collaboratively](https://supabase.com/blog/supabase-series-b#giving-back): we employ maintainers, sponsor projects, invest in businesses, and develop our own open source tools.
-
-export const Page = ({ children }) => <Layout meta={meta} children={children} />
-
-export default Page
diff --git a/apps/docs/pages/guides/auth/auth-helpers/nextjs-server-components.mdx b/apps/docs/pages/guides/auth/auth-helpers/nextjs-server-components.mdx
index a49f6c3c2ca..69a5d5e6d3c 100644
--- a/apps/docs/pages/guides/auth/auth-helpers/nextjs-server-components.mdx
+++ b/apps/docs/pages/guides/auth/auth-helpers/nextjs-server-components.mdx
@@ -10,6 +10,8 @@ export const meta = {
 
 This submodule provides experimental convenience helpers for implementing user authentication in Next.js Server Components - the `app` directory. For examples using the `pages` directory check out [Auth Helpers in Next.js](/docs/guides/auth/auth-helpers/nextjs).
 
+> For a complete implementation example, check out [this repo](https://github.com/supabase/auth-helpers/tree/main/examples/nextjs-server-components).
+
 > To learn more about fetching and caching Supabase data with Next.js 13 Server Components, check out our [blog](/blog/fetching-and-caching-supabase-data-in-next-js-server-components) or [live stream](https://www.youtube.com/watch?v=QH0P5xZt5wY).
 
 ## Install the Next.js helper library
@@ -52,6 +54,8 @@ NEXT_PUBLIC_SUPABASE_ANON_KEY=YOUR_SUPABASE_ANON_KEY
 
 ## Creating a Supabase Client
 
+### Server-side
+
 <Tabs
   scrollable
   size="small"
@@ -60,23 +64,13 @@ NEXT_PUBLIC_SUPABASE_ANON_KEY=YOUR_SUPABASE_ANON_KEY
 >
 <TabPanel id="js" label="JavaScript">
 
-Create a new file at `/utils/supabase-browser.js` and populate with the following:
-
-```js title="/utils/supabase-browser.js"
-import { createBrowserSupabaseClient } from '@supabase/auth-helpers-nextjs'
-
-export default createBrowserSupabaseClient()
-```
-
-This will be used any time we need to create a Supabase client _client-side_ - in `useEffect`, for example.
-
 Create a new file at `/utils/supabase-server.js` and populate with the following:
 
 ```js title="/utils/supabase-server.js"
 import { headers, cookies } from 'next/headers'
 import { createServerComponentSupabaseClient } from '@supabase/auth-helpers-nextjs'
 
-export default () =>
+export const createClient = () =>
   createServerComponentSupabaseClient({
     headers,
     cookies,
@@ -85,33 +79,19 @@ export default () =>
 
 > This needs to export a function, as the headers and cookies are not populated with values until the Server Component is requesting data.
 
-This will be used any time we need to create a Supabase client _server-side_ - in a Server Component, for example.
-
 </TabPanel>
 
 <TabPanel id="ts" label="TypeScript">
 
-Create a new file at `/utils/supabase-browser.ts` and populate with the following:
-
-```ts
-import { createBrowserSupabaseClient } from '@supabase/auth-helpers-nextjs'
-import { Database } from '../lib/database.types'
-
-export default createBrowserSupabaseClient<Database>()
-```
-
-> TypeScript types can be [generated with the Supabase CLI](https://supabase.com/docs/reference/javascript/typescript-support) and passed to `createBrowserSupabaseClient` to add type support to the Supabase client.
-
-This will be used any time we need to create a Supabase client _client-side_ - in `useEffect`, for example.
-
 Create a new file at `/utils/supabase-server.ts` and populate with the following:
 
 ```ts title="/utils/supabase-server.ts"
 import { headers, cookies } from 'next/headers'
 import { createServerComponentSupabaseClient } from '@supabase/auth-helpers-nextjs'
-import { Database } from '../lib/database.types'
 
-export default () =>
+import type { Database } from '../lib/database.types'
+
+export const createClient = () =>
   createServerComponentSupabaseClient<Database>({
     headers,
     cookies,
@@ -122,14 +102,12 @@ export default () =>
 
 > This needs to export a function, as the headers and cookies are not populated with values until the Server Component is requesting data.
 
-This will be used any time we need to create a Supabase client _server-side_ - in a Server Component, for example.
-
 </TabPanel>
 </Tabs>
 
-## Middleware
+This will be used any time we need to create a Supabase client _server-side_ - in a Server Component, for example.
 
-Middleware runs before every route declared in the `matcher` array. Since we don't have access to set cookies or headers from Server Components, we need to create a Middleware Supabase client and refresh the user's session by calling `getSession()`.
+Next, we need a middleware file to refresh the user's session on navigation.
 
 <Tabs
   scrollable
@@ -139,7 +117,7 @@ Middleware runs before every route declared in the `matcher` array. Since we don
 >
 <TabPanel id="js" label="JavaScript">
 
-Create a new file at `/app/middleware.js` and populate with the following:
+Create a new `/app/middleware.js` file and populate with the following:
 
 ```jsx title="middleware.js"
 import { createMiddlewareSupabaseClient } from '@supabase/auth-helpers-nextjs'
@@ -156,27 +134,25 @@ export async function middleware(req) {
 
   return res
 }
-
-export const config = {
-  matcher: ['/optional-session', '/required-session', '/realtime'],
-}
 ```
 
 </TabPanel>
 
 <TabPanel id="ts" label="TypeScript">
 
-Create a new file at `/app/middleware.ts` and populate with the following:
+Create a new `/app/middleware.ts` file and populate with the following:
 
 ```tsx title="middleware.ts"
 import { createMiddlewareSupabaseClient } from '@supabase/auth-helpers-nextjs'
 import { NextResponse } from 'next/server'
+
 import type { NextRequest } from 'next/server'
+import type { Database } from '../lib/database.types'
 
 export async function middleware(req: NextRequest) {
   const res = NextResponse.next()
 
-  const supabase = createMiddlewareSupabaseClient({ req, res })
+  const supabase = createMiddlewareSupabaseClient<Database>({ req, res })
 
   const {
     data: { session },
@@ -184,20 +160,34 @@ export async function middleware(req: NextRequest) {
 
   return res
 }
-
-export const config = {
-  matcher: ['/optional-session', '/required-session', '/realtime'],
-}
 ```
 
+> TypeScript types can be [generated with the Supabase CLI](https://supabase.com/docs/reference/javascript/typescript-support) and passed to `createMiddlewareSupabaseClient` to add type support to the Supabase client.
+
 </TabPanel>
 </Tabs>
 
-> Any Server Component route that uses a Supabase client must be added to this middleware's `matcher` array. Without this, the Server Component may try to make a request to Supabase with an expired `access_token`.
+We can now use our server-side Supabase client to fetch data in Server Components.
 
-## Supabase Listener
+```jsx
+import 'server-only'
 
-We need to set up a listener to fetch fresh data whenever our user logs in or out.
+import { createClient } from '../../utils/supabase-server'
+
+// do not cache this page
+export const revalidate = 0
+
+export default async function ServerComponent() {
+  const supabase = createClient()
+  const { data } = await supabase.from('posts').select('*')
+
+  return <pre>{JSON.stringify({ data }, null, 2)}</pre>
+}
+```
+
+### Client-side
+
+We still need a Supabase instance client-side for authentication and realtime subscriptions. It is important, when using Supabase client-side, to have a single instance of a client. We can share this singleton instance across our components using providers and React context.
 
 <Tabs
   scrollable
@@ -207,286 +197,291 @@ We need to set up a listener to fetch fresh data whenever our user logs in or ou
 >
 <TabPanel id="js" label="JavaScript">
 
-Create a `/components/supabase-listener.jsx` file and add the following:
+Create a new file at `/utils/supabase-browser.js` and populate with the following:
+
+```js title="/utils/supabase-browser.js"
+import { createBrowserSupabaseClient } from '@supabase/auth-helpers-nextjs'
+export const createClient = () => createBrowserSupabaseClient()
+```
+
+</TabPanel>
+
+<TabPanel id="ts" label="TypeScript">
+
+Create a new file at `/utils/supabase-browser.ts` and populate with the following:
+
+```ts
+import { createBrowserSupabaseClient } from '@supabase/auth-helpers-nextjs'
+import { Database } from '../lib/database.types'
+
+export const createClient = () => createBrowserSupabaseClient<Database>()
+```
+
+> TypeScript types can be [generated with the Supabase CLI](https://supabase.com/docs/reference/javascript/typescript-support) and passed to `createBrowserSupabaseClient` to add type support to the Supabase client.
+
+</TabPanel>
+</Tabs>
+
+<Tabs
+  scrollable
+  size="small"
+  type="underlined"
+  defaultActiveId="js"
+>
+<TabPanel id="js" label="JavaScript">
+
+Next, we need to create a single instance of Supabase to use client-side. Let's create a new Provider for Supabase at `/components/supabase-provider.jsx` and populate with the following:
+
+```jsx title=components/supabase-provider.jsx
+'use client'
+
+import { createContext, useContext, useState } from 'react'
+import { createClient } from '../utils/supabase-browser'
+
+const Context = createContext()
+
+export default function SupabaseProvider({ children }) {
+  const [supabase] = useState(() => createClient())
+
+  useEffect(() => {
+    const { data: { subscription } } = supabase.auth.onAuthStateChange((event, session) => {
+      if (session?.access_token !== accessToken) {
+        router.refresh()
+      }
+    })
+
+    return () => subscription.unsubscribe()
+  }, [accessToken])
+
+  return (
+    <Context.Provider value={{ supabase }}>
+      <>{children}</>
+    </Context.Provider>
+  )
+}
+
+export const useSupabase = () => useContext(Context)
+```
+
+</TabPanel>
+
+<TabPanel id="ts" label="TypeScript">
+
+Next, we need to create a single instance of Supabase to use client-side. Let's create a new Provider for Supabase at `/components/supabase-provider.tsx` and populate with the following:
+
+```tsx title=components/supabase-provider.tsx
+'use client'
+
+import { createContext, useContext, useState } from 'react'
+import { createClient } from '../utils/supabase-browser'
+
+import type { SupabaseClient } from '@supabase/auth-helpers-nextjs'
+import type { Database } from '../lib/database.types'
+
+type SupabaseContext = {
+  supabase: SupabaseClient<Database>
+}
+
+const Context = createContext<SupabaseContext>()
+
+export default function SupabaseProvider({ children }: { children: React.ReactNode }) {
+  const [supabase] = useState(() => createClient())
+
+  return (
+    <Context.Provider value={{ supabase }}>
+      <>{children}</>
+    </Context.Provider>
+  )
+}
+
+export const useSupabase = () => useContext(Context)
+```
+
+> TypeScript types can be [generated with the Supabase CLI](https://supabase.com/docs/reference/javascript/typescript-support) and passed to `createBrowserSupabaseClient` to add type support to the Supabase client.
+
+</TabPanel>
+</Tabs>
+
+We need to set up a listener to fetch fresh data whenever our user logs in or out. For this we need to check whether our client and server sessions match. Let's start by installing the `server-only` package.
+
+```bash
+npm install server-only
+```
+
+This will ensure that any component that imports this package will be a Server Component, and excluded from the browser bundle.
+
+Next, let's modify our root layout to fetch the user's session, wrap our application in our Supabase Provider, and pass the server access token as a prop to the `<SupabaseListener />` component (we will create this next).
+
+<Tabs
+  scrollable
+  size="small"
+  type="underlined"
+  defaultActiveId="js"
+>
+<TabPanel id="js" label="JavaScript">
+
+```jsx title=app/layout.jsx
+import 'server-only'
+
+import SupabaseListener from '../components/supabase-listener'
+import SupabaseProvider from '../components/supabase-provider'
+import './globals.css'
+import { createClient } from '../utils/supabase-server'
+
+// do not cache this layout
+export const revalidate = 0
+
+export default async function RootLayout({ children }) {
+  const supabase = createClient()
+
+  const {
+    data: { session },
+  } = await supabase.auth.getSession()
+
+  return (
+    <html lang="en">
+      {/*
+      <head /> will contain the components returned by the nearest parent
+      head.tsx. Find out more at https://beta.nextjs.org/docs/api-reference/file-conventions/head
+    */}
+      <head />
+      <body>
+        <SupabaseProvider>
+          <SupabaseListener serverAccessToken={session?.access_token} />
+          {children}
+        </SupabaseProvider>
+      </body>
+    </html>
+  )
+}
+```
+
+</TabPanel>
+
+<TabPanel id="ts" label="TypeScript">
+
+```tsx title=app/layout.tsx
+import 'server-only'
+
+import SupabaseListener from '../components/supabase-listener'
+import SupabaseProvider from '../components/supabase-provider'
+import './globals.css'
+import { createClient } from '../utils/supabase-server'
+
+// do not cache this layout
+export const revalidate = 0
+
+export default async function RootLayout({ children }: { children: React.ReactNode }) {
+  const supabase = createClient()
+
+  const {
+    data: { session },
+  } = await supabase.auth.getSession()
+
+  return (
+    <html lang="en">
+      {/*
+      <head /> will contain the components returned by the nearest parent
+      head.tsx. Find out more at https://beta.nextjs.org/docs/api-reference/file-conventions/head
+    */}
+      <head />
+      <body>
+        <SupabaseProvider>
+          <SupabaseListener serverAccessToken={session?.access_token} />
+          {children}
+        </SupabaseProvider>
+      </body>
+    </html>
+  )
+}
+```
+
+</TabPanel>
+</Tabs>
+
+And now create our Supabase listener component that uses the singleton Supabase instance to listen for auth changes.
+
+<Tabs
+  scrollable
+  size="small"
+  type="underlined"
+  defaultActiveId="js"
+>
+<TabPanel id="js" label="JavaScript">
 
 ```jsx title="/components/supabase-listener.jsx"
 'use client'
 
 import { useRouter } from 'next/navigation'
 import { useEffect } from 'react'
-import supabase from '../utils/supabase-browser'
+import { useSupabase } from './supabase-provider'
 
-export default function SupabaseListener({ accessToken }) {
+export default function SupabaseListener({ serverAccessToken }) {
+  const { supabase } = useSupabase()
   const router = useRouter()
 
   useEffect(() => {
-    const { data: subscription } = supabase.auth.onAuthStateChange((event, session) => {
-      if (session?.access_token !== accessToken) {
+    const {
+      data: { subscription },
+    } = supabase.auth.onAuthStateChange((event, session) => {
+      if (session?.access_token !== serverAccessToken) {
         router.refresh()
       }
     })
-  
-    return () => subscription.unsubscribe()
-  }, [accessToken])
+
+    return () => {
+      subscription.unsubscribe()
+    }
+  }, [serverAccessToken, router, supabase])
 
   return null
 }
 ```
 
-> `use client` tells Next.js that this is a [Client Component](https://beta.nextjs.org/docs/rendering/server-and-client-components#client-components). Only Client Components can use hooks like `useEffect` and `useRouter`.
-
-The function we pass to `onAuthStateChange` is automatically called by Supabase whenever a user's session changes. This component takes an `accessToken` prop, which will be the server's state for our user (we'll set this up next). If the `accessToken` from the server and the new `access_token` do not match then the client and server are out of sync, therefore, we want to reload the active route.
-
-Lastly, fetch the server-side session in the `RootLayout` and pass it to our new `<SupabaseListener />` component.
-
-```jsx title="/app/layout.jsx"
-import SupabaseListener from '../components/supabase-listener'
-import createClient from '../utils/supabase-server'
-
-export default async function RootLayout({ children }) {
-  const supabase = createClient()
-
-  const {
-    data: { session },
-  } = await supabase.auth.getSession()
-
-  return (
-    // html and head section omitted
-    <body>
-      <SupabaseListener accessToken={session?.access_token} />
-      {children}
-    </body>
-  )
-}
-```
-
-We don't want Next.js to cache this `session` value, so we need to export a `revalidate` value of `0` in the layout file.
-
-```jsx
-export const revalidate = 0
-```
-
-We also want to tell Next.js to explicitly exclude this component's code from the client bundle by installing the `server-only` package:
-
-```bash
-npm install server-only
-```
-
-And importing it at the top of our component.
-
-```jsx
-import 'server-only'
-```
-
-The entire Layout component should look something like this:
-
-```jsx title="/app/layout.jsx"
-import 'server-only'
-
-import SupabaseListener from '../components/supabase-listener'
-import './globals.css'
-import createClient from '../utils/supabase-server'
-
-// do not cache this layout
-export const revalidate = 0
-
-export default async function RootLayout({ children }) {
-  const supabase = createClient()
-
-  const {
-    data: { session },
-  } = await supabase.auth.getSession()
-
-  return (
-    <html lang="en">
-      {/*
-        <head /> will contain the components returned by the nearest parent
-        head.jsx. Find out more at https://beta.nextjs.org/docs/api-reference/file-conventions/head
-      */}
-      <head />
-      <body>
-        <SupabaseListener accessToken={session?.access_token} />
-        {children}
-      </body>
-    </html>
-  )
-}
-```
-
 </TabPanel>
 
 <TabPanel id="ts" label="TypeScript">
 
-Create a `/components/supabase-listener.tsx` file and add the following:
-
 ```tsx title="/components/supabase-listener.tsx"
 'use client'
 
 import { useRouter } from 'next/navigation'
 import { useEffect } from 'react'
-import supabase from '../utils/supabase-browser'
+import { useSupabase } from './supabase-provider'
 
-export default function SupabaseListener({ accessToken }: { accessToken?: string }) {
+export default function SupabaseListener({ serverAccessToken }: { serverAccessToken?: string }) {
+  const { supabase } = useSupabase()
   const router = useRouter()
 
   useEffect(() => {
-    supabase.auth.onAuthStateChange((event, session) => {
-      if (session?.access_token !== accessToken) {
+    const {
+      data: { subscription },
+    } = supabase.auth.onAuthStateChange((event, session) => {
+      if (session?.access_token !== serverAccessToken) {
         router.refresh()
       }
     })
-  }, [accessToken])
+
+    return () => {
+      subscription.unsubscribe()
+    }
+  }, [serverAccessToken, router, supabase])
 
   return null
 }
 ```
 
+</TabPanel>
+</Tabs>
+
 > `use client` tells Next.js that this is a [Client Component](https://beta.nextjs.org/docs/rendering/server-and-client-components#client-components). Only Client Components can use hooks like `useEffect` and `useRouter`.
 
-The function we pass to `onAuthStateChange` is automatically called by Supabase whenever a user's session changes. This component takes an `accessToken` prop, which will be the server's state for our user (we'll set this up next). If the `accessToken` from the server and the new `access_token` do not match then the client and server are out of sync, therefore, we want to reload the active route.
+The function we pass to `onAuthStateChange` is automatically called by Supabase whenever a user's session changes. This component takes an `serverAccessToken` prop, which is the server's state for our user. If the `serverAccessToken` and the new session's `access_token` do not match then the client and server are out of sync, therefore, we want to reload the active route.
 
-Lastly, fetch the server-side session in the `RootLayout` and pass it to our new `<SupabaseListener />` component.
-
-```tsx title="/app/layout.tsx"
-import SupabaseListener from '../components/supabase-listener'
-import createClient from '../utils/supabase-server'
-
-export default async function RootLayout({ children }: { children: React.ReactNode }) {
-  const supabase = createClient()
-
-  const {
-    data: { session },
-  } = await supabase.auth.getSession()
-
-  return (
-    // html and head section omitted
-    <body>
-      <SupabaseListener accessToken={session?.access_token} />
-      {children}
-    </body>
-  )
-}
-```
-
-> Again, TypeScript types can be [generated with the Supabase CLI](https://supabase.com/docs/reference/javascript/typescript-support) and passed to `createServerComponentSupabaseClient` to add type support to the Supabase client.
-
-We don't want Next.js to cache this `session` value, so we need to export a `revalidate` value of `0`.
-
-```tsx
-export const revalidate = 0
-```
-
-We also want to tell Next.js to explicitly exclude this component's code from the client bundle by installing the `server-only` package:
-
-```bash
-npm install server-only
-```
-
-And importing it at the top of our component.
-
-```tsx
-import 'server-only'
-```
-
-The entire Layout component should look something like this:
-
-```tsx title="/app/layout.tsx"
-import 'server-only'
-
-import SupabaseListener from '../components/supabase-listener'
-import './globals.css'
-import createClient from '../utils/supabase-server'
-
-// do not cache this layout
-export const revalidate = 0
-
-export default async function RootLayout({ children }: { children: React.ReactNode }) {
-  const supabase = createClient()
-
-  const {
-    data: { session },
-  } = await supabase.auth.getSession()
-
-  return (
-    <html lang="en">
-      {/*
-        <head /> will contain the components returned by the nearest parent
-        head.tsx. Find out more at https://beta.nextjs.org/docs/api-reference/file-conventions/head
-      */}
-      <head />
-      <body>
-        <SupabaseListener accessToken={session?.access_token} />
-        {children}
-      </body>
-    </html>
-  )
-}
-```
-
-</TabPanel>
-</Tabs>
-
-Supabase can now be used in any Client or Server component.
-
-## Server Components
-
-Next.js recommends fetching data in Server Components whenever possible.
-
-<Tabs
-  scrollable
-  size="small"
-  type="underlined"
-  defaultActiveId="js"
->
-<TabPanel id="js" label="JavaScript">
-
-```jsx
-import 'server-only'
-
-import createClient from '../../utils/supabase-server'
-
-// do not cache this page
-export const revalidate = 0
-
-export default async function ServerComponent() {
-  const supabase = createClient()
-  const { data } = await supabase.from('posts').select('*')
-
-  return <pre>{JSON.stringify({ data }, null, 2)}</pre>
-}
-```
-
-</TabPanel>
-
-<TabPanel id="ts" label="TypeScript">
-
-```tsx
-import 'server-only'
-
-import createClient from '../../utils/supabase-server'
-
-// do not cache this page
-export const revalidate = 0
-
-export default async function ServerComponent() {
-  const supabase = createClient()
-  const { data } = await supabase.from('posts').select('*')
-
-  return <pre>{JSON.stringify({ data }, null, 2)}</pre>
-}
-```
-
-</TabPanel>
-</Tabs>
-
-## Client Components
-
-While Next.js recommend doing all data fetching in Server Components, we still need Supabase client-side for things like authentication and subscribing to realtime updates.
+Now we can use our `useSupabase` hook throughout our client-side components.
 
 ### Authentication
 
-We can call any of [Supabase's authentication methods](https://supabase.com/docs/reference/javascript/v1/auth-signin) - such as `supabase.auth.signInWithOAuth` - from a client component.
-
 <Tabs
   scrollable
   size="small"
@@ -498,30 +493,33 @@ We can call any of [Supabase's authentication methods](https://supabase.com/docs
 ```jsx title="/components/login.jsx"
 'use client'
 
-import supabase from '../utils/supabase-browser'
+import { useSupabase } from './supabase-provider'
 
+// Supabase auth needs to be triggered client-side
 export default function Login() {
-  const handleLogin = async () => {
-    const { error } = await supabase.auth.signInWithOAuth({
+  const { supabase, session } = useSupabase()
+
+  const handleEmailLogin = async () => {
+    await supabase.auth.signInWithPassword({
+      email: 'jon@supabase.com',
+      password: 'password',
+    })
+  }
+
+  const handleGitHubLogin = async () => {
+    await supabase.auth.signInWithOAuth({
       provider: 'github',
     })
-
-    if (error) {
-      console.log({ error })
-    }
   }
 
   const handleLogout = async () => {
-    const { error } = await supabase.auth.signOut()
-
-    if (error) {
-      console.log({ error })
-    }
+    await supabase.auth.signOut()
   }
 
   return (
     <>
-      <button onClick={handleLogin}>Login</button>
+      <button onClick={handleEmailLogin}>Email Login</button>
+      <button onClick={handleGitHubLogin}>GitHub Login</button>
       <button onClick={handleLogout}>Logout</button>
     </>
   )
@@ -535,30 +533,33 @@ export default function Login() {
 ```tsx title="/components/login.tsx"
 'use client'
 
-import supabase from '../utils/supabase-browser'
+import { useSupabase } from './supabase-provider'
 
+// Supabase auth needs to be triggered client-side
 export default function Login() {
-  const handleLogin = async () => {
-    const { error } = await supabase.auth.signInWithOAuth({
+  const { supabase, session } = useSupabase()
+
+  const handleEmailLogin = async () => {
+    await supabase.auth.signInWithPassword({
+      email: 'jon@supabase.com',
+      password: 'password',
+    })
+  }
+
+  const handleGitHubLogin = async () => {
+    await supabase.auth.signInWithOAuth({
       provider: 'github',
     })
-
-    if (error) {
-      console.log({ error })
-    }
   }
 
   const handleLogout = async () => {
-    const { error } = await supabase.auth.signOut()
-
-    if (error) {
-      console.log({ error })
-    }
+    await supabase.auth.signOut()
   }
 
   return (
     <>
-      <button onClick={handleLogin}>Login</button>
+      <button onClick={handleEmailLogin}>Email Login</button>
+      <button onClick={handleGitHubLogin}>GitHub Login</button>
       <button onClick={handleLogout}>Logout</button>
     </>
   )
@@ -588,10 +589,11 @@ Create a new file at `/app/realtime/posts.jsx` and populate with the following:
 'use client'
 
 import { useEffect, useState } from 'react'
-import supabase from '../../utils/supabase-browser'
+import { useSupabase } from '../../components/supabase-provider'
 
 export default function Posts({ serverPosts }) {
   const [posts, setPosts] = useState(serverPosts)
+  const { supabase } = useSupabase()
 
   useEffect(() => {
     setPosts(serverPosts)
@@ -608,14 +610,12 @@ export default function Posts({ serverPosts }) {
     return () => {
       supabase.removeChannel(channel)
     }
-  }, [serverPosts])
+  }, [supabase, setPosts, posts])
 
   return <pre>{JSON.stringify(posts, null, 2)}</pre>
 }
 ```
 
-> The first `useEffect` is required to overwrite posts if the `serverPosts` prop changes.
-
 This can now be used in a Server Component to subscribe to realtime updates.
 
 Create a new file at `/app/realtime/page.jsx` and populate with the following:
@@ -623,7 +623,7 @@ Create a new file at `/app/realtime/page.jsx` and populate with the following:
 ```jsx title="/app/realtime/page.jsx"
 import 'server-only'
 
-import createClient from '../../utils/supabase-server'
+import { createClient } from '../../utils/supabase-server'
 import Posts from './posts'
 
 // do not cache this page
@@ -647,13 +647,15 @@ Create a new file at `/app/realtime/posts.tsx` and populate with the following:
 'use client'
 
 import { useEffect, useState } from 'react'
-import { Database } from '../lib/database.types'
-import supabase from '../../utils/supabase-browser'
+import { useSupabase } from '../../components/supabase-provider'
+
+import type { Database } from '../../lib/database.types'
 
 type Post = Database['public']['Tables']['posts']['Row']
 
 export default function Posts({ serverPosts }: { serverPosts: Post[] }) {
   const [posts, setPosts] = useState(serverPosts)
+  const { supabase } = useSupabase()
 
   useEffect(() => {
     setPosts(serverPosts)
@@ -670,13 +672,13 @@ export default function Posts({ serverPosts }: { serverPosts: Post[] }) {
     return () => {
       supabase.removeChannel(channel)
     }
-  }, [serverPosts])
+  }, [supabase, setPosts, posts])
 
   return <pre>{JSON.stringify(posts, null, 2)}</pre>
 }
 ```
 
-> The first `useEffect` is required to overwrite posts if the `serverPosts` prop changes.
+> TypeScript types can be [generated with the Supabase CLI](https://supabase.com/docs/reference/javascript/typescript-support) and passed to `createServerSupabaseClient` to add type support to the Supabase client.
 
 This can now be used in a Server Component to subscribe to realtime updates.
 
@@ -685,7 +687,7 @@ Create a new file at `/app/realtime/page.tsx` and populate with the following:
 ```tsx title="/app/realtime/page.tsx"
 import 'server-only'
 
-import createClient from '../../utils/supabase-server'
+import { createClient } from '../../utils/supabase-server'
 import Posts from './posts'
 
 // do not cache this page
diff --git a/apps/docs/pages/guides/auth/auth-helpers/nextjs.mdx b/apps/docs/pages/guides/auth/auth-helpers/nextjs.mdx
index 76e169c2271..9985e50fb92 100644
--- a/apps/docs/pages/guides/auth/auth-helpers/nextjs.mdx
+++ b/apps/docs/pages/guides/auth/auth-helpers/nextjs.mdx
@@ -584,7 +584,7 @@ export async function middleware(req: NextRequest) {
 }
 
 export const config = {
-  matcher: '/middleware-protected',
+  matcher: '/middleware-protected/:path*',
 }
 ```
 
@@ -782,7 +782,7 @@ export const config = {
 
 ### Migrating to v0.4.X and supabase-js v2
 
-With the update to `supabase-js` v2 the `auth` API routes are no longer required, therefore you can go ahead and delete your `auth` directory under the `/pages/api/` directory. Please refer to the [v2 migration guide](/docs/reference/javascript/upgrade-guide) for the full set of changes within supabase-js.
+With the update to `supabase-js` v2 the `auth` API routes are no longer required, therefore you can go ahead and delete your `auth` directory under the `/pages/api/` directory. Please refer to the [v2 migration guide](/docs/reference/javascript/v1/upgrade-guide) for the full set of changes within supabase-js.
 
 The `/api/auth/logout` API route has been removed, please use the `signout` method instead:
 
diff --git a/apps/docs/pages/guides/auth/managing-user-data.mdx b/apps/docs/pages/guides/auth/managing-user-data.mdx
index 8d6e414eb05..354887db429 100644
--- a/apps/docs/pages/guides/auth/managing-user-data.mdx
+++ b/apps/docs/pages/guides/auth/managing-user-data.mdx
@@ -12,9 +12,7 @@ Even though Supabase provides an `auth.users` table, it can be helpful to create
 
 ## Creating user tables
 
-When you create tables to store user data, it's helpful to reference the `auth.users` table in the primary key. This ensures data integrity.
-
-For example, a `public.profiles` table might look like this:
+When you create tables to store user data, it's helpful to reference the `auth.users` table in the primary key to ensure data integrity. Also specify the `on delete cascade` clause when referencing `auth.users`. Omitting it may cause problems when deleting users. For example, a `public.profiles` table might look like this:
 
 ```sql
 create table public.profiles (
@@ -28,9 +26,11 @@ create table public.profiles (
 alter table public.profiles enable row level security;
 ```
 
-<Admonition type="note">
+<Admonition type="caution">
 
-Make sure to specify the `on delete cascade` clause when referencing `auth.users`. Omitting it may cause problems when deleting users.
+Only use primary keys as [foreign key references](https://www.postgresql.org/docs/current/tutorial-fk.html) for schemas and tables like `auth.users` which are managed by Supabase. PostgreSQL lets you specify a foreign key reference for columns backed by a unique index (not necessarily primary keys).
+
+Primary keys are **guaranteed not to change**. Columns, indices, constraints or other database objects managed by Supabase **may change at any time** and you should be careful when referencing them directly.
 
 </Admonition>
 
diff --git a/apps/docs/pages/guides/auth/social-login/auth-azure.mdx b/apps/docs/pages/guides/auth/social-login/auth-azure.mdx
index d75a365b1d5..57f398456b0 100644
--- a/apps/docs/pages/guides/auth/social-login/auth-azure.mdx
+++ b/apps/docs/pages/guides/auth/social-login/auth-azure.mdx
@@ -74,14 +74,12 @@ When your user signs in, call [signInWithOAuth()](/docs/reference/javascript/aut
 
 ```js
 async function signInWithAzure() {
-  const { data, error } = await supabase.auth.signInWithOAuth(
-    {
-      provider: 'azure',
-    },
-    {
+  const { data, error } = await supabase.auth.signInWithOAuth({
+    provider: 'azure',
+    options: {
       scopes: 'email',
-    }
-  )
+    },
+  })
 }
 ```
 
diff --git a/apps/docs/pages/guides/resources/supabase-cli.mdx b/apps/docs/pages/guides/cli.mdx
similarity index 95%
rename from apps/docs/pages/guides/resources/supabase-cli.mdx
rename to apps/docs/pages/guides/cli.mdx
index ef861654950..a17186d3d76 100644
--- a/apps/docs/pages/guides/resources/supabase-cli.mdx
+++ b/apps/docs/pages/guides/cli.mdx
@@ -1,12 +1,9 @@
 import Layout from '~/layouts/DefaultGuideLayout'
 
 export const meta = {
-  id: 'cli',
   title: 'Supabase CLI',
   description:
     'The Supabase CLI provides tools to develop your project locally and deploy to the Supabase Platform.',
-  sidebar_label: 'Overview',
-  toc_max_heading_level: 2,
 }
 
 The Supabase CLI provides tools to develop your project locally and deploy to the Supabase Platform.
@@ -113,7 +110,8 @@ brew upgrade supabase
 
 ## See also
 
-- [Supabase CLI Reference](/docs/reference/cli/usage)
+- [Supabase CLI Reference](/docs/reference/cli/introduction)
+- [Supabase CLI Configuration](/docs/reference/cli/config)
 - [Local Development](/docs/guides/cli/local-development)
 - [Managing Environments](/docs/guides/cli/managing-environments)
 
diff --git a/apps/docs/pages/guides/resources/supabase-cli/local-development.mdx b/apps/docs/pages/guides/cli/local-development.mdx
similarity index 99%
rename from apps/docs/pages/guides/resources/supabase-cli/local-development.mdx
rename to apps/docs/pages/guides/cli/local-development.mdx
index b0f45364b52..42bee86356c 100644
--- a/apps/docs/pages/guides/resources/supabase-cli/local-development.mdx
+++ b/apps/docs/pages/guides/cli/local-development.mdx
@@ -34,9 +34,8 @@ supabase login
 <Admonition type="note">
 
 If you installed the Supabase CLI via NPM you may have to use `npx supabase login`.
-	
-</Admonition>
 
+</Admonition>
 
 ## Initialize your project
 
diff --git a/apps/docs/pages/guides/resources/supabase-cli/managing-environments.mdx b/apps/docs/pages/guides/cli/managing-environments.mdx
similarity index 99%
rename from apps/docs/pages/guides/resources/supabase-cli/managing-environments.mdx
rename to apps/docs/pages/guides/cli/managing-environments.mdx
index 5523819a3a9..4f93da230a5 100644
--- a/apps/docs/pages/guides/resources/supabase-cli/managing-environments.mdx
+++ b/apps/docs/pages/guides/cli/managing-environments.mdx
@@ -215,8 +215,6 @@ jobs:
       - uses: actions/checkout@v3
 
       - uses: supabase/setup-cli@v1
-        with:
-          version: 1.0.0
 
       - name: Start Supabase local development setup
         run: supabase start
@@ -256,8 +254,6 @@ jobs:
       - uses: actions/checkout@v3
 
       - uses: supabase/setup-cli@v1
-        with:
-          version: 1.0.0
 
       - run: |
           supabase link --project-ref $STAGING_PROJECT_ID
@@ -289,8 +285,6 @@ jobs:
       - uses: actions/checkout@v3
 
       - uses: supabase/setup-cli@v1
-        with:
-          version: 1.0.0
 
       - run: |
           supabase link --project-ref $PRODUCTION_PROJECT_ID
diff --git a/apps/docs/pages/guides/database/api.mdx b/apps/docs/pages/guides/database/api.mdx
index a6b8a018fd6..4dad9373119 100644
--- a/apps/docs/pages/guides/database/api.mdx
+++ b/apps/docs/pages/guides/database/api.mdx
@@ -217,7 +217,7 @@ import { createClient, useQuery } from 'urql'
 // Prepare API key and Authorization header
 const headers = {
   apikey: <SUPABASE_ANON_KEY>,
-  authorization: `Bearer ${<SUPABASE_ANON_KEY}`>
+  authorization: `Bearer ${<SUPABASE_ANON_KEY>}`,
 }
 
 // Create GraphQL client
diff --git a/apps/docs/pages/guides/database/api/generating-types.mdx b/apps/docs/pages/guides/database/api/generating-types.mdx
index a50399287b6..aeac584922b 100644
--- a/apps/docs/pages/guides/database/api/generating-types.mdx
+++ b/apps/docs/pages/guides/database/api/generating-types.mdx
@@ -8,6 +8,15 @@ export const meta = {
 
 Supabase APIs are generated from your database, which means that we can use database introspection to generate type-safe API definitions.
 
+<div className="video-container">
+  <iframe
+    src="https://www.youtube-nocookie.com/embed/7CqlTU9aOR4"
+    frameBorder="1"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+    allowFullScreen
+  ></iframe>
+</div>
+
 ## Generating types using Supabase CLI
 
 The Supabase CLI is a single binary Go application that provides everything you need to setup a local development environment.
diff --git a/apps/docs/pages/guides/database/extensions/pgcron.mdx b/apps/docs/pages/guides/database/extensions/pgcron.mdx
index 57a704e444a..1062db0fd32 100644
--- a/apps/docs/pages/guides/database/extensions/pgcron.mdx
+++ b/apps/docs/pages/guides/database/extensions/pgcron.mdx
@@ -63,6 +63,8 @@ The schedule uses the standard cron syntax, in which \* means "run every time pe
  * * * * *
 ```
 
+You can use [crontab.guru](https://crontab.guru/) to help validate your cron schedules.
+
 ## Examples
 
 ### Delete data every week
@@ -71,8 +73,8 @@ Delete old data on Saturday at 3:30am (GMT):
 
 ```sql
 select cron.schedule (
-    'webhook-every-minute', -- name of the cron job
-    '* * * * *', -- every minute
+    'saturday-cleanup', -- name of the cron job
+    '30 3 * * 6', -- Saturday at 3:30am (GMT)
     $$ delete from events where event_time < now() - interval '1 week' $$
 );
 ```
@@ -85,6 +87,26 @@ Vacuum every day at 3:00am (GMT)
 SELECT cron.schedule('nightly-vacuum', '0 3 * * *', 'VACUUM');
 ```
 
+### Invoke Supabase Edge Function every minute
+
+Make a POST request to a Supabase Edge Function every minute. Note: this requires the [`pg_net` extension](/docs/guides/database/extensions/pgnet) to be enabled.
+
+```sql
+select
+  cron.schedule(
+    'invoke-function-every-minute',
+    '* * * * *', -- every minute
+    $$
+    select
+      net.http_post(
+          url:='https://project-ref.functions.supabase.co/function-name',
+          headers:='{"Content-Type": "application/json", "Authorization": "Bearer YOUR_ANON_KEY"}'::jsonb,
+          body:=concat('{"time": "', now(), '"}')::jsonb
+      ) as request_id;
+    $$
+  );
+```
+
 ### Unschedule a job
 
 Unschedules a job called `'nightly-vacuum'`
diff --git a/apps/docs/pages/guides/database/extensions/pgnet.mdx b/apps/docs/pages/guides/database/extensions/pgnet.mdx
index 29283ab4430..18c51a8dd2a 100644
--- a/apps/docs/pages/guides/database/extensions/pgnet.mdx
+++ b/apps/docs/pages/guides/database/extensions/pgnet.mdx
@@ -53,11 +53,11 @@ Procedural languages are automatically installed within `pg_catalog`, so you don
 </TabPanel>
 </Tabs>
 
-## `http_get` [#http_get]
+## `http_get`
 
 Creates an HTTP GET request returning the request's ID. HTTP requests are not started until the transaction is committed.
 
-### Signature
+### Signature [#get-signature]
 
 <Admonition type="caution">
 
@@ -86,7 +86,7 @@ net.http_get(
     language plpgsql
 ```
 
-### Usage
+### Usage [#get-usage]
 
 ```sql
 select net.http_get('https://news.ycombinator.com') as request_id;
@@ -98,13 +98,13 @@ request_id
 
 After triggering `http_get`, use [`http_get_result`](#http_get_result) to get the result of the request.
 
-## `http_post` [#http_post]
+## `http_post`
 
 Creates an HTTP POST request with a JSON body, returning the request's ID. HTTP requests are not started until the transaction is committed.
 
 The body's character set encoding matches the database's `server_encoding` setting.
 
-### Signature
+### Signature [#post-signature]
 
 <Admonition type="caution">
 
@@ -134,7 +134,7 @@ net.http_post(
     language plpgsql
 ```
 
-### Usage
+### Usage [#post-usage]
 
 ```sql
 select
@@ -150,6 +150,21 @@ request_id
 
 After triggering `http_post`, use [`http_get_result`](#http_get_result) to get the result of the request.
 
+## Examples
+
+### Invoke a Supabase Edge Function
+
+Make a POST request to a Supabase Edge Function with auth header and JSON body payload:
+
+```sql
+select
+    net.http_post(
+        url:='https://project-ref.functions.supabase.co/function-name',
+        headers:='{"Content-Type": "application/json", "Authorization": "Bearer YOUR_ANON_KEY"}'::jsonb,
+        body:='{"name": "pg_net"}'::jsonb
+    ) as request_id;
+```
+
 ## Resources
 
 - Source code: [github.com/supabase/pg_net](https://github.com/supabase/pg_net/)
diff --git a/apps/docs/pages/guides/database/full-text-search.mdx b/apps/docs/pages/guides/database/full-text-search.mdx
index c3fa7beaa92..b8ef3825e3f 100644
--- a/apps/docs/pages/guides/database/full-text-search.mdx
+++ b/apps/docs/pages/guides/database/full-text-search.mdx
@@ -8,6 +8,15 @@ export const meta = {
 
 Postgres has built-in functions to handle `Full Text Search` queries. This is like a "search engine" within Postgres.
 
+<div className="video-container">
+  <iframe
+    src="https://www.youtube-nocookie.com/embed/b-mgca_2Oe4"
+    frameBorder="1"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+    allowFullScreen
+  ></iframe>
+</div>
+
 ## Preparation
 
 For this guide we'll use the following example data:
diff --git a/apps/docs/pages/guides/database/tables.mdx b/apps/docs/pages/guides/database/tables.mdx
index 60931dcf285..1c13e805622 100644
--- a/apps/docs/pages/guides/database/tables.mdx
+++ b/apps/docs/pages/guides/database/tables.mdx
@@ -77,7 +77,7 @@ You must define the "data type" when you create a column.
 ### Data types
 
 Every column is a predefined type. PostgreSQL provides many [default types](https://www.postgresql.org/docs/current/datatype.html), and you can even design your own (or use extensions)
-if the default types don't fit your needs.
+if the default types don't fit your needs. You can use any data type that Postgres supports via the SQL editor. We only support a subset of these in the Table Editor in an effort to keep the experience simple for people with less experience with databases.
 
 <details>
 <summary>Show/Hide default data types</summary>
diff --git a/apps/docs/pages/guides/functions/cicd-workflow.mdx b/apps/docs/pages/guides/functions/cicd-workflow.mdx
index e902f140370..fd7826ddf0e 100644
--- a/apps/docs/pages/guides/functions/cicd-workflow.mdx
+++ b/apps/docs/pages/guides/functions/cicd-workflow.mdx
@@ -35,6 +35,15 @@ jobs:
       - run: supabase functions deploy your-function-name --project-ref $PROJECT_ID
 ```
 
+<div class="video-container">
+  <iframe
+    src="https://www.youtube-nocookie.com/embed/6OMVWiiycLs"
+    frameBorder="1"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+    allowFullScreen
+  ></iframe>
+</div>
+
 See the [example on GitHub](https://github.com/supabase/supabase/blob/master/examples/edge-functions/.github/workflows/deploy.yaml).
 
 export const Page = ({ children }) => <Layout meta={meta} children={children} />
diff --git a/apps/docs/pages/guides/functions/cors.mdx b/apps/docs/pages/guides/functions/cors.mdx
new file mode 100644
index 00000000000..14f1a1208d9
--- /dev/null
+++ b/apps/docs/pages/guides/functions/cors.mdx
@@ -0,0 +1,59 @@
+import Layout from '~/layouts/DefaultGuideLayout'
+
+export const meta = {
+  id: 'functions-cors',
+  title: 'CORS (Cross-Origin Resource Sharing)',
+  description: 'Add CORS headers to invoke functions from the browser.',
+}
+
+To invoke the functions from the browser, you need to handle [CORS Preflight](https://developer.mozilla.org/en-US/docs/Glossary/Preflight_request) requests.
+
+See the [example on GitHub](https://github.com/supabase/supabase/blob/master/examples/edge-functions/supabase/functions/browser-with-cors/index.ts).
+
+### Recommended setup
+
+We recommend adding a `corst.ts` file within a [`_shared` folder](/docs/guides/functions/quickstart#organizing-your-edge-functions) which makes it easy to reuse the CORS headers across functions:
+
+```ts cors.ts
+export const corsHeaders = {
+  'Access-Control-Allow-Origin': '*',
+  'Access-Control-Allow-Headers': 'authorization, x-client-info, apikey, content-type',
+}
+```
+
+You can then import and use the CORS headers within your functions:
+
+```ts index.ts
+import { serve } from 'https://deno.land/std@0.131.0/http/server.ts'
+import { corsHeaders } from '../_shared/cors.ts'
+
+console.log(`Function "browser-with-cors" up and running!`)
+
+serve(async (req) => {
+  // This is needed if you're planning to invoke your function from a browser.
+  if (req.method === 'OPTIONS') {
+    return new Response('ok', { headers: corsHeaders })
+  }
+
+  try {
+    const { name } = await req.json()
+    const data = {
+      message: `Hello ${name}!`,
+    }
+
+    return new Response(JSON.stringify(data), {
+      headers: { ...corsHeaders, 'Content-Type': 'application/json' },
+      status: 200,
+    })
+  } catch (error) {
+    return new Response(JSON.stringify({ error: error.message }), {
+      headers: { ...corsHeaders, 'Content-Type': 'application/json' },
+      status: 400,
+    })
+  }
+})
+```
+
+export const Page = ({ children }) => <Layout meta={meta} children={children} />
+
+export default Page
diff --git a/apps/docs/pages/guides/functions/debugging.mdx b/apps/docs/pages/guides/functions/debugging.mdx
new file mode 100644
index 00000000000..62c93035b2a
--- /dev/null
+++ b/apps/docs/pages/guides/functions/debugging.mdx
@@ -0,0 +1,20 @@
+import Layout from '~/layouts/DefaultGuideLayout'
+
+export const meta = {
+  id: 'functions-debugging',
+  title: 'Debugging Functions',
+  description: 'Debug functions in production.',
+}
+
+You can debug your deployed Edge Functions using the ["Functions" section](https://app.supabase.com/project/_/functions) of the Dashboard. There are two debugging tools available:
+
+- Invocations: shows the Request and Response for each execution.
+- Logs: shows any platform events, including deployments and errors.
+
+![Function invocations.](/docs/img/guides/functions/function-logs.png)
+
+When [developing locally](/docs/guides/functions/local-development) you will see error messages and console log statements printed to your local terminal window.
+
+export const Page = ({ children }) => <Layout meta={meta} children={children} />
+
+export default Page
diff --git a/apps/docs/pages/guides/functions/examples/cloudflare-turnstile.mdx b/apps/docs/pages/guides/functions/examples/cloudflare-turnstile.mdx
new file mode 100644
index 00000000000..560b3d9e454
--- /dev/null
+++ b/apps/docs/pages/guides/functions/examples/cloudflare-turnstile.mdx
@@ -0,0 +1,96 @@
+import Layout from '~/layouts/DefaultGuideLayout'
+
+export const meta = {
+  id: 'examples-cloudflare-turnstile',
+  title: 'Cloudflare Turnstile',
+  description: 'Protecting Forms with Cloudflare Turnstile.',
+}
+
+<div class="video-container">
+  <iframe
+    src="https://www.youtube-nocookie.com/embed/OwW0znboh60"
+    frameBorder="1"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+    allowFullScreen
+  ></iframe>
+</div>
+
+[Clouflare Turnstile](https://www.cloudflare.com/products/turnstile/) is a friendly, free CAPTCHA replacement, and it works seamlessly with Supabase Edge Functions to protect your forms. [View on GitHub](https://github.com/supabase/supabase/tree/master/examples/edge-functions/supabase/functions/cloudflare-turnstile).
+
+## Setup
+
+- Follow these steps to set up a new site: https://developers.cloudflare.com/turnstile/get-started/
+- Add the Cloudflare Turnstile widget to your site: https://developers.cloudflare.com/turnstile/get-started/client-side-rendering/
+
+## Code
+
+Create a new function in your project:
+
+```bash
+supabase functions new cloudflare-turnstile
+```
+
+And add the code to the `index.ts` file:
+
+```ts index.ts
+import { serve } from 'https://deno.land/std@0.131.0/http/server.ts'
+import { corsHeaders } from '../_shared/cors.ts'
+
+console.log('Hello from Cloudflare Trunstile!')
+
+function ips(req: Request) {
+  return req.headers.get('x-forwarded-for')?.split(/\s*,\s*/)
+}
+
+serve(async (req) => {
+  // This is needed if you're planning to invoke your function from a browser.
+  if (req.method === 'OPTIONS') {
+    return new Response('ok', { headers: corsHeaders })
+  }
+
+  const { token } = await req.json()
+  const clientIps = ips(req) || ['']
+  const ip = clientIps[0]
+
+  // Validate the token by calling the
+  // "/siteverify" API endpoint.
+  let formData = new FormData()
+  formData.append('secret', Deno.env.get('CLOUDFLARE_SECRET_KEY') ?? '')
+  formData.append('response', token)
+  formData.append('remoteip', ip)
+
+  const url = 'https://challenges.cloudflare.com/turnstile/v0/siteverify'
+  const result = await fetch(url, {
+    body: formData,
+    method: 'POST',
+  })
+
+  const outcome = await result.json()
+  console.log(outcome)
+  if (outcome.success) {
+    return new Response('success', { headers: corsHeaders })
+  }
+  return new Response('failure', { headers: corsHeaders })
+})
+```
+
+## Deploy the server-side validation Edge Functions
+
+- https://developers.cloudflare.com/turnstile/get-started/server-side-validation/
+
+```bash
+supabase functions deploy cloudflare-turnstile
+supabase secrets set CLOUDFLARE_TURNSTILE_SECRET_KEY=your_secret_key
+```
+
+## Invoke the function from your site
+
+```js
+const { data, error } = await supabase.functions.invoke('cloudflare-turnstile', {
+  body: { token },
+})
+```
+
+export const Page = ({ children }) => <Layout meta={meta} children={children} />
+
+export default Page
diff --git a/apps/docs/pages/guides/functions/examples/github-actions.mdx b/apps/docs/pages/guides/functions/examples/github-actions.mdx
new file mode 100644
index 00000000000..97456f33767
--- /dev/null
+++ b/apps/docs/pages/guides/functions/examples/github-actions.mdx
@@ -0,0 +1,49 @@
+import Layout from '~/layouts/DefaultGuideLayout'
+
+export const meta = {
+  id: 'examples-github-actions',
+  title: 'GitHub Actions',
+  description: 'Deploying Edge Functions with GitHub Actions.',
+}
+
+<div class="video-container">
+  <iframe
+    src="https://www.youtube-nocookie.com/embed/6OMVWiiycLs"
+    frameBorder="1"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+    allowFullScreen
+  ></iframe>
+</div>
+
+Use the Supabase CLI together with GitHub Actions to automatically deploy our Supabase Edge Functions. [View on GitHub](https://github.com/supabase/supabase/tree/master/examples/edge-functions/supabase/functions/github-action-deploy).
+
+```yaml deploy.yaml
+name: Deploy Function
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    env:
+      SUPABASE_ACCESS_TOKEN: ${{ secrets.SUPABASE_ACCESS_TOKEN }}
+      PROJECT_ID: zdtdtxajzydjqzuktnqx
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: supabase/setup-cli@v1
+        with:
+          version: 1.0.0
+
+      - run: supabase functions deploy github-action-deploy --project-ref $PROJECT_ID
+```
+
+export const Page = ({ children }) => <Layout meta={meta} children={children} />
+
+export default Page
diff --git a/apps/docs/pages/guides/functions/examples/og-image.mdx b/apps/docs/pages/guides/functions/examples/og-image.mdx
index 2974d5ef853..e4be6c85796 100644
--- a/apps/docs/pages/guides/functions/examples/og-image.mdx
+++ b/apps/docs/pages/guides/functions/examples/og-image.mdx
@@ -17,6 +17,10 @@ export const meta = {
 
 Generate Open Graph images with Deno and Supabase Edge Functions. [View on GitHub](https://github.com/supabase/supabase/tree/master/examples/edge-functions/supabase/functions/opengraph).
 
+## Code
+
+Create a `handler.tsx` file to construct the OG image in React:
+
 ```tsx handler.tsx
 import React from 'https://esm.sh/react@18.2.0'
 import { ImageResponse } from 'https://deno.land/x/og_edge@0.0.4/mod.ts'
@@ -42,6 +46,8 @@ export default function handler(req: Request) {
 }
 ```
 
+Create an `index.ts` file to execute the handler on incoming requests:
+
 ```ts index.ts
 import { serve } from 'https://deno.land/std@0.131.0/http/server.ts'
 import handler from './handler.tsx'
diff --git a/apps/docs/pages/guides/functions/examples/storage-caching.mdx b/apps/docs/pages/guides/functions/examples/storage-caching.mdx
new file mode 100644
index 00000000000..6e4b6ff604e
--- /dev/null
+++ b/apps/docs/pages/guides/functions/examples/storage-caching.mdx
@@ -0,0 +1,22 @@
+import Layout from '~/layouts/DefaultGuideLayout'
+
+export const meta = {
+  id: 'examples-storage-caching',
+  title: 'Caching Images with Supabase Storage CDN',
+  description: 'Integrate Edge Functions with Supabase Storage to cache images on the Edge (CDN).',
+}
+
+<div class="video-container">
+  <iframe
+    src="https://www.youtube-nocookie.com/embed/wW6L52v9Ldo"
+    frameBorder="1"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+    allowFullScreen
+  ></iframe>
+</div>
+
+Integrate Edge Functions with Supabase Storage to cache images on the Edge (CDN). [View on GitHub](https://github.com/supabase/supabase/tree/master/examples/edge-functions/supabase/functions/og-image-with-storage-cdn).
+
+export const Page = ({ children }) => <Layout meta={meta} children={children} />
+
+export default Page
diff --git a/apps/docs/pages/guides/functions/examples/stripe-webhooks.mdx b/apps/docs/pages/guides/functions/examples/stripe-webhooks.mdx
new file mode 100644
index 00000000000..5b75bb48878
--- /dev/null
+++ b/apps/docs/pages/guides/functions/examples/stripe-webhooks.mdx
@@ -0,0 +1,22 @@
+import Layout from '~/layouts/DefaultGuideLayout'
+
+export const meta = {
+  id: 'examples-stripe-webhooks',
+  title: 'Handling Stripe Webhooks',
+  description: 'Handling signed Stripe Webhooks with Edge Functions.',
+}
+
+<div class="video-container">
+  <iframe
+    src="https://www.youtube-nocookie.com/embed/6OMVWiiycLs"
+    frameBorder="1"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+    allowFullScreen
+  ></iframe>
+</div>
+
+Handling signed Stripe Webhooks with Edge Functions. [View on GitHub](https://github.com/supabase/supabase/blob/master/examples/edge-functions/supabase/functions/stripe-webhooks/index.ts).
+
+export const Page = ({ children }) => <Layout meta={meta} children={children} />
+
+export default Page
diff --git a/apps/docs/pages/guides/functions/examples/telegram-bot.mdx b/apps/docs/pages/guides/functions/examples/telegram-bot.mdx
new file mode 100644
index 00000000000..bac6a45eba2
--- /dev/null
+++ b/apps/docs/pages/guides/functions/examples/telegram-bot.mdx
@@ -0,0 +1,22 @@
+import Layout from '~/layouts/DefaultGuideLayout'
+
+export const meta = {
+  id: 'examples-telegram-bot',
+  title: 'Telegram Bot',
+  description: 'Building a Telegram Bot with Edge Functions.',
+}
+
+<div class="video-container">
+  <iframe
+    src="https://www.youtube-nocookie.com/embed/AWfE3a9J_uo"
+    frameBorder="1"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+    allowFullScreen
+  ></iframe>
+</div>
+
+Handle Telegram Bot Webhooks with the [grammY framework](https://grammy.dev/). grammY is an open source Telegram Bot Framework which makes it easy to handle and respond to incoming messages. [View on GitHub](https://github.com/supabase/supabase/tree/master/examples/edge-functions/supabase/functions/telegram-bot).
+
+export const Page = ({ children }) => <Layout meta={meta} children={children} />
+
+export default Page
diff --git a/apps/docs/pages/guides/functions/import-maps.mdx b/apps/docs/pages/guides/functions/import-maps.mdx
new file mode 100644
index 00000000000..2379dbf2699
--- /dev/null
+++ b/apps/docs/pages/guides/functions/import-maps.mdx
@@ -0,0 +1,62 @@
+import Layout from '~/layouts/DefaultGuideLayout'
+
+export const meta = {
+  id: 'functions-import-maps',
+  title: 'Import Maps',
+  description: 'Using Import Maps.',
+}
+
+<div class="video-container">
+  <iframe
+    src="https://www.youtube-nocookie.com/embed/ILr3cneZuFk"
+    frameBorder="1"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+    allowFullScreen
+  ></iframe>
+</div>
+
+Since [Supabase CLI](https://supabase.com/docs/guides/resources/supabase-cli) version `1.33.0` [import maps](https://deno.land/manual@v1.29.2/node/import_maps) can be used with Supabase Edge Functions.
+
+[Import maps](https://github.com/WICG/import-maps#the-import-map) is a web-platform standard that allows you to use bare specifiers with Deno without having to install the Node.js package locally.
+
+So if we want to do the following in our code:
+
+```ts, ignore
+import lodash from "lodash";
+```
+
+We can accomplish this using an import map, and we don't even have to install the `lodash` package locally. We would want to create a JSON file (for example **import_map.json**) with the following:
+
+```json
+{
+  "imports": {
+    "lodash": "https://cdn.skypack.dev/lodash"
+  }
+}
+```
+
+## Import Map Placement
+
+We recommend creating one `import_map.json` within the `/supabase/functions` folder (see [Organizing your Edge Functions](/docs/guides/functions/quickstart#organizing-your-edge-functions)), similar to a `package.json` file, to define imports that can be used across all of your project's functions.
+
+Alternatively, you can create one `import_map.json` file in each function folder, which will take priority over a top-level file.
+
+Lastly, you can override this default behaviour by providing the `--import-map <string>` flag to the `serve` and `deploy` commands.
+
+## Visual Studio Code Configuration
+
+In order for vscode to understand the imports correctly, you need to specify the `deno.importMap` flag in your `.vscode/settings.json` file:
+
+```json settings.json
+{
+  "deno.enable": true,
+  "deno.unstable": true,
+  "deno.importMap": "./supabase/functions/import_map.json"
+}
+```
+
+For a full guide on developing with Deno in Visual Studio Code, see [this guide](https://deno.land/manual@v1.25.4/vscode_deno).
+
+export const Page = ({ children }) => <Layout meta={meta} children={children} />
+
+export default Page
diff --git a/apps/docs/pages/guides/functions/local-development.mdx b/apps/docs/pages/guides/functions/local-development.mdx
new file mode 100644
index 00000000000..fffd6ac7072
--- /dev/null
+++ b/apps/docs/pages/guides/functions/local-development.mdx
@@ -0,0 +1,60 @@
+import Layout from '~/layouts/DefaultGuideLayout'
+
+export const meta = {
+  id: 'functions-local-development',
+  title: 'Local Development',
+  description: 'Run your functions locally.',
+}
+
+You can run your Edge Function locally using [`supabase functions serve`](/docs/reference/cli/usage#supabase-functions-serve):
+
+```bash
+supabase start # start the supabase stack
+supabase functions serve hello-world # start the Function watcher
+```
+
+The `functions serve` command has hot-reloading capabilities. It will watch for any changes to your files and restart the Deno server.
+
+### Invoking functions locally
+
+While serving your local Function, you can invoke it using curl:
+
+```bash
+curl --request POST 'http://localhost:54321/functions/v1/hello-world' \
+  --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24ifQ.625_WdcF3KHqz5amU0x2X5WWHP-OEs_4qj0ssLNHzTs' \
+  --header 'Content-Type: application/json' \
+  --data '{ "name":"Functions" }'
+```
+
+or using one of the [client libraries](/docs#reference-documentation), e.g. using [supabase-js](/docs/reference/javascript/functions-invoke):
+
+```js
+import { createClient } from '@supabase/supabase-js'
+
+// Use the credentials outputted in your terminal when running `supabase start`
+const supabase = createClient(
+  'http://localhost:54321',
+  'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0'
+)
+
+const { data, error } = await supabase.functions.invoke('hello-world', {
+  body: { name: 'Functions' },
+})
+```
+
+You should see the response `{ "message":"Hello Functions!" }`.
+
+If you execute Function with a different payload the response will change. <br />
+Modify the `--data '{"name":"Functions"}'` line to `--data '{"name":"World"}'` and try invoking the command again!
+
+<Admonition type="note">
+
+- Edge Functions don't serve HTML content (`GET` requests that return `text/html` are rewritten to `text/plain`).
+- The `Authorization` header is required. You can use either the `ANON` key, the `SERVICE_ROLE` key, or a logged-in user's JWT.
+- The Function is proxied through the local API (`http://localhost:54321`)
+
+</Admonition>
+
+export const Page = ({ children }) => <Layout meta={meta} children={children} />
+
+export default Page
diff --git a/apps/docs/pages/guides/functions/quickstart.mdx b/apps/docs/pages/guides/functions/quickstart.mdx
index 55b9ed617c6..e4e17a3a708 100644
--- a/apps/docs/pages/guides/functions/quickstart.mdx
+++ b/apps/docs/pages/guides/functions/quickstart.mdx
@@ -3,7 +3,7 @@ import Layout from '~/layouts/DefaultGuideLayout'
 export const meta = {
   id: 'functions-quickstart',
   title: 'Edge Functions Quickstart',
-  description: 'Globally distributed TypeScript functions.',
+  description: 'Globally distributed TypeScript Functions.',
   sidebar_label: 'Quickstart',
 }
 
@@ -55,9 +55,9 @@ If you want to use Edge Functions to handle webhooks (e.g. [Stripe payment webho
 
 </Admonition>
 
-## Execute remote functions
+## Invoking remote functions
 
-You can execute Edge Functions using curl. Copy the curl command from the Dashboard. It should look like this:
+You can invoke Edge Functions using curl:
 
 ```bash
 curl --request POST 'https://<project_ref>.functions.supabase.co/hello-world' \
@@ -66,135 +66,61 @@ curl --request POST 'https://<project_ref>.functions.supabase.co/hello-world' \
   --data '{ "name":"Functions" }'
 ```
 
+<Admonition type="note">
+
 If you receive an error `Invalid JWT`, find the `ANON_KEY` of your project in the Dashboard under `Settings > API`.
 
+</Admonition>
+
+or using one of the [client libraries](/docs#reference-documentation), e.g. using [supabase-js](/docs/reference/javascript/functions-invoke):
+
+```js
+import { createClient } from '@supabase/supabase-js'
+
+// Create a single supabase client for interacting with your database
+const supabase = createClient('https://xyzcompany.supabase.co', 'public-anon-key')
+
+const { data, error } = await supabase.functions.invoke('hello-world', {
+  body: { name: 'Functions' },
+})
+```
+
 After invoking your Edge Function you should see the response `{ "message":"Hello Functions!" }`.
 
-## Debug functions
+## Database Functions vs Edge Functions
 
-You can debug your deployed Edge Functions using the "Functions" section of the Dashboard. There are two types debugging tools available:
+For data-intensive operations we recommend using [Database Functions](/docs/guides/database/functions), which are executed within your database
+and can be called remotely using the [REST and GraphQL API](/docs/guides/api).
 
-- Invocations: shows the Request and Response for each execution.
-- Logs: shows any platform events, including deployments and errors.
+For use-cases which require low-latency we recommend [Edge Functions](/docs/guides/functions), which are globally-distributed and can be written in TypeScript.
 
-![Function invocations.](/docs/img/guides/functions/function-logs.png)
+## Organizing your Edge Functions
 
-## Develop locally
-
-You can run your Edge Function locally using [`supabase functions serve`](/docs/reference/cli/usage#supabase-functions-serve):
+We recommend developing “fat functions”. This means that you should develop few large functions, rather than many small functions. One common pattern when developing Functions is that you need to share code between two or more Functions. To do this, you can store any shared code in a folder prefixed with an underscore (`_`). We recommend this folder structure:
 
 ```bash
-supabase start # start the supabase stack
-supabase functions serve hello-world # start the Function watcher
+└── supabase
+    ├── functions
+    │   ├── import_map.json # A top-level import map to use across functions.
+    │   ├── _shared
+    │   │   ├── supabaseAdmin.ts # Supabase client with SERVICE_ROLE key.
+    │   │   └── supabaseClient.ts # Supabase client with ANON key.
+    │   │   └── cors.ts # Reusable CORS headers.
+    │   ├── function-one # Use hyphens to name functions.
+    │   │   └── index.ts
+    │   └── function-two
+    │       └── index.ts
+    ├── migrations
+    └── config.toml
 ```
 
-The `functions serve` command has hot-reloading capabilities. It will watch for any changes to your files and restart the Deno server.
+## Naming Edge Functions
 
-### Invoke functions locally
+We recommend using hyphens to name functions because hyphens are the most URL-friendly of all the naming conventions (snake_case, camelCase, PascalCase).
 
-While serving your local Function, you can execute it using curl:
+## Using HTTP Methods
 
-```bash
-curl --request POST 'http://localhost:54321/functions/v1/hello-world' \
-  --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24ifQ.625_WdcF3KHqz5amU0x2X5WWHP-OEs_4qj0ssLNHzTs' \
-  --header 'Content-Type: application/json' \
-  --data '{ "name":"Functions" }'
-```
-
-You should see the response `{ "message":"Hello Functions!" }`.
-
-<details>
-<summary>Implementation details</summary>
-
-- Edge Functions don't serve HTML content (`GET` requests that return `text/html` are rewritten to `text/plain`).
-- The `Authorization` header is required. You can use either the `ANON` key, the `SERVICE_ROLE` key, or a logged-in user's JWT.
-- The Function is proxied through the local API (`http://localhost:54321`)
-
-</details>
-<br />
-
-If you execute Function with a different payload the response will change. <br />
-Modify the `--data '{"name":"Functions"}'` line to `--data '{"name":"World"}'` and try invoking the command again!
-
-## Secrets and Environment Variables
-
-It's common that you will need to use sensitive information or environment-specific variables inside your Edge Functions. You can access these using Deno's built-in handler
-
-```js
-Deno.env.get(MY_SECRET_NAME)
-```
-
-### Default secrets
-
-By default, Edge Functions have access to these secrets:
-
-- `SUPABASE_URL`: The API gateway for your Supabase project.
-- `SUPABASE_ANON_KEY`: The `anon` key for your Supabase API. This is safe to use in a browser when you have [Row Level Security](/docs/guides/auth/row-level-security) enabled.
-- `SUPABASE_SERVICE_ROLE_KEY`: The `service_role` key for your Supabase API. This is safe to use in Edge Functions, but it should NEVER be used in a browser. This key will bypass [Row Level Security](/docs/guides/auth/row-level-security).
-- `SUPABASE_DB_URL`: The URL for your [PostgreSQL database](/docs/guides/database). You can use this to connect directly to your database.
-
-### Local secrets
-
-Let's create a local file for storing our secrets, and inside it we can store a secret `MY_NAME`:
-
-```jsx
-echo "MY_NAME=Yoda" >> ./supabase/.env.local
-```
-
-This creates a new file `./supabase/.env.local` for storing your local development secrets.
-
-<Admonition type="caution">
-
-Never check your .env files into Git!
-
-</Admonition>
-
-Now let's access this environment variable `MY_NAME` inside our Function. Anywhere in your function, add this line:
-
-```jsx
-console.log(Deno.env.get('MY_NAME'))
-```
-
-Now we can invoke our function locally, by serving it with our new `.env.local` file:
-
-```bash
-supabase functions serve hello-world --env-file ./supabase/.env.local
-```
-
-When the function starts you should see the name “Yoda” output to the terminal.
-
-### Production secrets
-
-Let's create a `.env` for production. In this case we'll just use the same as our local secrets:
-
-```bash
-cp ./supabase/.env.local ./supabase/.env
-```
-
-This creates a new file `./supabase/.env` for storing your production secrets.
-
-<Admonition type="caution">
-
-Never check your `.env` files into Git!
-
-</Admonition>
-
-Let's push all the secrets from the `.env` file to our remote project using [`supabase secrets set`](/docs/reference/cli/usage#supabase-secrets-set):
-
-```bash
-supabase secrets set --env-file ./supabase/.env
-
-# You can also set secrets individually using:
-supabase secrets set MY_NAME=Chewbacca
-```
-
-You don't need to re-deploy after setting your secrets.
-
-To see all the secrets which you have set remotely, use [`supabase secrets list`](/docs/reference/cli/usage#supabase-secrets-list):
-
-```bash
-supabase secrets list
-```
+Edge Functions supports `GET`, `POST`, `PUT`, `PATCH`, `DELETE`, and `OPTIONS`. A function can be designed to perform different actions based on a request's HTTP method. See the [example on building a RESTful service](https://github.com/supabase/supabase/tree/master/examples/edge-functions/supabase/functions/restful-tasks) to learn how to handle different HTTP methods in your function.
 
 ## Limitations
 
diff --git a/apps/docs/pages/guides/functions/schedule-functions.mdx b/apps/docs/pages/guides/functions/schedule-functions.mdx
new file mode 100644
index 00000000000..c5108b55523
--- /dev/null
+++ b/apps/docs/pages/guides/functions/schedule-functions.mdx
@@ -0,0 +1,42 @@
+import Layout from '~/layouts/DefaultGuideLayout'
+
+export const meta = {
+  id: 'schedule-functions',
+  title: 'Schedule Functions',
+  description: 'Schedule Functions with pg_cron.',
+}
+
+The hosted Supabase Platform supports the [`pg_cron` extension](/docs/guides/database/extensions/pgcron), a simple cron-based job scheduler for PostgreSQL that runs inside the database.
+
+In combination with the [`pg_net` extension](/docs/guides/database/extensions/pgnet), this allows us to invoke functions periodically on a set schedule.
+
+## Examples
+
+### Invoke Function every minute
+
+Make a POST request to a Supabase Edge Function every minute:
+
+```sql
+select
+  cron.schedule(
+    'invoke-function-every-minute',
+    '* * * * *', -- every minute
+    $$
+    select
+      net.http_post(
+          url:='https://project-ref.functions.supabase.co/function-name',
+          headers:='{"Content-Type": "application/json", "Authorization": "Bearer YOUR_ANON_KEY"}'::jsonb,
+          body:=concat('{"time": "', now(), '"}')::jsonb
+      ) as request_id;
+    $$
+  );
+```
+
+## Resources
+
+- [`pg_net` extension](/docs/guides/database/extensions/pgnet)
+- [`pg_cron` extension](/docs/guides/database/extensions/pgcron)
+
+export const Page = ({ children }) => <Layout meta={meta} children={children} />
+
+export default Page
diff --git a/apps/docs/pages/guides/functions/secrets.mdx b/apps/docs/pages/guides/functions/secrets.mdx
new file mode 100644
index 00000000000..3d60a239a8b
--- /dev/null
+++ b/apps/docs/pages/guides/functions/secrets.mdx
@@ -0,0 +1,89 @@
+import Layout from '~/layouts/DefaultGuideLayout'
+
+export const meta = {
+  id: 'functions-secrets',
+  title: 'Secrets and Environment Variables',
+  description: 'Managing secrets and environment variables.',
+}
+
+It's common that you will need to use sensitive information or environment-specific variables inside your Edge Functions. You can access these using Deno's built-in handler
+
+```js
+Deno.env.get(MY_SECRET_NAME)
+```
+
+### Default secrets
+
+By default, Edge Functions have access to these secrets:
+
+- `SUPABASE_URL`: The API gateway for your Supabase project.
+- `SUPABASE_ANON_KEY`: The `anon` key for your Supabase API. This is safe to use in a browser when you have [Row Level Security](/docs/guides/auth/row-level-security) enabled.
+- `SUPABASE_SERVICE_ROLE_KEY`: The `service_role` key for your Supabase API. This is safe to use in Edge Functions, but it should NEVER be used in a browser. This key will bypass [Row Level Security](/docs/guides/auth/row-level-security).
+- `SUPABASE_DB_URL`: The URL for your [PostgreSQL database](/docs/guides/database). You can use this to connect directly to your database.
+
+### Local secrets
+
+Let's create a local file for storing our secrets, and inside it we can store a secret `MY_NAME`:
+
+```bash
+echo "MY_NAME=Yoda" >> ./supabase/.env.local
+```
+
+This creates a new file `./supabase/.env.local` for storing your local development secrets.
+
+<Admonition type="caution">
+
+Never check your .env files into Git!
+
+</Admonition>
+
+Now let's access this environment variable `MY_NAME` inside our Function. Anywhere in your function, add this line:
+
+```jsx
+console.log(Deno.env.get('MY_NAME'))
+```
+
+Now we can invoke our function locally, by serving it with our new `.env.local` file:
+
+```bash
+supabase functions serve hello-world --env-file ./supabase/.env.local
+```
+
+When the function starts you should see the name “Yoda” output to the terminal.
+
+### Production secrets
+
+Let's create a `.env` for production. In this case we'll just use the same as our local secrets:
+
+```bash
+cp ./supabase/.env.local ./supabase/.env
+```
+
+This creates a new file `./supabase/.env` for storing your production secrets.
+
+<Admonition type="caution">
+
+Never check your `.env` files into Git!
+
+</Admonition>
+
+Let's push all the secrets from the `.env` file to our remote project using [`supabase secrets set`](/docs/reference/cli/usage#supabase-secrets-set):
+
+```bash
+supabase secrets set --env-file ./supabase/.env
+
+# You can also set secrets individually using:
+supabase secrets set MY_NAME=Chewbacca
+```
+
+You don't need to re-deploy after setting your secrets.
+
+To see all the secrets which you have set remotely, use [`supabase secrets list`](/docs/reference/cli/usage#supabase-secrets-list):
+
+```bash
+supabase secrets list
+```
+
+export const Page = ({ children }) => <Layout meta={meta} children={children} />
+
+export default Page
diff --git a/apps/docs/pages/guides/getting-started/quickstarts/solidjs.mdx b/apps/docs/pages/guides/getting-started/quickstarts/solidjs.mdx
new file mode 100644
index 00000000000..d72aa4da959
--- /dev/null
+++ b/apps/docs/pages/guides/getting-started/quickstarts/solidjs.mdx
@@ -0,0 +1,140 @@
+import Layout from '~/layouts/DefaultGuideLayout'
+import StepHikeCompact from '~/components/StepHikeCompact'
+
+export const meta = {
+  title: 'Use Supabase with SolidJS',
+  subtitle:
+    'Learn how to create a Supabase project, add some sample data to your database, and query the data from a SolidJS app.',
+  breadcrumb: 'Framework Quickstarts',
+}
+
+<StepHikeCompact>
+
+  <StepHikeCompact.Step step={1}>
+    <StepHikeCompact.Details title="Set up a Supabase project with sample data">
+
+    [Create a new project](https://app.supabase.com) in the Supabase Dashboard.
+
+    After your project is ready, create a table in your Supabase database using the [SQL Editor](https://app.supabase.com/project/_/sql) in the Dashboard. Use the following SQL statement to create a `countries` table with some sample data.
+
+    </StepHikeCompact.Details>
+
+    <StepHikeCompact.Code>
+
+      ```sql SQL_EDITOR
+        -- Create the table
+        CREATE TABLE countries (
+          id SERIAL PRIMARY KEY,
+          name VARCHAR(255) NOT NULL
+        );
+        -- Insert some sample data into the table
+        INSERT INTO countries (name) VALUES ('United States');
+        INSERT INTO countries (name) VALUES ('Canada');
+        INSERT INTO countries (name) VALUES ('Mexico');
+      ````
+
+    </StepHikeCompact.Code>
+
+  </StepHikeCompact.Step>
+
+  <StepHikeCompact.Step step={2}>
+
+    <StepHikeCompact.Details title="Create a SolidJS app">
+
+    Create a SolidJS app using the `degit` command.
+
+    </StepHikeCompact.Details>
+
+    <StepHikeCompact.Code>
+
+      ```bash Terminal
+      npx degit solidjs/templates/js my-app
+      ```
+
+    </StepHikeCompact.Code>
+
+  </StepHikeCompact.Step>
+
+  <StepHikeCompact.Step step={3}>
+    <StepHikeCompact.Details title="Install the Supabase client library">
+
+    The fastest way to get started is to use the `supabase-js` client library which provides a convenient interface for working with Supabase from a SolidJS app.
+
+    Navigate to the SolidJS app and install `supabase-js`.
+
+    </StepHikeCompact.Details>
+
+    <StepHikeCompact.Code>
+
+      ```bash Terminal
+      cd my-app && npm install @supabase/supabase-js
+      ```
+
+    </StepHikeCompact.Code>
+
+  </StepHikeCompact.Step>
+
+  <StepHikeCompact.Step step={4}>
+    <StepHikeCompact.Details title="Query data from the app">
+
+    In `App.jsx`, create a Supabase client using your [Project URL and public API (anon) key](https://app.supabase.com/project/_/settings/api).
+
+    Add a `getCountries` function to fetch the data and display the query result to the page.
+
+    </StepHikeCompact.Details>
+    <StepHikeCompact.Code>
+
+
+      ```jsx src/App.jsx
+        import { createClient } from "@supabase/supabase-js";
+        import { createEffect, createSignal, For } from "solid-js";
+
+        const supabase = createClient('https://<project>.supabase.co', '<your-anon-key>');
+
+        function App() {
+          const [countries, setCountries] = createSignal();
+
+          createEffect(() => {
+            getCountries();
+          });
+
+          async function getCountries() {
+            const { data } = await supabase.from("countries").select();
+            setCountries(data);
+          }
+
+          return (
+            <ul>
+              <For each={countries()}>{(country) => <li>{country.name}</li>}</For>
+            </ul>
+          );
+        }
+
+        export default App;
+      ```
+
+    </StepHikeCompact.Code>
+
+  </StepHikeCompact.Step>
+
+  <StepHikeCompact.Step step={5}>
+    <StepHikeCompact.Details title="Start the app">
+
+    Start the app and go to http://localhost:3000 in a browser and you should see the list of countries.
+
+    </StepHikeCompact.Details>
+
+    <StepHikeCompact.Code>
+
+      ```bash Terminal
+      npm run dev
+      ```
+
+    </StepHikeCompact.Code>
+
+  </StepHikeCompact.Step>
+</StepHikeCompact>
+
+export const Page = ({ children }) => <Layout meta={meta} children={children} hideToc={true} />
+
+export default Page
diff --git a/apps/docs/pages/guides/getting-started/quickstarts/sveltekit.mdx b/apps/docs/pages/guides/getting-started/quickstarts/sveltekit.mdx
new file mode 100644
index 00000000000..2bea7515a9a
--- /dev/null
+++ b/apps/docs/pages/guides/getting-started/quickstarts/sveltekit.mdx
@@ -0,0 +1,166 @@
+import Layout from '~/layouts/DefaultGuideLayout'
+import StepHikeCompact from '~/components/StepHikeCompact'
+
+export const meta = {
+  title: 'Use Supabase with SvelteKit',
+  subtitle:
+    'Learn how to create a Supabase project, add some sample data to your database, and query the data from a SvelteKit app.',
+  breadcrumb: 'Framework Quickstarts',
+}
+
+<StepHikeCompact>
+
+  <StepHikeCompact.Step step={1}>
+    <StepHikeCompact.Details title="Set up a Supabase project with sample data">
+
+    [Create a new project](https://app.supabase.com) in the Supabase Dashboard.
+
+    After your project is ready, create a table in your Supabase database using the [SQL Editor](https://app.supabase.com/project/_/sql) in the Dashboard. Use the following SQL statement to create a `countries` table with some sample data.
+
+    </StepHikeCompact.Details>
+
+    <StepHikeCompact.Code>
+
+     ```sql SQL_EDITOR
+     -- Create the table
+     CREATE TABLE countries (
+      id SERIAL PRIMARY KEY,
+      name VARCHAR(255) NOT NULL
+     );
+     -- Insert some sample data into the table
+     INSERT INTO countries (name) VALUES ('United States');
+     INSERT INTO countries (name) VALUES ('Canada');
+     INSERT INTO countries (name) VALUES ('Mexico');
+     ````
+
+    </StepHikeCompact.Code>
+
+  </StepHikeCompact.Step>
+
+  <StepHikeCompact.Step step={2}>
+
+    <StepHikeCompact.Details title="Create a SvelteKit app">
+
+    Create a SvelteKit app using the `npm create` command.
+
+    </StepHikeCompact.Details>
+
+    <StepHikeCompact.Code>
+
+      ```bash Terminal
+      npm create svelte@latest myapp
+      ```
+
+    </StepHikeCompact.Code>
+
+  </StepHikeCompact.Step>
+
+  <StepHikeCompact.Step step={3}>
+    <StepHikeCompact.Details title="Install the Supabase client library">
+
+    The fastest way to get started is to use the `supabase-js` client library which provides a convenient interface for working with Supabase from a SvelteKit app.
+
+    Navigate to the SvelteKit app and install `supabase-js`.
+
+    </StepHikeCompact.Details>
+
+    <StepHikeCompact.Code>
+
+      ```bash Terminal
+      cd my-app && npm install @supabase/supabase-js
+      ```
+
+    </StepHikeCompact.Code>
+
+  </StepHikeCompact.Step>
+
+  <StepHikeCompact.Step step={4}>
+    <StepHikeCompact.Details title="Create the Supabase client">
+
+    Create a `/src/lib` directory in your SvelteKit app, create a file called `supabaseClient.js` and add the following code to initialize the Supabase client with your [project URL and public API (anon) key](https://app.supabase.com/project/_/settings/api).
+
+    </StepHikeCompact.Details>
+
+    <StepHikeCompact.Code>
+
+      ```js src/lib/supabaseClient.js
+        import { createClient } from '@supabase/supabase-js'
+
+        export const supabase = createClient('https://<project>.supabase.co', '<your-anon-key>')
+      ```
+
+    </StepHikeCompact.Code>
+
+  </StepHikeCompact.Step>
+
+  <StepHikeCompact.Step step={5}>
+    <StepHikeCompact.Details title="Query data from the app">
+
+    Use `load` method to fetch the data server-side and display the query results as a simple list.
+
+    Create `+page.server.js` file in the `routes` directory with the following code.
+
+    </StepHikeCompact.Details>
+    <StepHikeCompact.Code>
+
+
+      ```js src/routes/+page.server.js
+        import { supabase } from "$lib/supabaseClient";
+
+        export async function load() {
+          const { data } = await supabase.from("countries").select();
+          return {
+            countries: data ?? [],
+          };
+        }
+      ```
+
+    </StepHikeCompact.Code>
+
+    <StepHikeCompact.Details title="">
+
+    Replace the existing content in your `+page.svelte` file in the `routes` directory with the following code.
+
+    </StepHikeCompact.Details>
+    <StepHikeCompact.Code>
+
+
+      ```svelte src/routes/+page.svelte
+        <script>
+          export let data;
+          let { countries } = data;
+          $: ({ countries } = data);
+        </script>
+
+        <ul>
+          {#each countries as country}
+            <li>{country.name}</li>
+          {/each}
+        </ul>
+      ```
+
+    </StepHikeCompact.Code>
+
+  </StepHikeCompact.Step>
+
+  <StepHikeCompact.Step step={6}>
+    <StepHikeCompact.Details title="Start the app">
+
+    Start the app and go to http://localhost:5173 in a browser and you should see the list of countries.
+
+    </StepHikeCompact.Details>
+
+    <StepHikeCompact.Code>
+
+      ```bash Terminal
+      npm run dev
+      ```
+
+    </StepHikeCompact.Code>
+
+  </StepHikeCompact.Step>
+</StepHikeCompact>
+
+export const Page = ({ children }) => <Layout meta={meta} children={children} hideToc={true} />
+
+export default Page
diff --git a/apps/docs/pages/guides/getting-started/quickstarts/vue.mdx b/apps/docs/pages/guides/getting-started/quickstarts/vue.mdx
new file mode 100644
index 00000000000..b353d6ef35d
--- /dev/null
+++ b/apps/docs/pages/guides/getting-started/quickstarts/vue.mdx
@@ -0,0 +1,153 @@
+import Layout from '~/layouts/DefaultGuideLayout'
+import StepHikeCompact from '~/components/StepHikeCompact'
+
+export const meta = {
+  title: 'Use Supabase with Vue',
+  subtitle:
+    'Learn how to create a Supabase project, add some sample data to your database, and query the data from a Vue app.',
+  breadcrumb: 'Framework Quickstarts',
+}
+
+<StepHikeCompact>
+
+  <StepHikeCompact.Step step={1}>
+    <StepHikeCompact.Details title="Set up a Supabase project with sample data">
+
+    [Create a new project](https://app.supabase.com) in the Supabase Dashboard.
+
+    After your project is ready, create a table in your Supabase database using the [SQL Editor](https://app.supabase.com/project/_/sql) in the Dashboard. Use the following SQL statement to create a `countries` table with some sample data.
+
+    </StepHikeCompact.Details>
+
+    <StepHikeCompact.Code>
+
+      ```sql SQL_EDITOR
+        -- Create the table
+        CREATE TABLE countries (
+          id SERIAL PRIMARY KEY,
+          name VARCHAR(255) NOT NULL
+        );
+        -- Insert some sample data into the table
+        INSERT INTO countries (name) VALUES ('United States');
+        INSERT INTO countries (name) VALUES ('Canada');
+        INSERT INTO countries (name) VALUES ('Mexico');
+      ````
+
+    </StepHikeCompact.Code>
+
+  </StepHikeCompact.Step>
+
+  <StepHikeCompact.Step step={2}>
+
+    <StepHikeCompact.Details title="Create a Vue app">
+
+    Create a Vue app using the `npm init` command.
+
+    </StepHikeCompact.Details>
+
+    <StepHikeCompact.Code>
+
+      ```sh Terminal
+      npm init vue@latest my-app
+      ```
+
+    </StepHikeCompact.Code>
+
+  </StepHikeCompact.Step>
+
+  <StepHikeCompact.Step step={3}>
+    <StepHikeCompact.Details title="Install the Supabase client library">
+
+    The fastest way to get started is to use the `supabase-js` client library which provides a convenient interface for working with Supabase from a Vue app.
+
+    Navigate to the Vue app and install `supabase-js`.
+
+    </StepHikeCompact.Details>
+
+    <StepHikeCompact.Code>
+
+      ```bash Terminal
+      cd my-app && npm install @supabase/supabase-js
+      ```
+
+    </StepHikeCompact.Code>
+
+  </StepHikeCompact.Step>
+
+  <StepHikeCompact.Step step={4}>
+    <StepHikeCompact.Details title="Create the Supabase client">
+
+    Create a `/src/lib` directory in your Vue app, create a file called `supabaseClient.js` and add the following code to initialize the Supabase client with your [project URL and public API (anon) key](https://app.supabase.com/project/_/settings/api).
+
+    </StepHikeCompact.Details>
+
+    <StepHikeCompact.Code>
+
+      ```js src/lib/supabaseClient.js
+        import { createClient } from '@supabase/supabase-js'
+
+        export const supabase = createClient('https://<project>.supabase.co', '<your-anon-key>')
+      ```
+
+    </StepHikeCompact.Code>
+
+  </StepHikeCompact.Step>
+
+  <StepHikeCompact.Step step={5}>
+    <StepHikeCompact.Details title="Query data from the app">
+
+    Replace the existing content in your `App.vue` file with the following code.
+
+    </StepHikeCompact.Details>
+    <StepHikeCompact.Code>
+
+
+      ```vue src/App.vue
+        <script setup>
+        import { ref, onMounted } from 'vue'
+        import { supabase } from './lib/supabaseClient'
+
+        const countries = ref([])
+
+        async function getCountries() {
+          const { data } = await supabase.from('countries').select()
+          countries.value = data
+        }
+
+        onMounted(() => {
+          getCountries()
+        })
+        </script>
+
+        <template>
+          <ul>
+            <li v-for="country in countries" :key="country.id">{{ country.name }}</li>
+          </ul>
+        </template>
+      ```
+
+    </StepHikeCompact.Code>
+
+  </StepHikeCompact.Step>
+
+  <StepHikeCompact.Step step={6}>
+    <StepHikeCompact.Details title="Start the app">
+
+    Start the app and go to http://localhost:5173 in a browser and you should see the list of countries.
+
+    </StepHikeCompact.Details>
+
+    <StepHikeCompact.Code>
+
+      ```bash Terminal
+      npm run dev
+      ```
+
+    </StepHikeCompact.Code>
+
+  </StepHikeCompact.Step>
+</StepHikeCompact>
+
+export const Page = ({ children }) => <Layout meta={meta} children={children} hideToc={true} />
+
+export default Page
diff --git a/apps/docs/pages/guides/getting-started/tutorials/with-angular.mdx b/apps/docs/pages/guides/getting-started/tutorials/with-angular.mdx
index 8f2754453f9..b76748ad8aa 100644
--- a/apps/docs/pages/guides/getting-started/tutorials/with-angular.mdx
+++ b/apps/docs/pages/guides/getting-started/tutorials/with-angular.mdx
@@ -530,6 +530,10 @@ export class AccountComponent implements OnInit {
 }
 ```
 
+### Storage management
+
+<StorageManagement />
+
 ## Next steps
 
 At this stage you have a fully functional application!
diff --git a/apps/docs/pages/guides/getting-started/tutorials/with-expo.mdx b/apps/docs/pages/guides/getting-started/tutorials/with-expo.mdx
index b60db313a51..192caa40725 100644
--- a/apps/docs/pages/guides/getting-started/tutorials/with-expo.mdx
+++ b/apps/docs/pages/guides/getting-started/tutorials/with-expo.mdx
@@ -500,6 +500,10 @@ Now you will need to run the prebuild command to get the application working on
 expo prebuild
 ```
 
+### Storage management
+
+<StorageManagement />
+
 ## Next steps
 
 At this stage you have a fully functional application!
diff --git a/apps/docs/pages/guides/getting-started/tutorials/with-flutter.mdx b/apps/docs/pages/guides/getting-started/tutorials/with-flutter.mdx
index 6a73c7aa8ab..478390cf7c0 100644
--- a/apps/docs/pages/guides/getting-started/tutorials/with-flutter.mdx
+++ b/apps/docs/pages/guides/getting-started/tutorials/with-flutter.mdx
@@ -793,6 +793,10 @@ class _AccountPageState extends State<AccountPage> {
 }
 ```
 
+### Storage management
+
+<StorageManagement />
+
 Congratulations, that is it! You have now built a fully functional user management app using Flutter and Supabase!
 
 ## See also
diff --git a/apps/docs/pages/guides/getting-started/tutorials/with-ionic-angular.mdx b/apps/docs/pages/guides/getting-started/tutorials/with-ionic-angular.mdx
index 88c1d9e6433..4616bb796b0 100644
--- a/apps/docs/pages/guides/getting-started/tutorials/with-ionic-angular.mdx
+++ b/apps/docs/pages/guides/getting-started/tutorials/with-ionic-angular.mdx
@@ -522,6 +522,10 @@ template: `
 `
 ```
 
+### Storage management
+
+<StorageManagement />
+
 ## Next steps
 
 At this stage you have a fully functional application!
diff --git a/apps/docs/pages/guides/getting-started/tutorials/with-ionic-react.mdx b/apps/docs/pages/guides/getting-started/tutorials/with-ionic-react.mdx
index c14bb343ed3..3c7c9847b96 100644
--- a/apps/docs/pages/guides/getting-started/tutorials/with-ionic-react.mdx
+++ b/apps/docs/pages/guides/getting-started/tutorials/with-ionic-react.mdx
@@ -495,6 +495,10 @@ return (
       <Avatar url={profile.avatar_url} onUpload={updateProfile}></Avatar>
 ```
 
+### Storage management
+
+<StorageManagement />
+
 ## Next steps
 
 At this stage you have a fully functional application!
diff --git a/apps/docs/pages/guides/getting-started/tutorials/with-ionic-vue.mdx b/apps/docs/pages/guides/getting-started/tutorials/with-ionic-vue.mdx
index 2f368771b78..b5599980212 100644
--- a/apps/docs/pages/guides/getting-started/tutorials/with-ionic-vue.mdx
+++ b/apps/docs/pages/guides/getting-started/tutorials/with-ionic-vue.mdx
@@ -555,6 +555,10 @@ export default defineComponent({
 </script>
 ```
 
+### Storage management
+
+<StorageManagement />
+
 ## Next steps
 
 At this stage you have a fully functional application!
diff --git a/apps/docs/pages/guides/getting-started/tutorials/with-nextjs.mdx b/apps/docs/pages/guides/getting-started/tutorials/with-nextjs.mdx
index 81b86e96b2f..78c6c444d1e 100644
--- a/apps/docs/pages/guides/getting-started/tutorials/with-nextjs.mdx
+++ b/apps/docs/pages/guides/getting-started/tutorials/with-nextjs.mdx
@@ -718,6 +718,10 @@ return (
 )
 ```
 
+### Storage management
+
+<StorageManagement />
+
 ## Next steps
 
 At this stage you have a fully functional application!
diff --git a/apps/docs/pages/guides/getting-started/tutorials/with-nuxt-3.mdx b/apps/docs/pages/guides/getting-started/tutorials/with-nuxt-3.mdx
index b4f5af0a1a3..844c10dc2a4 100644
--- a/apps/docs/pages/guides/getting-started/tutorials/with-nuxt-3.mdx
+++ b/apps/docs/pages/guides/getting-started/tutorials/with-nuxt-3.mdx
@@ -420,6 +420,10 @@ And then we can add the widget to the Account page:
 
 That is it! You should now be able to upload a profile photo to Supabase Storage.
 
+### Storage management
+
+<StorageManagement />
+
 ## Next steps
 
 At this stage you have a fully functional application!
diff --git a/apps/docs/pages/guides/getting-started/tutorials/with-react.mdx b/apps/docs/pages/guides/getting-started/tutorials/with-react.mdx
index 7d1418b7146..981c7b33d9b 100644
--- a/apps/docs/pages/guides/getting-started/tutorials/with-react.mdx
+++ b/apps/docs/pages/guides/getting-started/tutorials/with-react.mdx
@@ -397,6 +397,10 @@ return (
 )
 ```
 
+### Storage management
+
+<StorageManagement />
+
 ## Next steps
 
 At this stage you have a fully functional application!
diff --git a/apps/docs/pages/guides/getting-started/tutorials/with-redwoodjs.mdx b/apps/docs/pages/guides/getting-started/tutorials/with-redwoodjs.mdx
index c32611a4251..4ef898863f1 100644
--- a/apps/docs/pages/guides/getting-started/tutorials/with-redwoodjs.mdx
+++ b/apps/docs/pages/guides/getting-started/tutorials/with-redwoodjs.mdx
@@ -771,6 +771,10 @@ return (
 )
 ```
 
+### Storage management
+
+<StorageManagement />
+
 ## Next steps
 
 At this stage you have a fully functional application!
diff --git a/apps/docs/pages/guides/getting-started/tutorials/with-solidjs.mdx b/apps/docs/pages/guides/getting-started/tutorials/with-solidjs.mdx
index 7de71d63910..eaf47892298 100644
--- a/apps/docs/pages/guides/getting-started/tutorials/with-solidjs.mdx
+++ b/apps/docs/pages/guides/getting-started/tutorials/with-solidjs.mdx
@@ -415,6 +415,10 @@ return (
 )
 ```
 
+### Storage management
+
+<StorageManagement />
+
 ## Next steps
 
 At this stage you have a fully functional application!
diff --git a/apps/docs/pages/guides/getting-started/tutorials/with-svelte.mdx b/apps/docs/pages/guides/getting-started/tutorials/with-svelte.mdx
index 69cdea17b87..5195fa8b135 100644
--- a/apps/docs/pages/guides/getting-started/tutorials/with-svelte.mdx
+++ b/apps/docs/pages/guides/getting-started/tutorials/with-svelte.mdx
@@ -368,6 +368,10 @@ And then we can add the widget to the Account page:
 </form>
 ```
 
+### Storage management
+
+<StorageManagement />
+
 ## Next steps
 
 At this stage you have a fully functional application!
diff --git a/apps/docs/pages/guides/getting-started/tutorials/with-sveltekit.mdx b/apps/docs/pages/guides/getting-started/tutorials/with-sveltekit.mdx
index bbac06e6019..78f236a99d9 100644
--- a/apps/docs/pages/guides/getting-started/tutorials/with-sveltekit.mdx
+++ b/apps/docs/pages/guides/getting-started/tutorials/with-sveltekit.mdx
@@ -434,6 +434,10 @@ And then we can add the widget to the Account page:
 </form>
 ```
 
+### Storage management
+
+<StorageManagement />
+
 ## Next steps
 
 At this stage you have a fully functional application!
diff --git a/apps/docs/pages/guides/getting-started/tutorials/with-vue-3.mdx b/apps/docs/pages/guides/getting-started/tutorials/with-vue-3.mdx
index a1ec84a8c92..a09c7e7c1ec 100644
--- a/apps/docs/pages/guides/getting-started/tutorials/with-vue-3.mdx
+++ b/apps/docs/pages/guides/getting-started/tutorials/with-vue-3.mdx
@@ -379,6 +379,10 @@ And then we can add the widget to the Account page:
 </template>
 ```
 
+### Storage management
+
+<StorageManagement />
+
 ## Next steps
 
 At this stage you have a fully functional application!
diff --git a/apps/docs/pages/guides/integrations/estuary.mdx b/apps/docs/pages/guides/integrations/estuary.mdx
index e8287eaff62..77e52581a5a 100644
--- a/apps/docs/pages/guides/integrations/estuary.mdx
+++ b/apps/docs/pages/guides/integrations/estuary.mdx
@@ -18,7 +18,7 @@ Once created, the pipeline backfills all your historical data from Firestore and
 
 Before you begin, you'll need:
 
-- An [Estuary account](https://go.estuary.dev/sign-up).
+- An Estuary account. [Head to the web app to start for free](https://dashboard.estuary.dev).
 
 - For your Firestore database:
 
@@ -31,36 +31,35 @@ Before you begin, you'll need:
 
 You'll start by creating a **capture**, a task in Flow that connects to your data source system: in this case, Firestore. This process will create one or more data **collections**, backed by a real-time data lake.
 
-1. Go to the Flow web application at [dashboard.estuary.dev](http://dashboard.estuary.dev) and sign in using the credentials provided by your Estuary account manager.
+1. Go to the [**Captures** tab](https://dashboard.estuary.dev/captures) of the Flow web app and choose **New Capture**. 
 
-2. Click the **Captures** tab and choose **New Capture**.
-
-3. Locate and select the **Google Firestore** card.
+2. Locate and select the **Google Firestore** card.
 
    A form appears with the properties required for a Firestore capture.
 
-4. Set a name for your capture.
+3. Set a name for your capture.
 
    Click inside the **Name** field to generate a drop-down menu of available **prefixes** and select one (likely, this will be the name of your organization). Append a unique capture name after the `/` to create the full name, for example, `acmeCo/myFirestoreCapture`.
 
-5. Fill out the required properties for Firestore.
+4. Fill out the required properties for Firestore.
 
-   - **Database**: Flow can autodetect the database name, but you may optionally specify it here. This is helpful if the service account used has access to multiple Firebase projects. Your database name usually follows the format `projects/$PROJECTID/databases/(default)`.
-   - **Credentials**: The JSON service account key created per the prerequisites.
+   **Database**: Flow can autodetect the database name, but you may optionally specify it here. This is helpful if the service account used has access to multiple Firebase projects. Your database name usually follows the format `projects/$PROJECTID/databases/(default)`.
+   
+   **Credentials**: The JSON service account key created per the prerequisites.
 
-6. Click **Discover Endpoint**.
+5. Click **Next**.
 
-Flow uses the provided configuration to initiate a connection with Firestore. It generates a capture specification and details of the collections that it will create, once published.
+   Flow uses the provided configuration to initiate a connection with Firestore. It maps each collection in the Firestore database to a Flow collection. 
 
-7. Use the **Specification Editor** to view the [JSON schemas](https://docs.estuary.dev/concepts/schemas/) for each collection and make sure they are formatted correctly for your needs. If they're not, you can edit them.
+6. Optionally, use the **Collection Selector** to remove any collections you don't need to migrate to Supabase.
 
-8. Click **Save and publish**.
+7. Click **Save and Publish**.
 
-You'll see a notification when the capture publishes successfully.
+   You'll see a notification when the capture publishes successfully.
 
-The data currently in your Firestore database has been captured, and future updates to it will be captured continuously.
+   The data currently in your Firestore database has been captured to Flow, and future updates to it will be captured continuously.
 
-Click **Materialize Collections** to continue.
+   Click **Materialize Collections** to continue.
 
 ## Step 2: Materialize your collections to Postgres
 
@@ -72,23 +71,31 @@ A form appears with the properties required for a Postgres materialization.
 
 2. Choose a unique name for your materialization like you did when naming your capture; for example, `acmeCo/mySupabaseMaterialization`.
 
-3. Fill out the required properties for PostgreSQL. You can find most of these in Supabase by going to the **Settings** section and clicking **Database**.
+3. Fill out the required properties for Postgres. You can find most of these in Supabase by going to the **Settings** section and clicking **Database**.
 
-   - **Address**: Format at `<host>:<port>`.
-   - **User**: Usually, this is `postgres`.
-   - **Password**: The password you set when you created your Supabase project.
+   **Address**: Format at `<host>:<port>`.
+   
+   **User**: Usually, this is `postgres`.
+   
+   **Password**: The password you set when you created your Supabase project.
 
-4. Scroll down to view the **Collection Selector** and fill in the **Table** field for each collection.
+4. Click **Next**. 
 
-The collections you just created have already been selected, but you must provide names for the tables to which they'll be materialized.
+   Flow initiates a connection with the database and the **Collection Selector** expands. 
+   It's populated with your collections from Firestore, each mapped to a Postgres table.
 
-5. Click **Discover Endpoint**.
+5. For each collection, apply a stricter JSON schema. 
+   This ensure that the less-structured Firestore data will be written to a Postgres table in the correct shape.
 
-Flow uses the provided configuration to initiate a connection to your Supabase Postgres database and generate a specification.
+   In the Collection Selector, choose a collection and click its **Specification** tab.
+  
+   Click **Schema Inference**. Flow scans the data in your collection and infers a new schema to use for materialization. 
+  
+   Review the new schema and click **Apply Inferred Schema**.
 
-6. Click **Save and Publish**. You'll see a notification when the full materialization publishes successfully.
+6. Click **Save and Publish**. You'll see a notification when the materialization publishes successfully.
 
-Your Firestore collections are copied to tables in Supabase. As long as you leave the capture and materialation running, any changes to the Firestore data will be reflected in Supabase in milliseconds.
+   Your Firestore collections are copied to tables in Supabase. As long as you leave the capture and materialation running, any changes to the Firestore data will be reflected in Supabase in milliseconds.
 
 ## Resources
 
diff --git a/apps/docs/pages/guides/integrations/illa.mdx b/apps/docs/pages/guides/integrations/illa.mdx
new file mode 100644
index 00000000000..e30c07e88f3
--- /dev/null
+++ b/apps/docs/pages/guides/integrations/illa.mdx
@@ -0,0 +1,107 @@
+import Layout from '~/layouts/DefaultGuideLayout'
+
+export const meta = {
+  id: 'illa',
+  title: 'ILLA',
+  description:
+    'Get started with Supabase and ILLA, a low-code platform for developers that enables the rapid development and deployment of internal tools.',
+}
+
+This tutorial outlines the process of creating an Admin Panel using ILLA Builder and Supabase in a few simple steps. ILLA is a low-code platform for developers that enables the rapid development and deployment of internal tools. It allows for creating pages by dragging and dropping UI components, connecting to any database or API, and writing JavaScript. To learn more about ILLA and give it a try, visit their website at [https://www.illacloud.com/](https://www.illacloud.com/). Let's begin!
+
+### Step 1: Set up your Back end on Supabase
+
+On the [Supabase dashboard](https://app.supabase.com/projects), click `New project` and set the name to adminPanel.
+
+![Create Supabase Project for ILLA Admin Panel](/docs/img/guides/integrations/illa/supabase-illa-project.png)
+
+Create a new table by clicking on the `Create a new table` .
+
+Supabase offers a variety of options for populating tables with data, including writing queries, creating schemas through a user interface, and uploading CSV files.
+
+![Create Supabase Table for ILLA Admin Panel](/docs/img/guides/integrations/illa/supabase-table-1.png)
+
+![Config Supabase Table for ILLA Admin Panel](/docs/img/guides/integrations/illa/supabase-table-2.png)
+
+Fill out the info in the table. The database is now set up.
+
+### Step 2: Build UI on ILLA Builder
+
+On [ILLA Builder](https://fast-try.illacloud.com/), click Create New to create a new application.
+
+![Create new project on ILLA Builder](/docs/img/guides/integrations/illa/supabase-illa-create-project.png)
+
+Drag components from the `Insert` panel to the canvas.
+
+Select the components on the canvas and configure the property on the `Inspect` panel.
+
+As seen in the below screenshot, we have built a simple admin panel.
+
+![Build UI with ILLA Builder](/docs/img/guides/integrations/illa/supabase-illa-UI.png)
+
+### Step 3: Connect to Supabase and config CRUD
+
+Note down the database connection information under [Project Settings](https://app.supabase.com/project/hdcfnsxpwwgboqomdrhp/settings/database) in Supabase.
+
+![Note information in supabase](/docs/img/guides/integrations/illa/supabase-information.png)
+
+In the Action List, click `+ New` and select Supabase DB.
+
+![Connect ILLA to Supabase](/docs/img/guides/integrations/illa/supabase-illa-connect.png)
+
+Fill out the form to connect to your Supabase instance. Test connection and save resource.
+
+![Config Supabase in ILLA](/docs/img/guides/integrations/illa/supabase-illa-connect-2.png)
+
+Click `Create Action` to create an action with the Supabase resource and config your CRUD.
+
+![Select Supabase resource in ILLA](/docs/img/guides/integrations/illa/supabase-illa-select.png)
+
+Use `{{` to get the front-end input data. The following is an example of the User Management page in the Admin Panel.
+
+Search for a user by the name inputted in input1
+
+```
+SELECT *
+FROM user
+WHERE name = "{{input1.value}}"
+;
+```
+
+Update user data. Update user information when id matches
+
+```
+UPDATE user
+SET name = "{{input3.value}}"
+, email = "{{input4.value}}"
+WHERE id="{{input2.value}}"
+;
+```
+
+Insert user data
+
+```
+INSERT INTO user VALUES("{{input5.value}}","{{input6.value}}","{{input7.value}}");
+```
+
+Delete a user by id
+
+```
+DELETE FROM user WHERE id = "{{input2.value}}";
+```
+
+### Step 4: Show data on components
+
+Configure the properties of components with `{{` . For example:
+
+![Show Supabase data on ILLA components](/docs/img/guides/integrations/illa/supabase-illa-show-data.png)
+
+## Resources
+
+- [ILLA Cloud official website](https://www.illacloud.com/)
+- [ILLA Cloud GitHub](https://github.com/illacloud/illa-builder)
+- [ILLA Cloud documentation](https://www.illacloud.com/docs/about-illa)
+
+export const Page = ({ children }) => <Layout meta={meta} children={children} />
+
+export default Page
diff --git a/apps/docs/pages/guides/integrations/keyri.mdx b/apps/docs/pages/guides/integrations/keyri.mdx
index 3956655167b..70d53e23374 100644
--- a/apps/docs/pages/guides/integrations/keyri.mdx
+++ b/apps/docs/pages/guides/integrations/keyri.mdx
@@ -23,7 +23,14 @@ Note your application key from the Keys and Credentials section - this will be u
 
 # Web
 
-[![Keyri-Supabase Web Integration Video](http://img.youtube.com/vi/jrjrcpc2PFQ/0.jpg)](http://www.youtube.com/watch?v=jrjrcpc2PFQ 'Supabase & Keyri | Web Integration Overview')
+<div className="video-container">
+  <iframe
+    src="https://www.youtube-nocookie.com/embed/jrjrcpc2PFQ"
+    frameBorder="1"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+    allowFullScreen
+  ></iframe>
+</div>
 
 For your web app, first download KeyriQR.html (available [here](https://raw.githubusercontent.com/Keyri-Co/library-keyri-connect/main/KeyriQR.html)) and save it to a public directory.
 
@@ -64,7 +71,15 @@ That's it!
 
 # Mobile
 
-[![Keyri-Supabase Mobile Integration Video](http://img.youtube.com/vi/oGMsSKyh6tc/0.jpg)](http://www.youtube.com/watch?v=oGMsSKyh6tc 'Supabase & Keyri | Mobile Integration Overview')
+<div className="video-container">
+  <iframe
+    src="https://www.youtube-nocookie.com/embed/oGMsSKyh6tc"
+    frameBorder="1"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+    allowFullScreen
+  ></iframe>
+</div>
+
 
 ### Install Flutter
 
diff --git a/apps/docs/pages/guides/integrations/onesignal.mdx b/apps/docs/pages/guides/integrations/onesignal.mdx
index cd6b7021dd8..446242bd07c 100644
--- a/apps/docs/pages/guides/integrations/onesignal.mdx
+++ b/apps/docs/pages/guides/integrations/onesignal.mdx
@@ -14,7 +14,18 @@ export const meta = {
 - Emails
 - In-app notifications
 
-This guide steps you through how you can integrate OneSignal with Supabase to create a seamless cloud messaging experience for your users using Database webhooks and edge functions through a simple Next.js application.
+Here is William giving us the overview of how OneSignal can work with Supabase to send notifications to your users.
+
+<div className="video-container">
+  <iframe
+    src="https://www.youtube-nocookie.com/embed/mw0DLwItue4"
+    frameBorder="1"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+    allowFullScreen
+  ></iframe>
+</div>
+
+In this guide, we will build a similar app and steps you through how you can integrate OneSignal with Supabase to create a seamless cloud messaging experience for your users using Database webhooks and edge functions through a simple Next.js application.
 
 ![Entity Diagram](/docs/img/guides/integrations/onesignal/diagram.png)
 
diff --git a/apps/docs/pages/guides/integrations/prisma.mdx b/apps/docs/pages/guides/integrations/prisma.mdx
index 6a80e95fee6..840028a00c7 100644
--- a/apps/docs/pages/guides/integrations/prisma.mdx
+++ b/apps/docs/pages/guides/integrations/prisma.mdx
@@ -68,7 +68,7 @@ By default, Prisma migrations will try to drop the `postgres` database, which ca
 Create a shadow database in your PostgreSQL server within the same Supabase project using the `psql` CLI and the `DATABASE_URL` from the previous steps (or use the local database).
 
 ```bash
-psql postgresql://postgres:[YOUR-PASSWORD]@db.vdbnhqozmlzdsaejdxwr.supabase.red:5432
+psql postgresql://postgres:[YOUR-PASSWORD]@db.[YOUR-PROJECT-REF].supabase.co:5432
 ```
 
 After you connect to your project's PostgreSQL instance, create another database (e.g., `postgres_shadow`):
@@ -83,8 +83,8 @@ In the `.env` file, update `DATABASE_URL` and `SHADOW_DATABASE_URL` to the conne
 
 ```env
 # .env
-DATABASE_URL="postgres://postgres:[YOUR-PASSWORD]@db.vdbnhqozmlzdsaejdxwr.supabase.co:5432/postgres"
-SHADOW_DATABASE_URL="postgres://postgres:[YOUR-PASSWORD]@db.vdbnhqozmlzdsaejdxwr.supabase.co:5432/postgres_shadow"
+DATABASE_URL="postgres://postgres:[YOUR-PASSWORD]@db.[YOUR-PROJECT-REF].supabase.co:5432/postgres"
+SHADOW_DATABASE_URL="postgres://postgres:[YOUR-PASSWORD]@db.[YOUR-PROJECT-REF].supabase.co:5432/postgres_shadow"
 ```
 
 In the `schema.prisma` file, change the `provider` from "sqlite" to `"postgresql"` and add the `shadowDatabaseUrl` property.
@@ -145,8 +145,8 @@ When migrating, you need to use the non-pooled connection URL (like the one used
 
 ```env
 # .env
-DATABASE_URL="postgres://postgres:[YOUR-PASSWORD]@db.vdbnhqozmlzdsaejdxwr.supabase.co:6543/postgres?pgbouncer=true&connection_limit=1"
-SHADOW_DATABASE_URL="postgres://postgres:[YOUR-PASSWORD]@db.vdbnhqozmlzdsaejdxwr.supabase.co:5432/postgres_shadow"
+DATABASE_URL="postgres://postgres:[YOUR-PASSWORD]@db.[YOUR-PROJECT-REF].supabase.co:6543/postgres?pgbouncer=true&connection_limit=1"
+SHADOW_DATABASE_URL="postgres://postgres:[YOUR-PASSWORD]@db.[YOUR-PROJECT-REF].supabase.co:5432/postgres_shadow"
 ```
 
 Prisma Migrate uses database transactions to check out the current state of the database and the migrations table. However, the Migration Engine is designed to use a single connection to the database, and does not support connection pooling with PgBouncer. If you attempt to run Prisma Migrate commands in any environment that uses PgBouncer for connection pooling, you might see the following error:
diff --git a/apps/docs/pages/guides/platform/database-usage.mdx b/apps/docs/pages/guides/platform/database-usage.mdx
index 2a4f1def28e..8e817bdde0b 100644
--- a/apps/docs/pages/guides/platform/database-usage.mdx
+++ b/apps/docs/pages/guides/platform/database-usage.mdx
@@ -19,15 +19,11 @@ This value is also reported in the [database settings page](https://app.supabase
 
 ## Database storage management
 
-Your project will be changed to read-only mode once it reaches 95% of your subscription quota, preventing further writes to your project.
-In read-only mode, clients will encounter errors such as `cannot execute INSERT in a read-only transaction`.
+Supabase uses network-attached storage to balance performance with scalability. For Pro and Enterprise projects, database storage expands ~1.5x automatically (e.g., 8GB -> 12GB) when you reach 90% of the database storage quota. Automatic database storage expansion can only occur once every six hours. Pro projects can store up to 1024TB.
 
-Regular operation (read-write mode) is automatically re-enabled once database storage usage falls under 95%.
+All projects enter read-only mode when you reach 95% of the database storage quota. In read-only mode, clients will encounter errors such as `cannot execute INSERT in a read-only transaction`. Regular operation (read-write mode) is automatically re-enabled once usage is below 95% of the database storage quota.
 
-If you are on Pro or Enterprise, database storage expands automatically, however you may also encounter this error if fill the database faster than it can expand.
-
-Supabase uses network-attached storage, which balances performance with scalability. Pro projects can store up to 1024TB.
-If you intend to grow beyond this, reach out to our team to learn more about our Enterprise tier.
+If you need more than 1024TB of database storage or require multiple storage expansions in a short period of time, [contact us](https://app.supabase.com/support/new) to learn more about the Enterprise plan.
 
 ### Increasing available database storage
 
diff --git a/apps/docs/pages/guides/platform/going-into-prod.mdx b/apps/docs/pages/guides/platform/going-into-prod.mdx
index 73c25d0a1c5..30274b5277a 100644
--- a/apps/docs/pages/guides/platform/going-into-prod.mdx
+++ b/apps/docs/pages/guides/platform/going-into-prod.mdx
@@ -73,6 +73,11 @@ After developing your project and deciding it's Production Ready, you should run
 
 - Supabase provides CAPTCHA protection on the signup, sign-in and password reset endpoints. Please refer to [our guide](/docs/guides/auth/auth-captcha) on how to protect against abuse using this method.
 
+### Email Link Validity
+
+- When working with enterprise systems, email scanners may scan and make a `GET` request to the reset password link or sign up link in your email. Since links in Supabase Auth are single use, a user who opens an email post-scan to click on a link will receive an error. To get around this problem,
+  consider altering the email template to replace the original magic link with a link to a domain you control. The domain can present the user with a "Sign-in" button which redirect the user to the original magic link URL when clicked.
+
 ## Next steps
 
 This checklist is always growing so be sure to check back frequently, and also feel free to suggest additions and amendments by making a PR on [GitHub](https://github.com/supabase/supabase).
diff --git a/apps/docs/pages/guides/platform/http-status-codes.mdx b/apps/docs/pages/guides/platform/http-status-codes.mdx
new file mode 100644
index 00000000000..7a02133916d
--- /dev/null
+++ b/apps/docs/pages/guides/platform/http-status-codes.mdx
@@ -0,0 +1,41 @@
+import Layout from '~/layouts/DefaultGuideLayout'
+
+export const meta = {
+  id: 'http-status-codes',
+  title: 'HTTP Status Codes',
+  description: 'HTTP Status Codes used by the Supabase platform',
+}
+
+The Supabase platform offers several HTTP APIs for each project. These APIs can use the status codes to indicate the state of the project, and the request being processed. The status codes returned for requests can be access via the [logs explorer](../platform/logs#logs-explorer).
+
+## 2XX Success
+
+2XX status codes indicate that the request was processed successfully.
+
+## 3XX Redirects
+
+3XX status codes indicate that the client must initiate another course of action to have the request processed successfully. The most popular usage of 3XX codes is to redirect the client to a different location.
+
+## 4XX Client Errors
+
+4XX status codes indicate an issue on the client's end with the request being made. These could include missing or invalid auth information, a malformed request, making too many requests in too short a time period ("rate limiting"), or a network issue on the client's end.
+
+## 5XX Server or Project Errors
+
+5XX status codes indicate that the project was unable to process the request successfully, but not because of an issue with the client's request.
+
+5XX status codes can be the result of the project not having enough [compute](/docs/guides/platform/compute-add-ons) to process a complex request being made by a client or not being able to keep up with the volume of requests made against the project.
+
+### 54X Project Errors
+
+54X status codes are custom codes used by the Supabase platform to indicate the state of the project.
+
+#### 540 Project Paused
+
+The project the request was being made against has been paused. The project cannot process requests until it is un-paused by the owner.
+
+Free-tier projects may be paused due to inactivity, on request by the owner, or in rare instances, due to abuse.
+
+export const Page = ({ children }) => <Layout meta={meta} children={children} />
+
+export default Page
diff --git a/apps/docs/pages/guides/platform/migrating-and-upgrading-projects.mdx b/apps/docs/pages/guides/platform/migrating-and-upgrading-projects.mdx
index a82793c9559..1b657450546 100644
--- a/apps/docs/pages/guides/platform/migrating-and-upgrading-projects.mdx
+++ b/apps/docs/pages/guides/platform/migrating-and-upgrading-projects.mdx
@@ -12,6 +12,8 @@ In some cases, access to new features require upgrading or migrating your Supaba
 
 ## Upgrade your project
 
+<Admonition type="note">This is only available for projects on the Free plan.</Admonition>
+
 When you pause and restore a project, the restored database includes the latest features. This method _does_ include downtime, so be aware that your project will be inaccessible for a short period of time.
 
 1. On the [General Settings](https://app.supabase.com/project/_/settings/general) page in the Dashboard, click **Pause project**. You will be redirected to the home screen as your project is pausing. This process can take several minutes.
diff --git a/apps/docs/pages/guides/platform/troubleshooting.mdx b/apps/docs/pages/guides/platform/troubleshooting.mdx
new file mode 100644
index 00000000000..5ac27b8b71d
--- /dev/null
+++ b/apps/docs/pages/guides/platform/troubleshooting.mdx
@@ -0,0 +1,57 @@
+import Layout from '~/layouts/DefaultGuideLayout'
+
+export const meta = {
+  id: 'troubeshooting',
+  title: 'Troubleshooting',
+  description: 'Diagnosing and fixing issues with your hosted Supabase project.',
+}
+
+Learn how to diagnose and fix common issues with your Supabase project.
+
+## HTTP API Issues
+
+Symptoms:
+
+- HTTP timeouts
+- 5xx response codes
+- High response times
+
+### Under-provisioned resources
+
+The most common class of issues that causes HTTP timeouts and 5xx response codes is the under-provisioning of resources for your project. This can cause your project to be unable to service the traffic it is receiving.
+
+Each Supabase project is provisioned with [segregated compute resources](../platform/compute-add-ons). This allows the project to serve unlimited requests, as long as they can be handled using the resources that have been provisioned. Complex queries, or queries that process larger amounts of data, will require higher amounts of resources. As such, the amount of resources that can handle a high volume of simple queries (or queries involving small amounts of data), will likely be unable to handle a similar volume of complex queries.
+
+You can view the resource utilization of your Supabase Project using the [reports in the Dashboard](https://app.supabase.com/project/_/reports/database).
+
+Some common solutions for this issue are:
+
+- [Upgrading](https://app.supabase.com/project/_/settings/billing/subscription) to a [larger compute add-on](../platform/compute-add-ons) in order to serve higher volumes of traffic.
+- [Optimizing the queries](../platform/performance#examining-query-performance) being executed.
+- [Using fewer Postgres connections](../platform/performance#configuring-clients-to-use-fewer-connections) can reduce the amount of resources needed on the project.
+- [Restarting](https://app.supabase.com/project/_/settings/general) the database. This only temporarily solves the issue by terminating any ongoing workloads that might be tying up your compute resources.
+
+If your [Daily Disk IO budget](../platform/compute-add-ons#disk-io-bandwidth) has been drained, you will need to either wait for it to be replenished the next day, or upgrade to a larger compute add-on to increase the budget available to your project.
+
+## Unable to connect to your Supabase Project
+
+Symptom: You're unable to connect to your Postgres database directly, but can open the Project in the [Supabase Dashboard](https://app.supabase.com/project/_/).
+
+### Too many open connections
+
+Errors about too many open connections can be _temporarily_ resolved by [restarting the database](https://app.supabase.com/project/_/settings/general). However, this won't solve the underlying issue for a permanent solution.
+
+- If you're receiving a `No more connections allowed (max_client_conn)` error:
+  - Configure your applications and services to [use fewer connections](../platform/performance#configuring-clients-to-use-fewer-connections).
+  - [Upgrade](https://app.supabase.com/project/_/settings/billing/subscription) to a [larger compute add-on](../platform/compute-add-ons) to increase the number of available connections.
+- If you're receiving a `sorry, too many clients already` or `remaining connection slots are reserved for non-replication superuser connections` error message in addition to the above suggestions, switch to using the [connection pooler](/docs/guides/database/connecting-to-postgres#connection-pool) instead.
+
+### Connection refused
+
+If you receive a `connection refused` error after a few initial failed connection attempts, your client has likely been temporarily blocked in order to protect the database from brute-force attacks. You can wait 30 minutes before trying again with the correct password, or you can [contact support](https://app.supabase.com/support/new) with your client's IP address to manually unblock you.
+
+If you're also unable to open the project using the [Supabase Dashboard](https://app.supabase.com/project/_/), review the solutions for [under-provisioned projects](#under-provisioned-resources).
+
+export const Page = ({ children }) => <Layout meta={meta} children={children} />
+
+export default Page
diff --git a/apps/docs/pages/guides/realtime/quickstart.mdx b/apps/docs/pages/guides/realtime/quickstart.mdx
index 3e387393ed1..73dd9f90689 100644
--- a/apps/docs/pages/guides/realtime/quickstart.mdx
+++ b/apps/docs/pages/guides/realtime/quickstart.mdx
@@ -121,7 +121,7 @@ channel.subscribe(async (status) => {
 })
 ```
 
-## Track and display which users are online
+## Track and Display Which Users Are Online
 
 [Presence](/docs/guides/realtime#presence) stores and synchronize shared state across clients. The `sync` event is triggered whenever the shared state changes. The `join` event is triggered when new clients join the channel and `leave` event is triggered when clients leave.
 
diff --git a/apps/docs/pages/guides/resources.mdx b/apps/docs/pages/guides/resources.mdx
index b1b139020d3..0b2d856b541 100644
--- a/apps/docs/pages/guides/resources.mdx
+++ b/apps/docs/pages/guides/resources.mdx
@@ -64,20 +64,6 @@ export const meta = {
 
 </div>
 
-<div className="grid gap-16 md:grid-cols-2">
-
-  <div>
-
-    ### Supabase CLI
-
-    Develop your project locally, manage your Supabase projects, handle database migrations, CI/CD workflows, and generate types from your database schema, all from the comfort of your Terminal.
-
-[Learn more](/docs/guides/resources/supabase-cli)
-
-  </div>
-
-</div>
-
 {/* end of container */}
 
 </div>
diff --git a/apps/docs/pages/guides/self-hosting/docker.mdx b/apps/docs/pages/guides/self-hosting/docker.mdx
index 0a32049889b..d789a0e9ee1 100644
--- a/apps/docs/pages/guides/self-hosting/docker.mdx
+++ b/apps/docs/pages/guides/self-hosting/docker.mdx
@@ -95,6 +95,10 @@ POSTGRES_PORT=5432
 
 Once you have done this, you can safely comment out the `db` section of the `docker-compose` file, and remove any instances where the services `depends_on` the `db` image.
 
+Supabase services require your external database to be initialized with a specific schema. Refer to our [postgres/migrations](https://github.com/supabase/postgres/tree/develop/migrations) repository for instructions on running these migrations.
+
+Note that you need superuser permission on the postgres role to perform the initial schema migration. Once completed, the postgres role will be demoted to non-superuser to prevent abuse.
+
 ### Setting database's `log_min_messages`
 
 By default, `docker compose` sets the database's `log_min_messages` configuration to `fatal` to prevent redundant logs generated by Realtime.
diff --git a/apps/docs/pages/guides/storage/access-control.mdx b/apps/docs/pages/guides/storage/access-control.mdx
index 58572bd789e..4adfd73e135 100644
--- a/apps/docs/pages/guides/storage/access-control.mdx
+++ b/apps/docs/pages/guides/storage/access-control.mdx
@@ -117,10 +117,8 @@ using ( bucket_id = 'public' );
 -- 1. Allow logged-in access to any files in the "restricted" bucket
 create policy "Restricted Access"
 on storage.objects for select
-using (
-  bucket_id = 'restricted'
-  and auth.role() = 'authenticated'
-);
+to authenticated
+using ( bucket_id = 'restricted' );
 ```
 
 ### Allow individual access to a file
diff --git a/apps/docs/pages/guides/storage/image-transformations.mdx b/apps/docs/pages/guides/storage/image-transformations.mdx
index 98e3af03a79..0200d777e6a 100644
--- a/apps/docs/pages/guides/storage/image-transformations.mdx
+++ b/apps/docs/pages/guides/storage/image-transformations.mdx
@@ -14,6 +14,15 @@ Supabase Storage offers the functionality to transform and resize images dynamic
   above](https://supabase.com/pricing).
 </Admonition>
 
+<div className="video-container">
+  <iframe
+    src="https://www.youtube-nocookie.com/embed/dLqSmxX3r7I"
+    frameBorder="1"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+    allowFullScreen
+  ></iframe>
+</div>
+
 ## Get a public URL for a transformed image
 
 You can pass a `transform` option to the functions you are currently using to interact with your objects. This returns the public URL that serves the resized image.
@@ -59,6 +68,32 @@ supabase.storage.from('bucket').download('image.jpg', {
 })
 ```
 
+## Automatic Image Optimisation (WebP)
+
+When using the image transformation API we will automatically find the best format supported by the browser and return that to the client, without any code change.
+For instance, if you use Chrome when viewing a jpeg image and using transformation options, you'll see that the content-type returned is `webp`.
+
+As a result, this will lower the bandwidth that you send to your users and your application will load much faster.
+
+<Admonition type="note">
+    We currently only support WebP. AVIF support will come in the near future
+</Admonition>
+
+**Disabling automatic optimisation:**
+
+In case you'd like to return the original format of the image and **opt-out** from the automatic image optimization detection, you can pass the `format=origin` parameter when requesting a transformed image,
+this is also supported in the JavaScript SDK starting from v2.2.0
+
+```ts
+await storage.from('bucket').download('image.jpeg', {
+      transform: {
+        width: 200,
+        height: 200,
+        format: 'origin',
+      },
+})
+```
+
 ## NextJS Loader
 
 You can use Supabase Image Transformation to optimise your NextJS images using a custom [Loader](https://nextjs.org/docs/api-reference/next/image#loader-configuration).
@@ -69,7 +104,7 @@ To get started, create a `supabase-image-loader.js` file in your NextJS project
 const projectId = '' // your supabase project id
 
 export default function supabaseLoader({ src, width, height, quality }) {
-  return `https://${projectId}.supabase.co/storage/v1/${src}?width=${width}&height=${
+  return `https://${projectId}.supabase.co/storage/v1/render/image/public/${src}?width=${width}&height=${
     height || 0
   }&quality=${quality || 75}`
 }
@@ -149,6 +184,34 @@ supabase.storage.from('bucket').download('image.jpg', {
 | BMP    | `bmp`     | ☑️     | ☑️     |
 | TIFF   | `tiff`    | ☑️     | ☑️     |
 
+## Self Hosting
+
+Our solution to image resizing and optimisation can be self-hosted as with any other Supabase product.
+Under the hood we use the awesome [Imgproxy](https://imgproxy.net/)
+
+#### Imgproxy Configuration:
+
+Simply deploy an imgproxy container with the following configuration:
+
+```yaml
+  imgproxy:
+    image: darthsim/imgproxy
+    environment:
+      - IMGPROXY_ENABLE_WEBP_DETECTION=true
+      - IMGPROXY_JPEG_PROGRESSIVE=true
+```
+
+Note: make sure that this service can only be reachable within an internal network and not exposed to the public internet
+
+#### Storage API Configuration:
+
+Once [Imgproxy](https://imgproxy.net/) is deployed we need to configure a couple of environment variables in your self-hosted [storage-api](https://github.com/supabase/storage-api) service as follows:
+
+```shell
+ENABLE_IMAGE_TRANSFORMATION=true
+IMGPROXY_URL=yourinternalimgproxyurl.internal.com
+```
+
 export const Page = ({ children }) => <Layout meta={meta} children={children} />
 
 export default Page
diff --git a/apps/docs/pages/guides/tutorials.mdx b/apps/docs/pages/guides/tutorials.mdx
deleted file mode 100644
index 887788bdb39..00000000000
--- a/apps/docs/pages/guides/tutorials.mdx
+++ /dev/null
@@ -1,159 +0,0 @@
-import Layout from '~/layouts/DefaultLayout'
-import Link from 'next/link'
-import { GlassPanel } from 'ui'
-
-export const meta = {
-  title: 'Tutorials',
-}
-
-### Webapps
-
-<div className="grid grid-cols-12 gap-6 not-prose">
-  {webapps.map((item) => {
-    return (
-      <Link href={`/${item.href}`} key={item.title} passHref>
-        <a className={'col-span-4'}>
-          <GlassPanel title={item.title} span="col-span-6" background={false} icon={item.icon}>
-            {item.description}
-          </GlassPanel>
-        </a>
-      </Link>
-    )
-  })}
-</div>
-
-### Mobile
-
-<div className="grid grid-cols-12 gap-6 not-prose">
-  {mobile.map((item) => {
-    return (
-      <Link href={`/${item.href}`} key={item.title} passHref>
-        <a className={'col-span-4'}>
-          <GlassPanel title={item.title} span="col-span-6" background={false} icon={item.icon}>
-            {item.description}
-          </GlassPanel>
-        </a>
-      </Link>
-    )
-  })}
-</div>
-
-### Low code
-
-<div className="grid grid-cols-12 gap-6 not-prose">
-  {lowCode.map((item) => {
-    return (
-      <Link href={`/${item.href}`} key={item.title} passHref>
-        <a className={'col-span-4'}>
-          <GlassPanel title={item.title} span="col-span-6" background={false} icon={item.icon}>
-            {item.description}
-          </GlassPanel>
-        </a>
-      </Link>
-    )
-  })}
-</div>
-
-export const webapps = [
-  {
-    title: 'NextJS',
-    href: '/guides/tutorials/with-nextjs',
-    description:
-      'Learn how to build a user management app with NextJS and Supabase Database, Auth, and Storage functionality.',
-    icon: '/docs/img/icons/nextjs-icon',
-  },
-  {
-    title: 'React',
-    href: '/guides/tutorials/with-react',
-    description:
-      'Learn how to build a user management app with React and Supabase Database, Auth, and Storage functionality.',
-    icon: '/docs/img/icons/react-icon',
-  },
-  {
-    title: 'Vue 3',
-    href: '/guides/tutorials/with-vue-3',
-    description:
-      'Learn how to build a user management app with Vue 3 and Supabase Database, Auth, and Storage functionality.',
-    icon: '/docs/img/icons/vuejs-icon',
-  },
-  {
-    title: 'Nuxt 3',
-    href: '/guides/tutorials/with-nuxt-3',
-    description:
-      'Learn how to build a user management app with Nuxt 3 and Supabase Database, Auth, and Storage functionality.',
-    icon: '/docs/img/icons/nuxt-icon',
-  },
-  {
-    title: 'Angular',
-    href: '/guides/tutorials/with-angular',
-    description:
-      'Learn how to build a user management app with Angular and Supabase Database, Auth, and Storage functionality.',
-    icon: '/docs/img/icons/angular-icon',
-  },
-  {
-    title: 'RedwoodJS',
-    href: '/guides/tutorials/with-redwoodjs',
-    description:
-      'Learn how to build a user management app with RedwoodJS and Supabase Database, Auth, and Storage functionality.',
-    icon: '/docs/img/icons/redwood-icon',
-  },
-  {
-    title: 'Svelte',
-    href: '/guides/tutorials/with-svelte',
-    description:
-      'Learn how to build a user management app with Svelte and Supabase Database, Auth, and Storage functionality.',
-    icon: '/docs/img/icons/svelte-icon',
-  },
-  {
-    title: 'SvelteKit',
-    href: '/guides/tutorials/with-sveltekit',
-    description:
-      'Learn how to build a user management app with SvelteKit and Supabase Database, Auth, and Storage functionality.',
-    icon: '/docs/img/icons/svelte-icon',
-  },
-]
-
-export const mobile = [
-  {
-    title: 'Flutter',
-    href: '/guides/tutorials/with-flutter',
-    description:
-      'Learn how to build a user management app with Flutter and Supabase Database, Auth, and Storage functionality.',
-    icon: '/docs/img/icons/flutter-icon',
-  },
-  {
-    title: 'Expo',
-    href: '/guides/tutorials/with-expo',
-    description:
-      'Learn how to build a user management app with Expo and Supabase Database, Auth, and Storage functionality.',
-    icon: '/docs/img/icons/expo-icon',
-  },
-]
-
-export const lowCode = [
-  {
-    title: 'Ionic React',
-    href: '/guides/tutorials/with-ionic-react',
-    description:
-      'Learn how to build a user management app with Ionic React and Supabase Database, Auth, and Storage functionality.',
-    icon: '/docs/img/icons/ionic-icon',
-  },
-  {
-    title: 'Ionic Vue',
-    href: '/guides/tutorials/with-ionic-vue',
-    description:
-      'Learn how to build a user management app with Ionic Vue and Supabase Database, Auth, and Storage functionality.',
-    icon: '/docs/img/icons/ionic-icon',
-  },
-  {
-    title: 'Ionic Angular',
-    href: '/guides/tutorials/with-ionic-angular',
-    description:
-      'Learn how to build a user management app with Ionic Angular and Supabase Database, Auth, and Storage functionality.',
-    icon: '/docs/img/icons/ionic-icon',
-  },
-]
-
-export const Page = ({ children }) => <Layout meta={meta} children={children} />
-
-export default Page
diff --git a/apps/docs/pages/index.mdx b/apps/docs/pages/index.mdx
index 5de1c11462e..0f687a9929e 100644
--- a/apps/docs/pages/index.mdx
+++ b/apps/docs/pages/index.mdx
@@ -69,13 +69,28 @@ export const meta = {
             </Link>
             <Link href={`/guides/getting-started/quickstarts/nextjs`} passHref>
               <a className="no-underline">
-            <IconPanel title="NextJS" icon="/docs/img/icons/nextjs-icon" />
-            </a>
+                <IconPanel title="NextJS" icon="/docs/img/icons/nextjs-icon" />
+              </a>
             </Link>
             <Link href={`/guides/getting-started/quickstarts/flutter`} passHref>
               <a className="no-underline">
-            <IconPanel title="Flutter" icon="/docs/img/icons/flutter-icon" />
-            </a>
+                <IconPanel title="Flutter" icon="/docs/img/icons/flutter-icon" />
+              </a>
+            </Link>
+            <Link href={`/guides/getting-started/quickstarts/sveltekit`} passHref>
+              <a className="no-underline">
+                <IconPanel title="SvelteKit" icon="/docs/img/icons/svelte-icon" />
+              </a>
+            </Link>
+            <Link href={`/guides/getting-started/quickstarts/solidjs`} passHref>
+              <a className="no-underline">
+                <IconPanel title="SolidJS" icon="/docs/img/icons/solidjs-icon" />
+              </a>
+            </Link>
+            <Link href={`/guides/getting-started/quickstarts/vue`} passHref>
+              <a className="no-underline">
+                <IconPanel title="Vue" icon="/docs/img/icons/vuejs-icon" />
+              </a>
             </Link>
           </div>
         </div>
diff --git a/apps/docs/pages/new/auth.mdx b/apps/docs/pages/new/auth.mdx
deleted file mode 100644
index 5228f5129da..00000000000
--- a/apps/docs/pages/new/auth.mdx
+++ /dev/null
@@ -1,77 +0,0 @@
-import Layout from '~/layouts/DefaultLayout'
-import Link from 'next/link'
-// import { useTheme } from 'common/Providers'
-import { GlassPanel } from 'ui'
-
-{/* // export const { isDarkMode } = useTheme() */}
-
-export const meta = {
-  title: 'Auth',
-}
-
-## Add and manage email and password, passwordless, OAuth, and mobile logins to your project through a suite of identity providers and APIs.
-
-### Popular Guides
-
-<div className="grid grid-cols-12 gap-6 not-prose">
-  {topArticles.map((item) => {
-    return (
-      <Link
-        href={`/${item.href}`}
-        key={item.title}
-        passHref
-      >
-        <a className={item.span ?? 'col-span-4'}>
-          <GlassPanel
-            title={item.title}
-            header="/docs/img/cards/sample-card-header-4.svg"
-            span="col-span-6"
-            background={false}
-            //* isDarkMode={isDarkMode}
-          >
-            {item.description}
-          </GlassPanel>
-        </a>
-      </Link>
-    )})}
-
-</div>
-
-export const topArticles = [
-  {
-    title: 'Enable Captcha Protection',
-    header: '/docs/img/cards/sample-card-header-4.svg',
-    href: '/guides/auth/auth-captcha',
-    description: 'Keep your platform safe from bots and malicious scripts by implementing hCaptcha.',
-    span: 'col-span-6',
-  },
-  {
-    title: 'Auth Helpers',
-    header: '/docs/img/cards/sample-card-header-4.svg',
-    href: '/guides/auth/auth-helpers',
-    description: 'A collection of framework-specific utilities for implementing Supabase Auth.',
-    span: 'col-span-6',
-  },
-  {
-    title: 'Email Login',
-    header: '/docs/img/cards/sample-card-header-4.svg',
-    href: '/guides/auth/auth-email',
-    description: 'Learn how to add an email and password login flow to your platform.',
-  },
-  {
-    title: 'Phone Login',
-    header: '/docs/img/cards/sample-card-header-4.svg',
-    href: '/guides/auth/phone-login',
-    description: 'Learn how to add a login flow so your users can access your platform through one-time passwords via SMS.',
-  },
-  {
-    title: 'Social Login',
-    header: '/docs/img/cards/sample-card-header-4.svg',
-    href: '/guides/auth/social-login',
-    description: 'Learn how to add a login flow so your users can access your platform through social providers like Apple, Facebook, or Google.',
-  },
-]
-
-export const Page = ({ children }) => <Layout meta={meta} children={children} />
-
-export default Page
diff --git a/apps/docs/pages/ref-pages.mdx b/apps/docs/pages/ref-pages.mdx
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/apps/docs/pages/reference/cli/config.tsx b/apps/docs/pages/reference/cli/config.tsx
index f5aadc1c4a8..3453d44e312 100644
--- a/apps/docs/pages/reference/cli/config.tsx
+++ b/apps/docs/pages/reference/cli/config.tsx
@@ -2,16 +2,31 @@
 import specFile from '~/../../spec/cli_v1_config.yaml' assert { type: 'yml' }
 import { Parameter } from '~/lib/refGenerator/refTypes'
 import ReactMarkdown from 'react-markdown'
+import GuidesTableOfContents from '~/components/GuidesTableOfContents'
+import { Heading } from '~/components/CustomHTMLElements'
 
 // Parameters are grouped on the page by tag
-const TAGS = ['general', 'auth', 'api', 'database', 'dashboard', 'local']
+const TAGS = ['general', 'auth', 'api', 'database', 'dashboard', 'local', 'edge-functions']
+
+const tocList = TAGS.map((tag) =>
+  specFile.parameters
+    .filter((param: Parameter) => param.tags[0] === tag)
+    .map((parameter) => {
+      console.log('the param', parameter)
+      const text = parameter.id
+      const link = `#${parameter.id}`
+      const level = '2'
+      return { text, link, level }
+    })
+).flat()
 
 export default function Config() {
   return (
-    <div>
-      <div className="flex my-16">
+    <div className="grid grid-cols-12 relative gap-4">
+      <div className="relative col-span-12 md:col-span-9 transition-all ease-out duration-100">
         <div className="w-full prose">
-          <h1 className="text-4xl mb-16">{specFile.info.title}</h1>
+          <h1 className="">CLI configuration</h1>
+          <div className="max-w-xs w-32 h-[1px] bg-gradient-to-r from-brand-800 to-brand-900 my-8"></div>
           <ReactMarkdown>{specFile.info.description}</ReactMarkdown>
           <div>
             {TAGS.map((tag) =>
@@ -22,11 +37,11 @@ export default function Config() {
                     {index === 0 && <h2 className="text-xl capitalize">{tag}</h2>}
                     <div className="mt-8">
                       <div>
-                        <h2 className="text-xl font-medium text-scale-1200 font-mono">
+                        <Heading tag="h2" parseAnchors={false} customAnchor={parameter.id}>
                           <span className="mr-2">$</span>
                           {parameter.title}
-                        </h2>
-                        <div className="grid" id={parameter.id}>
+                        </Heading>
+                        <div className="grid">
                           <div className="border-b pb-8" key={parameter.id}>
                             <div className=" mb-16">
                               <p className="mb-4 scroll-mt-16 mt-0 text-scale-1100 text-base">
@@ -63,6 +78,14 @@ export default function Config() {
           </div>
         </div>
       </div>
+      <div className="md:col-span-3">
+        <div className="sticky top-20 border-l">
+          <span className="block font-mono text-xs uppercase text-scale-1200 pl-5 mb-4">
+            On this page
+          </span>
+          <GuidesTableOfContents list={tocList} />
+        </div>
+      </div>
     </div>
   )
 }
diff --git a/apps/docs/pages/reference/python/[...slug].tsx b/apps/docs/pages/reference/python/[...slug].tsx
new file mode 100644
index 00000000000..a93ce7bcf52
--- /dev/null
+++ b/apps/docs/pages/reference/python/[...slug].tsx
@@ -0,0 +1,30 @@
+import clientLibsCommonSections from '~/../../spec/common-client-libs-sections.json'
+import typeSpec from '~/../../spec/enrichments/tsdoc_v2/combined.json'
+// @ts-expect-error
+import spec from '~/../../spec/supabase_py_v2.yml' assert { type: 'yml' }
+import RefSectionHandler from '~/components/reference/RefSectionHandler'
+import { flattenSections } from '~/lib/helpers'
+import handleRefGetStaticPaths from '~/lib/mdx/handleRefStaticPaths'
+import handleRefStaticProps from '~/lib/mdx/handleRefStaticProps'
+
+const sections = flattenSections(clientLibsCommonSections)
+
+export default function PyReference(props) {
+  return (
+    <RefSectionHandler
+      sections={sections}
+      spec={spec}
+      typeSpec={typeSpec}
+      pageProps={props}
+      type="client-lib"
+    />
+  )
+}
+
+export async function getStaticProps() {
+  return handleRefStaticProps(sections, '/python')
+}
+
+export function getStaticPaths() {
+  return handleRefGetStaticPaths()
+}
diff --git a/apps/docs/pages/reference/python/crawlers/[...slug].tsx b/apps/docs/pages/reference/python/crawlers/[...slug].tsx
new file mode 100644
index 00000000000..593da6371f7
--- /dev/null
+++ b/apps/docs/pages/reference/python/crawlers/[...slug].tsx
@@ -0,0 +1,44 @@
+import clientLibsCommonSections from '~/../../spec/common-client-libs-sections.json'
+import typeSpec from '~/../../spec/enrichments/tsdoc_v2/combined.json'
+// @ts-expect-error
+import spec from '~/../../spec/supabase_py_v2.yml' assert { type: 'yml' }
+import RefSectionHandler from '~/components/reference/RefSectionHandler'
+import { flattenSections } from '~/lib/helpers'
+import handleRefGetStaticPaths from '~/lib/mdx/handleRefStaticPaths'
+import handleRefStaticProps from '~/lib/mdx/handleRefStaticProps'
+import { useRouter } from 'next/router'
+import RefSEO from '~/components/reference/RefSEO'
+
+const sections = flattenSections(clientLibsCommonSections)
+
+export default function PyReference(props) {
+  const router = useRouter()
+  const slug = router.query.slug[0]
+  const filteredSection = sections.filter((section) => section.id === slug)
+
+  const pageTitle = filteredSection[0]?.title
+    ? `${filteredSection[0]?.title} | Supabase`
+    : 'Supabase'
+
+  return (
+    <>
+      <RefSEO title={pageTitle} />
+
+      <RefSectionHandler
+        sections={filteredSection}
+        spec={spec}
+        typeSpec={typeSpec}
+        pageProps={props}
+        type="client-lib"
+      />
+    </>
+  )
+}
+
+export async function getStaticProps() {
+  return handleRefStaticProps(sections, '/python')
+}
+
+export function getStaticPaths() {
+  return handleRefGetStaticPaths()
+}
diff --git a/apps/docs/pages/tutorials/nextjs.mdx b/apps/docs/pages/tutorials/nextjs.mdx
deleted file mode 100644
index 5e22b391296..00000000000
--- a/apps/docs/pages/tutorials/nextjs.mdx
+++ /dev/null
@@ -1,724 +0,0 @@
-import Layout from '~/layouts/tutorials/TutorialLayout'
-
-export const meta = {
-  title: 'Creating a user management dashboard with NextJS and Supabase',
-  author: 'Rich Haines',
-  video: 'https://www.youtube-nocookie.com/embed/0Fs96oZ4se0',
-}
-
-In this 25-minute guide, we’ll be building a collaborative user managment app using NextJS and Supabase.
-As users add and move rectangles in a canvas, changes will be automatically synced and persisted, allowing for a canvas that updates in real-time across clients.
-Users will also be able to see other users selections, and undo and redo actions.
-
-![Supabase User Management example](/docs/img/user-management-demo.png)
-
-### GitHub
-
-Should you get stuck while working through the guide, refer to [this repo](https://github.com/supabase/supabase/tree/master/examples/user-management/nextjs-ts-user-management).
-
-## Building the App
-
-Let's start building the Next.js app from scratch.
-
-### Initialize a Next.js app
-
-We can use [`create-next-app`](https://nextjs.org/docs/getting-started) to initialize
-an app called `supabase-nextjs`:
-
-<Tabs
-  scrollable
-  size="small"
-  type="underlined"
-  defaultActiveId="js"
->
-<Tabs.Panel id="js" label="JavaScript">
-
-```bash
-npx create-next-app@latest --use-npm supabase-nextjs
-cd supabase-nextjs
-```
-
-</Tabs.Panel>
-<Tabs.Panel id="ts" label="TypeScript">
-
-```bash
-npx create-next-app@latest --ts --use-npm supabase-nextjs
-cd supabase-nextjs
-```
-
-</Tabs.Panel>
-</Tabs>
-
-Then install the Supabase client library: [supabase-js](https://github.com/supabase/supabase-js)
-
-```bash
-npm install @supabase/supabase-js
-```
-
-And finally we want to save the environment variables in a `.env.local`.
-All we need are the API URL and the `anon` key that you copied [earlier](#get-the-api-keys).
-
-```bash title=.env.local
-NEXT_PUBLIC_SUPABASE_URL=YOUR_SUPABASE_URL
-NEXT_PUBLIC_SUPABASE_ANON_KEY=YOUR_SUPABASE_ANON_KEY
-```
-
-And one optional step is to update the CSS file `styles/globals.css` to make the app look nice.
-You can find the full contents of this file [here](https://raw.githubusercontent.com/supabase/supabase/master/examples/user-management/nextjs-ts-user-management/styles/globals.css).
-
-### Set up a Login component
-
-#### Supabase Auth Helpers
-
-Next.js is a highly versatile framework offering pre-rendering at build time (SSG), server-side rendering at request time (SSR), API routes, and middleware edge-functions.
-
-It can be challenging to authenticate your users in all these different environments, that's why we've created the [Supabase Auth Helpers](https://supabase.com/docs/guides/auth/auth-helpers/nextjs) to make user management and data fetching within Next.js as easy as possible.
-
-Install the auth helpers for React and Next.js
-
-```bash
-npm install @supabase/auth-helpers-react @supabase/auth-helpers-nextjs
-```
-
-<Tabs
-  scrollable
-  size="small"
-  type="underlined"
-  defaultActiveId="js"
->
-<Tabs.Panel id="js" label="JavaScript">
-
-Wrap your `pages/_app.js` component with the `SessionContextProvider` component:
-
-```jsx title=pages/_app.js
-import '../styles/globals.css'
-import { createBrowserSupabaseClient } from '@supabase/auth-helpers-nextjs'
-import { SessionContextProvider } from '@supabase/auth-helpers-react'
-
-function MyApp({ Component, pageProps }) {
-  const [supabaseClient] = useState(() => createBrowserSupabaseClient())
-
-  return (
-    <SessionContextProvider
-      supabaseClient={supabaseClient}
-      initialSession={pageProps.initialSession}
-    >
-      <Component {...pageProps} />
-    </SessionContextProvider>
-  )
-}
-export default MyApp
-```
-
-</Tabs.Panel>
-<Tabs.Panel id="ts" label="TypeScript">
-
-Wrap your `pages/_app.tsx` component with the `SessionContextProvider` component:
-
-```jsx lines=2,8 title=pages/_app.tsx
-import { createBrowserSupabaseClient } from '@supabase/auth-helpers-nextjs'
-import { SessionContextProvider, Session } from '@supabase/auth-helpers-react'
-
-function MyApp({
-  Component,
-  pageProps,
-}: AppProps<{
-  initialSession: Session,
-}>) {
-  const [supabaseClient] = useState(() => createBrowserSupabaseClient())
-
-  return (
-    <SessionContextProvider
-      supabaseClient={supabaseClient}
-      initialSession={pageProps.initialSession}
-    >
-      <Component {...pageProps} />
-    </SessionContextProvider>
-  )
-}
-export default MyApp
-```
-
-See the [Auth Helpers docs](/docs/guides/auth/auth-helpers/nextjs#usage-with-typescript) for more details on usage with TypeScript.
-
-</Tabs.Panel>
-</Tabs>
-
-#### Supabase Auth UI
-
-We can use the [Supabase Auth UI](https://supabase.com/docs/guides/auth/auth-helpers/auth-ui) a pre-built React component for authenticating users via OAuth, email, and magic links.
-
-Install the Supabase Auth UI for React
-
-```bash
-npm install @supabase/auth-ui-react
-```
-
-Add the `Auth` component to your home page
-
-```jsx title=pages/index.js
-import { Auth, ThemeSupa } from '@supabase/auth-ui-react'
-import { useSession, useSupabaseClient } from '@supabase/auth-helpers-react'
-
-const Home = () => {
-  const session = useSession()
-  const supabase = useSupabaseClient()
-
-  return (
-    <div className="container" style={{ padding: '50px 0 100px 0' }}>
-      {!session ? (
-        <Auth supabaseClient={supabase} appearance={{ theme: ThemeSupa }} theme="dark" />
-      ) : (
-        <p>Account page will go here.</p>
-      )}
-    </div>
-  )
-}
-
-export default Home
-```
-
-### Account page
-
-After a user is signed in we can allow them to edit their profile details and manage their account.
-
-<Tabs
-  scrollable
-  size="small"
-  type="underlined"
-  defaultActiveId="js"
->
-<Tabs.Panel id="js" label="JavaScript">
-
-Let's create a new component for that called `Account.js` within a `components` folder.
-
-```tsx title=components/Account.js
-import { useState, useEffect } from 'react'
-import { useUser, useSupabaseClient } from '@supabase/auth-helpers-react'
-
-export default function Account({ session }) {
-  const supabase = useSupabaseClient()
-  const user = useUser()
-  const [loading, setLoading] = useState(true)
-  const [username, setUsername] = useState(null)
-  const [website, setWebsite] = useState(null)
-  const [avatar_url, setAvatarUrl] = useState(null)
-
-  useEffect(() => {
-    getProfile()
-  }, [session])
-
-  async function getProfile() {
-    try {
-      setLoading(true)
-
-      let { data, error, status } = await supabase
-        .from('profiles')
-        .select(`username, website, avatar_url`)
-        .eq('id', user.id)
-        .single()
-
-      if (error && status !== 406) {
-        throw error
-      }
-
-      if (data) {
-        setUsername(data.username)
-        setWebsite(data.website)
-        setAvatarUrl(data.avatar_url)
-      }
-    } catch (error) {
-      alert('Error loading user data!')
-      console.log(error)
-    } finally {
-      setLoading(false)
-    }
-  }
-
-  async function updateProfile({ username, website, avatar_url }) {
-    try {
-      setLoading(true)
-
-      const updates = {
-        id: user.id,
-        username,
-        website,
-        avatar_url,
-        updated_at: new Date().toISOString(),
-      }
-
-      let { error } = await supabase.from('profiles').upsert(updates)
-      if (error) throw error
-      alert('Profile updated!')
-    } catch (error) {
-      alert('Error updating the data!')
-      console.log(error)
-    } finally {
-      setLoading(false)
-    }
-  }
-
-  return (
-    <div className="form-widget">
-      <div>
-        <label htmlFor="email">Email</label>
-        <input id="email" type="text" value={session.user.email} disabled />
-      </div>
-      <div>
-        <label htmlFor="username">Username</label>
-        <input
-          id="username"
-          type="text"
-          value={username || ''}
-          onChange={(e) => setUsername(e.target.value)}
-        />
-      </div>
-      <div>
-        <label htmlFor="website">Website</label>
-        <input
-          id="website"
-          type="website"
-          value={website || ''}
-          onChange={(e) => setWebsite(e.target.value)}
-        />
-      </div>
-
-      <div>
-        <button
-          className="button primary block"
-          onClick={() => updateProfile({ username, website, avatar_url })}
-          disabled={loading}
-        >
-          {loading ? 'Loading ...' : 'Update'}
-        </button>
-      </div>
-
-      <div>
-        <button className="button block" onClick={() => supabase.auth.signOut()}>
-          Sign Out
-        </button>
-      </div>
-    </div>
-  )
-}
-```
-
-</Tabs.Panel>
-<Tabs.Panel id="ts" label="TypeScript">
-
-Let's create a new component for that called `Account.tsx` within a `components` folder.
-
-```tsx title=components/Account.tsx
-import { useState, useEffect } from 'react'
-import { useUser, useSupabaseClient, Session } from '@supabase/auth-helpers-react'
-import { Database } from '../utils/database.types'
-type Profiles = Database['public']['Tables']['profiles']['Row']
-
-export default function Account({ session }: { session: Session }) {
-  const supabase = useSupabaseClient<Database>()
-  const user = useUser()
-  const [loading, setLoading] = useState(true)
-  const [username, setUsername] = useState<Profiles['username']>(null)
-  const [website, setWebsite] = useState<Profiles['website']>(null)
-  const [avatar_url, setAvatarUrl] = useState<Profiles['avatar_url']>(null)
-
-  useEffect(() => {
-    getProfile()
-  }, [session])
-
-  async function getProfile() {
-    try {
-      setLoading(true)
-      if (!user) throw new Error('No user')
-
-      let { data, error, status } = await supabase
-        .from('profiles')
-        .select(`username, website, avatar_url`)
-        .eq('id', user.id)
-        .single()
-
-      if (error && status !== 406) {
-        throw error
-      }
-
-      if (data) {
-        setUsername(data.username)
-        setWebsite(data.website)
-        setAvatarUrl(data.avatar_url)
-      }
-    } catch (error) {
-      alert('Error loading user data!')
-      console.log(error)
-    } finally {
-      setLoading(false)
-    }
-  }
-
-  async function updateProfile({
-    username,
-    website,
-    avatar_url,
-  }: {
-    username: Profiles['username']
-    website: Profiles['website']
-    avatar_url: Profiles['avatar_url']
-  }) {
-    try {
-      setLoading(true)
-      if (!user) throw new Error('No user')
-
-      const updates = {
-        id: user.id,
-        username,
-        website,
-        avatar_url,
-        updated_at: new Date().toISOString(),
-      }
-
-      let { error } = await supabase.from('profiles').upsert(updates)
-      if (error) throw error
-      alert('Profile updated!')
-    } catch (error) {
-      alert('Error updating the data!')
-      console.log(error)
-    } finally {
-      setLoading(false)
-    }
-  }
-
-  return (
-    <div className="form-widget">
-      <div>
-        <label htmlFor="email">Email</label>
-        <input id="email" type="text" value={session.user.email} disabled />
-      </div>
-      <div>
-        <label htmlFor="username">Username</label>
-        <input
-          id="username"
-          type="text"
-          value={username || ''}
-          onChange={(e) => setUsername(e.target.value)}
-        />
-      </div>
-      <div>
-        <label htmlFor="website">Website</label>
-        <input
-          id="website"
-          type="website"
-          value={website || ''}
-          onChange={(e) => setWebsite(e.target.value)}
-        />
-      </div>
-
-      <div>
-        <button
-          className="button primary block"
-          onClick={() => updateProfile({ username, website, avatar_url })}
-          disabled={loading}
-        >
-          {loading ? 'Loading ...' : 'Update'}
-        </button>
-      </div>
-
-      <div>
-        <button className="button block" onClick={() => supabase.auth.signOut()}>
-          Sign Out
-        </button>
-      </div>
-    </div>
-  )
-}
-```
-
-</Tabs.Panel>
-</Tabs>
-
-### Launch!
-
-Now that we have all the components in place, let's update `pages/index.js`:
-
-```jsx lines=3,14 title=pages/index.js
-import { Auth, ThemeSupa } from '@supabase/auth-ui-react'
-import { useSession, useSupabaseClient } from '@supabase/auth-helpers-react'
-import Account from '../components/Account'
-
-const Home = () => {
-  const session = useSession()
-  const supabase = useSupabaseClient()
-
-  return (
-    <div className="container" style={{ padding: '50px 0 100px 0' }}>
-      {!session ? (
-        <Auth supabaseClient={supabase} appearance={{ theme: ThemeSupa }} theme="dark" />
-      ) : (
-        <Account session={session} />
-      )}
-    </div>
-  )
-}
-
-export default Home
-```
-
-Once that's done, run this in a terminal window:
-
-```bash
-npm run dev
-```
-
-And then open the browser to [localhost:3000](http://localhost:3000) and you should see the completed app.
-
-## Bonus: Profile photos
-
-Every Supabase project is configured with [Storage](/docs/guides/storage) for managing large files like
-photos and videos.
-
-### Create an upload widget
-
-Let's create an avatar widget for the user so that they can upload a profile photo. We can start by creating a new component:
-
-<Tabs
-  scrollable
-  size="small"
-  type="underlined"
-  defaultActiveId="js"
->
-<Tabs.Panel id="js" label="JavaScript">
-
-```jsx title=components/Avatar.js
-import React, { useEffect, useState } from 'react'
-import { useSupabaseClient } from '@supabase/auth-helpers-react'
-
-export default function Avatar({ uid, url, size, onUpload }) {
-  const supabase = useSupabaseClient()
-  const [avatarUrl, setAvatarUrl] = useState(null)
-  const [uploading, setUploading] = useState(false)
-
-  useEffect(() => {
-    if (url) downloadImage(url)
-  }, [url])
-
-  async function downloadImage(path) {
-    try {
-      const { data, error } = await supabase.storage.from('avatars').download(path)
-      if (error) {
-        throw error
-      }
-      const url = URL.createObjectURL(data)
-      setAvatarUrl(url)
-    } catch (error) {
-      console.log('Error downloading image: ', error)
-    }
-  }
-
-  const uploadAvatar = async (event) => {
-    try {
-      setUploading(true)
-
-      if (!event.target.files || event.target.files.length === 0) {
-        throw new Error('You must select an image to upload.')
-      }
-
-      const file = event.target.files[0]
-      const fileExt = file.name.split('.').pop()
-      const fileName = `${uid}.${fileExt}`
-      const filePath = `${fileName}`
-
-      let { error: uploadError } = await supabase.storage
-        .from('avatars')
-        .upload(filePath, file, { upsert: true })
-
-      if (uploadError) {
-        throw uploadError
-      }
-
-      onUpload(filePath)
-    } catch (error) {
-      alert('Error uploading avatar!')
-      console.log(error)
-    } finally {
-      setUploading(false)
-    }
-  }
-
-  return (
-    <div>
-      {avatarUrl ? (
-        <img
-          src={avatarUrl}
-          alt="Avatar"
-          className="avatar image"
-          style={{ height: size, width: size }}
-        />
-      ) : (
-        <div className="avatar no-image" style={{ height: size, width: size }} />
-      )}
-      <div style={{ width: size }}>
-        <label className="button primary block" htmlFor="single">
-          {uploading ? 'Uploading ...' : 'Upload'}
-        </label>
-        <input
-          style={{
-            visibility: 'hidden',
-            position: 'absolute',
-          }}
-          type="file"
-          id="single"
-          accept="image/*"
-          onChange={uploadAvatar}
-          disabled={uploading}
-        />
-      </div>
-    </div>
-  )
-}
-```
-
-</Tabs.Panel>
-<Tabs.Panel id="ts" label="TypeScript">
-
-```tsx title=components/Avatar.tsx
-import React, { useEffect, useState } from 'react'
-import { useSupabaseClient } from '@supabase/auth-helpers-react'
-import { Database } from '../utils/database.types'
-type Profiles = Database['public']['Tables']['profiles']['Row']
-
-export default function Avatar({
-  uid,
-  url,
-  size,
-  onUpload,
-}: {
-  uid: string
-  url: Profiles['avatar_url']
-  size: number
-  onUpload: (url: string) => void
-}) {
-  const supabase = useSupabaseClient<Database>()
-  const [avatarUrl, setAvatarUrl] = useState<Profiles['avatar_url']>(null)
-  const [uploading, setUploading] = useState(false)
-
-  useEffect(() => {
-    if (url) downloadImage(url)
-  }, [url])
-
-  async function downloadImage(path: string) {
-    try {
-      const { data, error } = await supabase.storage.from('avatars').download(path)
-      if (error) {
-        throw error
-      }
-      const url = URL.createObjectURL(data)
-      setAvatarUrl(url)
-    } catch (error) {
-      console.log('Error downloading image: ', error)
-    }
-  }
-
-  const uploadAvatar: React.ChangeEventHandler<HTMLInputElement> = async (event) => {
-    try {
-      setUploading(true)
-
-      if (!event.target.files || event.target.files.length === 0) {
-        throw new Error('You must select an image to upload.')
-      }
-
-      const file = event.target.files[0]
-      const fileExt = file.name.split('.').pop()
-      const fileName = `${uid}.${fileExt}`
-      const filePath = `${fileName}`
-
-      let { error: uploadError } = await supabase.storage
-        .from('avatars')
-        .upload(filePath, file, { upsert: true })
-
-      if (uploadError) {
-        throw uploadError
-      }
-
-      onUpload(filePath)
-    } catch (error) {
-      alert('Error uploading avatar!')
-      console.log(error)
-    } finally {
-      setUploading(false)
-    }
-  }
-
-  return (
-    <div>
-      {avatarUrl ? (
-        <img
-          src={avatarUrl}
-          alt="Avatar"
-          className="avatar image"
-          style={{ height: size, width: size }}
-        />
-      ) : (
-        <div className="avatar no-image" style={{ height: size, width: size }} />
-      )}
-      <div style={{ width: size }}>
-        <label className="button primary block" htmlFor="single">
-          {uploading ? 'Uploading ...' : 'Upload'}
-        </label>
-        <input
-          style={{
-            visibility: 'hidden',
-            position: 'absolute',
-          }}
-          type="file"
-          id="single"
-          accept="image/*"
-          onChange={uploadAvatar}
-          disabled={uploading}
-        />
-      </div>
-    </div>
-  )
-}
-```
-
-</Tabs.Panel>
-</Tabs>
-
-### Add the new widget
-
-And then we can add the widget to the Account page:
-
-```jsx title=components/Account.js
-// Import the new component
-import Avatar from './Avatar'
-
-// ...
-
-return (
-  <div className="form-widget">
-    {/* Add to the body */}
-    <Avatar
-      uid={user.id}
-      url={avatar_url}
-      size={150}
-      onUpload={(url) => {
-        setAvatarUrl(url)
-        updateProfile({ username, website, avatar_url: url })
-      }}
-    />
-    {/* ... */}
-  </div>
-)
-```
-
-## Next steps
-
-At this stage you have a fully functional application!
-
-- See the complete [example on GitHub](https://github.com/supabase/supabase/tree/master/examples/user-management/nextjs-ts-user-management) and deploy it to Vercel.
-- Explore the [pre-built Auth UI for React](https://supabase.com/docs/guides/auth/auth-helpers/auth-ui).
-- Explore the [Auth Helpers for Next.js](https://supabase.com/docs/guides/auth/auth-helpers/nextjs).
-- Explore the [Supabase Cache Helpers](https://github.com/psteinroe/supabase-cache-helpers).
-- See the [Next.js Subscription Payments Starter](https://github.com/vercel/nextjs-subscription-payments) template on GitHub.
-- Got a question? [Ask here](https://github.com/supabase/supabase/discussions).
-- Sign in: [app.supabase.com](https://app.supabase.com)
-
-export default ({ children }) => <Layout meta={meta} children={children} />
diff --git a/apps/docs/public/humans.txt b/apps/docs/public/humans.txt
index 2231880862b..e3e3d2da62d 100644
--- a/apps/docs/public/humans.txt
+++ b/apps/docs/public/humans.txt
@@ -15,11 +15,11 @@ Chase Granberry
 Chris Copplestone
 Danny Ng
 Dave Wilson
-David Thyresson
 Div Arora
 Egor Romanov
 Fabrizio Fenoglio
 Francisco Mazzoni
+Haydn Maley
 Hieu Pham
 Inian P
 Isaiah Hamilton
@@ -30,6 +30,7 @@ Jonny Summers-Muir
 Joshen Lim
 Kang Ming Tay
 Karlo Ison
+Kevin Brolly
 Kevin Grüneberg
 Lakshmipathi G
 Laura C
@@ -47,7 +48,7 @@ Paul Copplestone
 Pavel Borisov
 Qiao Han
 Ramiro Nuñez Dosio
-Rodrigo Mansueli Nunes
+Rodrigo Martins Mansueli
 Rory Wilding
 Stanislav M
 Steve Chavez
diff --git a/apps/docs/public/img/guides/integrations/illa/supabase-illa-UI.png b/apps/docs/public/img/guides/integrations/illa/supabase-illa-UI.png
new file mode 100644
index 00000000000..e90b8ae8ee3
Binary files /dev/null and b/apps/docs/public/img/guides/integrations/illa/supabase-illa-UI.png differ
diff --git a/apps/docs/public/img/guides/integrations/illa/supabase-illa-connect-2.png b/apps/docs/public/img/guides/integrations/illa/supabase-illa-connect-2.png
new file mode 100644
index 00000000000..61c3219b625
Binary files /dev/null and b/apps/docs/public/img/guides/integrations/illa/supabase-illa-connect-2.png differ
diff --git a/apps/docs/public/img/guides/integrations/illa/supabase-illa-connect.png b/apps/docs/public/img/guides/integrations/illa/supabase-illa-connect.png
new file mode 100644
index 00000000000..b1787ee8473
Binary files /dev/null and b/apps/docs/public/img/guides/integrations/illa/supabase-illa-connect.png differ
diff --git a/apps/docs/public/img/guides/integrations/illa/supabase-illa-create-project.png b/apps/docs/public/img/guides/integrations/illa/supabase-illa-create-project.png
new file mode 100644
index 00000000000..d04b4c5f5a7
Binary files /dev/null and b/apps/docs/public/img/guides/integrations/illa/supabase-illa-create-project.png differ
diff --git a/apps/docs/public/img/guides/integrations/illa/supabase-illa-project.png b/apps/docs/public/img/guides/integrations/illa/supabase-illa-project.png
new file mode 100644
index 00000000000..ffbd1876873
Binary files /dev/null and b/apps/docs/public/img/guides/integrations/illa/supabase-illa-project.png differ
diff --git a/apps/docs/public/img/guides/integrations/illa/supabase-illa-select.png b/apps/docs/public/img/guides/integrations/illa/supabase-illa-select.png
new file mode 100644
index 00000000000..f6160065d70
Binary files /dev/null and b/apps/docs/public/img/guides/integrations/illa/supabase-illa-select.png differ
diff --git a/apps/docs/public/img/guides/integrations/illa/supabase-illa-show-data.png b/apps/docs/public/img/guides/integrations/illa/supabase-illa-show-data.png
new file mode 100644
index 00000000000..87db66800a9
Binary files /dev/null and b/apps/docs/public/img/guides/integrations/illa/supabase-illa-show-data.png differ
diff --git a/apps/docs/public/img/guides/integrations/illa/supabase-information.png b/apps/docs/public/img/guides/integrations/illa/supabase-information.png
new file mode 100644
index 00000000000..8becd5e3ab9
Binary files /dev/null and b/apps/docs/public/img/guides/integrations/illa/supabase-information.png differ
diff --git a/apps/docs/public/img/guides/integrations/illa/supabase-table-1.png b/apps/docs/public/img/guides/integrations/illa/supabase-table-1.png
new file mode 100644
index 00000000000..1452c0a3289
Binary files /dev/null and b/apps/docs/public/img/guides/integrations/illa/supabase-table-1.png differ
diff --git a/apps/docs/public/img/guides/integrations/illa/supabase-table-2.png b/apps/docs/public/img/guides/integrations/illa/supabase-table-2.png
new file mode 100644
index 00000000000..94d8711c6d5
Binary files /dev/null and b/apps/docs/public/img/guides/integrations/illa/supabase-table-2.png differ
diff --git a/apps/docs/public/img/icons/menu/reference-dart-light.svg b/apps/docs/public/img/icons/menu/reference-dart-light.svg
index 245516d78f7..178f51a5b88 100644
--- a/apps/docs/public/img/icons/menu/reference-dart-light.svg
+++ b/apps/docs/public/img/icons/menu/reference-dart-light.svg
@@ -1,9 +1,9 @@
-<svg width="15" height="18" viewBox="0 0 15 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.0347 0.420898L8.66508 0.426816L0.00683594 9.08506L2.67814 11.7597L5.02598 9.42498L14.0347 0.420898ZM8.81915 8.40844C8.74295 8.40492 8.6644 8.40129 8.61512 8.46638L3.99811 13.0827L6.6501 15.7185L6.64716 15.7214L8.54505 17.6209C8.55749 17.6319 8.56986 17.6443 8.58246 17.6569C8.6344 17.7088 8.69013 17.7645 8.77056 17.7465C9.6472 17.7445 10.5238 17.7448 11.4006 17.7452C12.2775 17.7455 13.1545 17.7458 14.0316 17.7439L9.36417 13.0721L14.0301 8.40918L8.91032 8.40787C8.88183 8.41133 8.85069 8.40989 8.81915 8.40844Z" fill="url(#paint0_linear_657_71721)"/>
+<svg width="81" height="80" viewBox="0 0 81 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.8209 10.9141L44.7971 10.9339L15.7344 39.9967L24.701 48.9743L32.5819 41.1376L62.8209 10.9141ZM45.3142 37.7255C45.0585 37.7136 44.7948 37.7015 44.6294 37.92L29.1317 53.4154L38.0337 62.2629L38.0234 62.273L44.394 68.649C44.4358 68.6861 44.4773 68.7276 44.5196 68.7698C44.6939 68.944 44.881 69.1309 45.151 69.0705C48.0938 69.0639 51.0367 69.065 53.9798 69.0661C56.9231 69.0672 59.8666 69.0683 62.8106 69.0617L47.1433 53.3803L62.8055 37.728L45.6203 37.7235C45.5247 37.7352 45.4201 37.7303 45.3142 37.7255Z" fill="url(#paint0_linear_1785_15060)"/>
 <defs>
-<linearGradient id="paint0_linear_657_71721" x1="5.29108" y1="13.0823" x2="16.7808" y2="13.0823" gradientUnits="userSpaceOnUse">
-<stop stop-color="#429B72"/>
-<stop offset="1" stop-color="#D8FFEC" stop-opacity="0.6"/>
+<linearGradient id="paint0_linear_1785_15060" x1="15.7344" y1="69.0821" x2="72.627" y2="23.028" gradientUnits="userSpaceOnUse">
+<stop stop-color="#171717" stop-opacity="0.5"/>
+<stop offset="1"/>
 </linearGradient>
 </defs>
 </svg>
diff --git a/apps/docs/public/img/icons/menu/reference-dart.svg b/apps/docs/public/img/icons/menu/reference-dart.svg
index b3fea918042..33f9ad24a27 100644
--- a/apps/docs/public/img/icons/menu/reference-dart.svg
+++ b/apps/docs/public/img/icons/menu/reference-dart.svg
@@ -1,9 +1,9 @@
-<svg width="15" height="18" viewBox="0 0 15 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.0347 0.420898L8.66508 0.426816L0.00683594 9.08506L2.67814 11.7597L5.02598 9.42498L14.0347 0.420898ZM8.81915 8.40844C8.74295 8.40492 8.6644 8.40129 8.61512 8.46638L3.99811 13.0827L6.6501 15.7185L6.64716 15.7214L8.54505 17.6209C8.55749 17.6319 8.56986 17.6443 8.58246 17.6569C8.6344 17.7088 8.69013 17.7645 8.77056 17.7465C9.6472 17.7445 10.5238 17.7448 11.4006 17.7452C12.2775 17.7455 13.1545 17.7458 14.0316 17.7439L9.36417 13.0721L14.0301 8.40918L8.91032 8.40787C8.88183 8.41133 8.85069 8.40989 8.81915 8.40844Z" fill="url(#paint0_linear_657_71721)"/>
+<svg width="81" height="80" viewBox="0 0 81 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.8209 10.9141L44.7971 10.9339L15.7344 39.9967L24.701 48.9743L32.5819 41.1376L62.8209 10.9141ZM45.3142 37.7255C45.0585 37.7136 44.7948 37.7015 44.6294 37.92L29.1317 53.4154L38.0337 62.2629L38.0234 62.273L44.394 68.649C44.4358 68.6861 44.4773 68.7276 44.5196 68.7698C44.6939 68.944 44.881 69.1309 45.151 69.0705C48.0938 69.0639 51.0367 69.065 53.9798 69.0661C56.9231 69.0672 59.8666 69.0683 62.8106 69.0617L47.1433 53.3803L62.8055 37.728L45.6203 37.7235C45.5247 37.7352 45.4201 37.7303 45.3142 37.7255Z" fill="url(#paint0_linear_1785_15060)"/>
 <defs>
-<linearGradient id="paint0_linear_657_71721" x1="5.29108" y1="13.0823" x2="16.7808" y2="13.0823" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4FFFA"/>
-<stop offset="1" stop-color="#D8FFEC" stop-opacity="0.6"/>
+<linearGradient id="paint0_linear_1785_15060" x1="15.7344" y1="69.0821" x2="72.627" y2="23.028" gradientUnits="userSpaceOnUse">
+<stop stop-color="#EDEDED" stop-opacity="0.5"/>
+<stop offset="1" stop-color="white"/>
 </linearGradient>
 </defs>
 </svg>
diff --git a/apps/docs/public/img/icons/menu/reference-javascript-light.svg b/apps/docs/public/img/icons/menu/reference-javascript-light.svg
index 1417f5a8038..a11845dff91 100644
--- a/apps/docs/public/img/icons/menu/reference-javascript-light.svg
+++ b/apps/docs/public/img/icons/menu/reference-javascript-light.svg
@@ -1,9 +1,9 @@
-<svg width="54" height="54" viewBox="0 0 54 54" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M0.230469 0.339844H53.7695V53.8789H0.230469V0.339844ZM41.1578 45.2235C38.6763 45.2235 37.2732 43.9292 36.1948 42.1683L32.1063 44.5436C33.5832 47.4619 36.6018 49.6885 41.2742 49.6885C46.0527 49.6885 49.611 47.207 49.611 42.6774C49.611 38.4758 47.1975 36.6071 42.9228 34.774L41.6651 34.2352C39.5065 33.3004 38.5717 32.6894 38.5717 31.1801C38.5717 29.9589 39.5057 29.0241 40.9793 29.0241C42.424 29.0241 43.3545 29.6334 44.2171 31.1801L48.1348 28.6646C46.4777 25.7497 44.178 24.6364 40.9793 24.6364C36.4863 24.6364 33.6113 27.5088 33.6113 31.2821C33.6113 35.3782 36.0231 37.3158 39.6536 38.8625L40.9113 39.4022C43.2058 40.4058 44.5741 41.0168 44.5741 42.742C44.5741 44.1816 43.2424 45.2235 41.1578 45.2235ZM21.6602 45.192C19.9316 45.192 19.2127 44.0065 18.4223 42.6043L14.327 45.0837C15.5134 47.5945 17.8462 49.6791 21.8743 49.6791C26.3325 49.6791 29.3868 47.3081 29.3868 42.0987V24.9237H24.3558V42.0307C24.3558 44.5453 23.3131 45.192 21.6602 45.192Z" fill="url(#paint0_linear_1029_62398)"/>
+<svg width="81" height="80" viewBox="0 0 81 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.7305 13.2305H67.2695V66.7695H13.7305V13.2305ZM54.6588 58.1144C52.1773 58.1144 50.7743 56.8201 49.6959 55.0593L45.6073 57.4345C47.0843 60.3528 50.1029 62.5794 54.7753 62.5794C59.5538 62.5794 63.1121 60.0979 63.1121 55.5683C63.1121 51.3668 60.6986 49.498 56.4239 47.6649L55.1662 47.1261C53.0076 46.1913 52.0728 45.5803 52.0728 44.071C52.0728 42.8498 53.0068 41.915 54.4804 41.915C55.9251 41.915 56.8556 42.5243 57.7182 44.071L61.6359 41.5555C59.9788 38.6406 57.6791 37.5273 54.4804 37.5273C49.9873 37.5273 47.1124 40.3998 47.1124 44.173C47.1124 48.2691 49.5242 50.2068 53.1546 51.7534L54.4124 52.2931C56.7069 53.2967 58.0751 53.9077 58.0751 55.6329C58.0751 57.0725 56.7435 58.1144 54.6588 58.1144ZM35.1613 58.0829C33.4327 58.0829 32.7138 56.8974 31.9234 55.4952L27.8281 57.9746C29.0145 60.4854 31.3473 62.57 35.3754 62.57C39.8336 62.57 42.8879 60.199 42.8879 54.9896V37.8146H37.8569V54.9216C37.8569 57.4362 36.8142 58.0829 35.1613 58.0829Z" fill="url(#paint0_linear_1785_15055)"/>
 <defs>
-<linearGradient id="paint0_linear_1029_62398" x1="-9.88098" y1="0.339844" x2="73.784" y2="0.33984" gradientUnits="userSpaceOnUse">
-<stop stop-color="#429B72"/>
-<stop offset="1" stop-color="#D8FFEC" stop-opacity="0.6"/>
+<linearGradient id="paint0_linear_1785_15055" x1="13.7305" y1="66.7695" x2="67.2695" y2="13.2305" gradientUnits="userSpaceOnUse">
+<stop stop-color="#171717" stop-opacity="0.5"/>
+<stop offset="1"/>
 </linearGradient>
 </defs>
 </svg>
diff --git a/apps/docs/public/img/icons/menu/reference-javascript.svg b/apps/docs/public/img/icons/menu/reference-javascript.svg
index dff8905edb5..f8ce1de0403 100644
--- a/apps/docs/public/img/icons/menu/reference-javascript.svg
+++ b/apps/docs/public/img/icons/menu/reference-javascript.svg
@@ -1,9 +1,9 @@
-<svg width="54" height="54" viewBox="0 0 54 54" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M0.230469 0.339844H53.7695V53.8789H0.230469V0.339844ZM41.1578 45.2235C38.6763 45.2235 37.2732 43.9292 36.1948 42.1683L32.1063 44.5436C33.5832 47.4619 36.6018 49.6885 41.2742 49.6885C46.0527 49.6885 49.611 47.207 49.611 42.6774C49.611 38.4758 47.1975 36.6071 42.9228 34.774L41.6651 34.2352C39.5065 33.3004 38.5717 32.6894 38.5717 31.1801C38.5717 29.9589 39.5057 29.0241 40.9793 29.0241C42.424 29.0241 43.3545 29.6334 44.2171 31.1801L48.1348 28.6646C46.4777 25.7497 44.178 24.6364 40.9793 24.6364C36.4863 24.6364 33.6113 27.5088 33.6113 31.2821C33.6113 35.3782 36.0231 37.3158 39.6536 38.8625L40.9113 39.4022C43.2058 40.4058 44.5741 41.0168 44.5741 42.742C44.5741 44.1816 43.2424 45.2235 41.1578 45.2235ZM21.6602 45.192C19.9316 45.192 19.2127 44.0065 18.4223 42.6043L14.327 45.0837C15.5134 47.5945 17.8462 49.6791 21.8743 49.6791C26.3325 49.6791 29.3868 47.3081 29.3868 42.0987V24.9237H24.3558V42.0307C24.3558 44.5453 23.3131 45.192 21.6602 45.192Z" fill="url(#paint0_linear_1029_62398)"/>
+<svg width="81" height="80" viewBox="0 0 81 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.7305 13.2305H67.2695V66.7695H13.7305V13.2305ZM54.6588 58.1144C52.1773 58.1144 50.7743 56.8201 49.6959 55.0593L45.6073 57.4345C47.0843 60.3528 50.1029 62.5794 54.7753 62.5794C59.5538 62.5794 63.1121 60.0979 63.1121 55.5683C63.1121 51.3668 60.6986 49.498 56.4239 47.6649L55.1662 47.1261C53.0076 46.1913 52.0728 45.5803 52.0728 44.071C52.0728 42.8498 53.0068 41.915 54.4804 41.915C55.9251 41.915 56.8556 42.5243 57.7182 44.071L61.6359 41.5555C59.9788 38.6406 57.6791 37.5273 54.4804 37.5273C49.9873 37.5273 47.1124 40.3998 47.1124 44.173C47.1124 48.2691 49.5242 50.2068 53.1546 51.7534L54.4124 52.2931C56.7069 53.2967 58.0751 53.9077 58.0751 55.6329C58.0751 57.0725 56.7435 58.1144 54.6588 58.1144ZM35.1613 58.0829C33.4327 58.0829 32.7138 56.8974 31.9234 55.4952L27.8281 57.9746C29.0145 60.4854 31.3473 62.57 35.3754 62.57C39.8336 62.57 42.8879 60.199 42.8879 54.9896V37.8146H37.8569V54.9216C37.8569 57.4362 36.8142 58.0829 35.1613 58.0829Z" fill="url(#paint0_linear_1785_15055)"/>
 <defs>
-<linearGradient id="paint0_linear_1029_62398" x1="-9.88098" y1="0.339844" x2="73.784" y2="0.33984" gradientUnits="userSpaceOnUse">
-<stop stop-color="#F4FFFA"/>
-<stop offset="1" stop-color="#D8FFEC" stop-opacity="0.6"/>
+<linearGradient id="paint0_linear_1785_15055" x1="13.7305" y1="66.7695" x2="67.2695" y2="13.2305" gradientUnits="userSpaceOnUse">
+<stop stop-color="#EDEDED" stop-opacity="0.5"/>
+<stop offset="1" stop-color="white"/>
 </linearGradient>
 </defs>
 </svg>
diff --git a/apps/docs/public/img/icons/menu/reference-python-light.svg b/apps/docs/public/img/icons/menu/reference-python-light.svg
new file mode 100644
index 00000000000..1ac57aae572
--- /dev/null
+++ b/apps/docs/public/img/icons/menu/reference-python-light.svg
@@ -0,0 +1,9 @@
+<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M32.7668 10.4216C34.8343 10.0558 37.1841 9.84591 39.6447 9.83448C42.1052 9.82305 44.6707 10.01 47.1433 10.4216C51.0493 11.0726 54.3399 14.0028 54.3399 17.9034V31.6089C54.3399 35.628 51.1452 38.923 47.1433 38.923H32.7668C27.8856 38.923 23.7752 43.1136 23.7752 47.8643V54.4403H18.8264C14.6433 54.4403 12.2 51.4041 11.1768 47.143C9.79667 41.4184 9.85529 37.9973 11.1768 32.5148C12.3225 27.7318 15.9853 25.2175 20.1684 25.2175H25.5701H39.9634V23.389H25.5701V17.9034C25.5701 13.7499 26.676 11.4977 32.7668 10.4216ZM34.5617 16.9976C34.5617 15.4804 33.3476 14.2464 31.8609 14.2464C30.3688 14.2464 29.1601 15.4804 29.1601 16.9976C29.1601 18.5094 30.3688 19.732 31.8609 19.732C33.3476 19.732 34.5617 18.5094 34.5617 16.9976ZM56.1348 31.6092V25.2178H61.5365C65.7249 25.2178 67.6994 28.3508 68.7332 32.5151C70.1719 38.2988 70.2359 42.6346 68.7332 47.1432C67.2784 51.5227 65.7196 54.4405 61.5365 54.4405H54.3399H39.9634V56.269H54.3399V61.7546C54.3399 65.9081 50.7668 68.0195 47.1432 69.0687C41.6919 70.6505 37.3228 70.4083 32.7667 69.0687C28.962 67.9496 25.5701 65.6553 25.5701 61.7546V48.0491C25.5701 44.1054 28.8287 40.735 32.7667 40.735H47.1432C51.9338 40.735 56.1348 36.5644 56.1348 31.6092ZM50.7499 62.6605C50.7499 61.1486 49.5412 59.9261 48.0491 59.9261C46.5624 59.9261 45.3483 61.1486 45.3483 62.6605C45.3483 64.1777 46.5624 65.4116 48.0491 65.4116C49.5412 65.4116 50.7499 64.1777 50.7499 62.6605Z" fill="url(#paint0_linear_1785_15271)"/>
+<defs>
+<linearGradient id="paint0_linear_1785_15271" x1="10.1636" y1="70.1661" x2="70.492" y2="10.4969" gradientUnits="userSpaceOnUse">
+<stop stop-color="#171717" stop-opacity="0.5"/>
+<stop offset="1"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/apps/docs/public/img/icons/menu/reference-python.svg b/apps/docs/public/img/icons/menu/reference-python.svg
new file mode 100644
index 00000000000..4ca064b0b73
--- /dev/null
+++ b/apps/docs/public/img/icons/menu/reference-python.svg
@@ -0,0 +1,9 @@
+<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M32.7668 10.4216C34.8343 10.0558 37.1841 9.84591 39.6447 9.83448C42.1052 9.82305 44.6707 10.01 47.1433 10.4216C51.0493 11.0726 54.3399 14.0028 54.3399 17.9034V31.6089C54.3399 35.628 51.1452 38.923 47.1433 38.923H32.7668C27.8856 38.923 23.7752 43.1136 23.7752 47.8643V54.4403H18.8264C14.6433 54.4403 12.2 51.4041 11.1768 47.143C9.79667 41.4184 9.85529 37.9973 11.1768 32.5148C12.3225 27.7318 15.9853 25.2175 20.1684 25.2175H25.5701H39.9634V23.389H25.5701V17.9034C25.5701 13.7499 26.676 11.4977 32.7668 10.4216ZM34.5617 16.9976C34.5617 15.4804 33.3476 14.2464 31.8609 14.2464C30.3688 14.2464 29.1601 15.4804 29.1601 16.9976C29.1601 18.5094 30.3688 19.732 31.8609 19.732C33.3476 19.732 34.5617 18.5094 34.5617 16.9976ZM56.1348 31.6092V25.2178H61.5365C65.7249 25.2178 67.6994 28.3508 68.7332 32.5151C70.1719 38.2988 70.2359 42.6346 68.7332 47.1432C67.2784 51.5227 65.7196 54.4405 61.5365 54.4405H54.3399H39.9634V56.269H54.3399V61.7546C54.3399 65.9081 50.7668 68.0195 47.1432 69.0687C41.6919 70.6505 37.3228 70.4083 32.7667 69.0687C28.962 67.9496 25.5701 65.6553 25.5701 61.7546V48.0491C25.5701 44.1054 28.8287 40.735 32.7667 40.735H47.1432C51.9338 40.735 56.1348 36.5644 56.1348 31.6092ZM50.7499 62.6605C50.7499 61.1486 49.5412 59.9261 48.0491 59.9261C46.5624 59.9261 45.3483 61.1486 45.3483 62.6605C45.3483 64.1777 46.5624 65.4116 48.0491 65.4116C49.5412 65.4116 50.7499 64.1777 50.7499 62.6605Z" fill="url(#paint0_linear_1785_15271)"/>
+<defs>
+<linearGradient id="paint0_linear_1785_15271" x1="10.1636" y1="70.1661" x2="70.492" y2="10.4969" gradientUnits="userSpaceOnUse">
+<stop stop-color="#EDEDED" stop-opacity="0.5"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/apps/www/_blog/2022-08-16-supabase-js-v2.mdx b/apps/www/_blog/2022-08-16-supabase-js-v2.mdx
index d7986434a97..07cf3fd54dc 100644
--- a/apps/www/_blog/2022-08-16-supabase-js-v2.mdx
+++ b/apps/www/_blog/2022-08-16-supabase-js-v2.mdx
@@ -13,7 +13,7 @@ toc_depth: 3
 <div className="bg-gray-300 rounded-lg p-6 italic">
 <br /> ⚠️ UPDATED 20/10: supabase-js v2 is fully released 🥳<br />
 
-<a href="https://supabase.com/docs/reference/javascript">Check the updated docs</a> and <a href="https://supabase.com/docs/reference/javascript/upgrade-guide">migration guide</a>.
+<a href="https://supabase.com/docs/reference/javascript">Check the updated docs</a> and <a href="https://supabase.com/docs/reference/javascript/v1/upgrade-guide">migration guide</a>.
 
 </div>
 
@@ -309,7 +309,7 @@ Update today by running:
 npm i @supabase/supabase-js@2
 ```
 
-[Migration guide](https://supabase.com/docs/reference/javascript/upgrade-guide)
+[Migration guide](https://supabase.com/docs/reference/javascript/v1/upgrade-guide)
 
 We'll continuing merging security fixes to v1, with maintenance patches for the next three months.
 
@@ -329,6 +329,6 @@ We'll continuing merging security fixes to v1, with maintenance patches for the
 ## supabase-js v2 resources
 
 - [v2 Documentation](https://supabase.com/docs/reference/javascript)
-- [Migration guide](https://supabase.com/docs/reference/javascript/upgrade-guide)
+- [Migration guide](https://supabase.com/docs/reference/javascript/v1/upgrade-guide)
 - [Next.js quickstart guide](/docs/guides/with-nextjs)
 - [Examples](https://github.com/supabase/supabase/tree/master/examples)
diff --git a/apps/www/_blog/2022-10-20-supabase-js-v2-released.mdx b/apps/www/_blog/2022-10-20-supabase-js-v2-released.mdx
index 6e17afd4d14..6c2fca19cd8 100644
--- a/apps/www/_blog/2022-10-20-supabase-js-v2-released.mdx
+++ b/apps/www/_blog/2022-10-20-supabase-js-v2-released.mdx
@@ -2,7 +2,7 @@
 title: 'supabase-js v2 Released'
 description: We've released supabase-js v2. Updated examples, quickstarts, and an improved experience.
 author: thor_schaeff
-image: supabase-js-v2-release/supabase-js.jpg 
+image: supabase-js-v2-release/supabase-js.jpg
 thumb: supabase-js-v2-release/supabase-js.jpg
 tags:
   - launch-week
@@ -10,17 +10,17 @@ date: '2022-10-20'
 toc_depth: 3
 ---
 
-During our [last Launch Week](/launch-week) we presented the [release candidate for supabase-js v2](/blog/supabase-js-v2). Since then we've been busy incorporating your feedback, [updating the docs](/docs/reference/javascript/), [examples](https://github.com/supabase/supabase/tree/master/examples), [quickstart guides](/docs/guides/with-nextjs), and putting a [migration guide](/docs/reference/javascript/upgrade-guide) together.
+During our [last Launch Week](/launch-week) we presented the [release candidate for supabase-js v2](/blog/supabase-js-v2). Since then we've been busy incorporating your feedback, [updating the docs](/docs/reference/javascript/), [examples](https://github.com/supabase/supabase/tree/master/examples), [quickstart guides](/docs/guides/with-nextjs), and putting a [migration guide](/docs/reference/javascript/v1/upgrade-guide) together.
 
 ## What is new in v2?
 
-Enhanced TypeScript support built right in was the big one! Now you can use the CLI to generate types, directly from your database. 
+Enhanced TypeScript support built right in was the big one! Now you can use the CLI to generate types, directly from your database.
 
-Plus v2 comes with lots of improvements that solved some of the largest pain-points highlighted by our users. Your feedback help us improve: you speak, we listen. 
+Plus v2 comes with lots of improvements that solved some of the largest pain-points highlighted by our users. Your feedback help us improve: you speak, we listen.
 
 Read all the updates and the differences with v1 on the [announcement blog post](/blog/supabase-js-v2)
 
-## Acknowledgements  
+## Acknowledgements
 
 It truly takes a village, well, in this case an entire community, and we want to thank you all for your feedback, and contributions!
 
@@ -40,7 +40,7 @@ Special shout outs to: [@vejja](https://github.com/vejja), [@pixtron](https://gi
 ## Links
 
 - [Documentation](/docs/reference/javascript)
-- [Migration Guide](/docs/reference/javascript/upgrade-guide)
+- [Migration Guide](/docs/reference/javascript/v1/upgrade-guide)
 - [Quickstart Guides](/docs/guides/with-nextjs)
 - [Examples (GitHub)](https://github.com/supabase/supabase/tree/master/examples)
 - [Release Notes](/docs/reference/javascript/release-notes)
diff --git a/apps/www/_blog/2022-10-21-supabase-flutter-sdk-v1-released.mdx b/apps/www/_blog/2022-10-21-supabase-flutter-sdk-v1-released.mdx
index e7fdabdc869..92aed5cbb3b 100644
--- a/apps/www/_blog/2022-10-21-supabase-flutter-sdk-v1-released.mdx
+++ b/apps/www/_blog/2022-10-21-supabase-flutter-sdk-v1-released.mdx
@@ -2,7 +2,7 @@
 title: 'supabase-flutter v1 Released'
 description: We've released supabase-flutter v1. More intuitive way of accessing Supabase from your Flutter application.
 author: tyler_shukert
-image:  flutter-v1-release/flutter_v1_official_release.jpeg
+image: flutter-v1-release/flutter_v1_official_release.jpeg
 thumb: flutter-v1-release/flutter_v1_official_release.jpeg
 tags:
   - flutter
@@ -11,7 +11,7 @@ date: '2022-10-21'
 toc_depth: 3
 ---
 
-A few months ago, we announced a [developer preview version of supabase-flutter SDK](https://supabase.com/blog/supabase-flutter-sdk-1-developer-preview). Since then, we have heard a lot of amazing feedback from the community, and have been improving it. Today, we are happy to announce the stable v1 of [supabase-flutter](https://pub.dev/packages/supabase_flutter). You can also find the updated [quick start guide](https://supabase.com/docs/guides/with-flutter), [documentation](https://supabase.com/docs/reference/dart) and a [migration guide from v0](https://supabase.com/docs/reference/dart/upgrade-guide).
+A few months ago, we announced a [developer preview version of supabase-flutter SDK](https://supabase.com/blog/supabase-flutter-sdk-1-developer-preview). Since then, we have heard a lot of amazing feedback from the community, and have been improving it. Today, we are happy to announce the stable v1 of [supabase-flutter](https://pub.dev/packages/supabase_flutter). You can also find the updated [quick start guide](https://supabase.com/docs/guides/with-flutter), [documentation](https://supabase.com/docs/reference/dart) and a [migration guide from v0](https://supabase.com/docs/reference/dart/v0/upgrade-guide).
 
 ## What is new in v1?
 
@@ -97,7 +97,7 @@ It required massive support from the community to bring the supabase-flutter to
 
 - [Install supabase-flutter v1.0](https://pub.dev/packages/supabase_flutter)
 - [supabase-flutter documentation](https://supabase.com/docs/reference/dart/)
-- [v0 to v1 migration guide](https://supabase.com/docs/reference/dart/upgrade-guide)
+- [v0 to v1 migration guide](https://supabase.com/docs/reference/dart/v0/upgrade-guide)
 - [Flutter Tutorial: building a Flutter chat app](https://supabase.com/blog/flutter-tutorial-building-a-chat-app)
 - [Flutter Tutorial - Part 2: Authentication and Authorization with RLS](https://supabase.com/blog/flutter-authentication-and-authorization-with-rls)
 - [Build a Flutter app with Very Good CLI and Supabase](https://verygood.ventures/blog/flutter-app-very-good-cli-supabase)
diff --git a/apps/www/_blog/2022-12-10-postgres-crdt.mdx b/apps/www/_blog/2022-12-10-postgres-crdt.mdx
index 143a356fee7..aade9b86260 100644
--- a/apps/www/_blog/2022-12-10-postgres-crdt.mdx
+++ b/apps/www/_blog/2022-12-10-postgres-crdt.mdx
@@ -6,6 +6,8 @@ image: launch-week-6/crdt/og-pg-crdt.png
 thumb: launch-week-6/crdt/og-pg-crdt.png
 tags:
   - launch-week
+  - postgres
+  - planetpg
 date: '2022-12-10'
 toc_depth: 2
 ---
diff --git a/apps/www/_blog/2022-12-16-pg-graphql-v1.mdx b/apps/www/_blog/2022-12-16-pg-graphql-v1.mdx
index 6104a05411a..25762a45609 100644
--- a/apps/www/_blog/2022-12-16-pg-graphql-v1.mdx
+++ b/apps/www/_blog/2022-12-16-pg-graphql-v1.mdx
@@ -13,7 +13,7 @@ date: '2022-12-16'
 toc_depth: 3
 ---
 
-Today we're announcing the 1.0 release of pg_graphql and its general availability on our platform. pg_graphql is a PostgreSQL extension that allows you to query your database using GraphQL. It is the foundation of GraphQL support in the Supabase stack.
+Today we're announcing the 1.0 release of [`pg_graphql`](https://github.com/supabase/pg_graphql) and its general availability on our platform. pg_graphql is a PostgreSQL extension that allows you to query your database using GraphQL. It is the foundation of GraphQL support in the Supabase stack.
 
 Since our first platform release, v0.2.1, the feature set of pg_graphql has steadily grown and stabilized. Despite being a pre-1.0, we've been extremely cautious with each new feature and have yet to introduce a backwards-incompatible change. With the 1.0 release we're formalizing that guarantee, subject to the SemVer spec.
 
@@ -21,7 +21,7 @@ Since our first platform release, v0.2.1, the feature set of pg_graphql has stea
 
 pg_graphql was created to satisfy an extreme set of constraints. Mainly, [Supabase free tier](https://supabase.com/pricing) projects run on servers with 1 GB of memory. On those servers, we squeeze tuned versions of [PostgreSQL](https://github.com/supabase/postgres), [PostgREST](https://postgrest.org/en/stable/), and [GoTrue](https://github.com/supabase/gotrue). Every megabyte consumed by something that isn't PostgreSQL is another chance for an index to fall out of memory, or a large query to fail.
 
-Our philosophy when adding to the stack is to use existing open source tools wherever possible. We surveyed the available GraphQL → SQL options and found some excellent candidates in [Hasura](https://hasura.io/) and [Graphile](https://www.graphile.org/). Both support the set of features we're interested in, but consume significantly more memory than we could sacrifice on the free tier. Realizing that, we searched for an architecture that could meet our runtime constraints and performance requirements.
+Our philosophy when adding to the stack is to use existing open source tools wherever possible. We surveyed the available GraphQL → SQL options and found some excellent candidates in Hasura and Graphile. Both support the set of features we're interested in, but consume significantly more memory than we could sacrifice on the free tier. Realizing that, we searched for an architecture that could meet our runtime constraints and performance requirements.
 
 ## Architecture
 
diff --git a/apps/www/components/Nav/index.tsx b/apps/www/components/Nav/index.tsx
index 93e7402a1ab..387aefacc5d 100644
--- a/apps/www/components/Nav/index.tsx
+++ b/apps/www/components/Nav/index.tsx
@@ -234,19 +234,6 @@ const Nav = () => {
                       Blog
                     </a>
                   </Link>
-                  <div className="xl:block hidden">
-                    <Link href="/launch-week">
-                      <a
-                        className={`
-                        text-brand-900 hover:text-brand-900 hover:border-brand-1000 dark:text-dark-100 dark:hover:border-dark-100 inline-flex items-center
-                        border-b-2 border-transparent p-5 px-1
-                        text-sm font-medium
-                      `}
-                      >
-                        Launch Week 6
-                      </a>
-                    </Link>
-                  </div>
                 </div>
               </div>
               <div className="flex items-center gap-2">
@@ -376,14 +363,6 @@ const Nav = () => {
                       Blog
                     </a>
                   </Link>
-                  <Link href="/launch-week">
-                    <a
-                      target="_blank"
-                      className="text-scale-900 dark:hover:bg-scale-600 block rounded-md py-2 pl-3 pr-4 text-base font-medium hover:border-gray-300 hover:bg-gray-50 dark:text-white"
-                    >
-                      Launch Week 6
-                    </a>
-                  </Link>
                 </div>
                 <div className="p-3">
                   <p className="text-scale-900 mb-6 text-sm">Products available:</p>
diff --git a/apps/www/data/Community.tsx b/apps/www/data/Community.tsx
index 4a48cca53dd..ea9573cdcc4 100644
--- a/apps/www/data/Community.tsx
+++ b/apps/www/data/Community.tsx
@@ -30,7 +30,7 @@ const data: CommunityItem[] = [
   },
   {
     title: 'GitHub',
-    stat: '42,000+',
+    stat: '44,000+',
     statLabel: 'GitHub stars',
     img: 'github.png',
     invertImgDarkMode: true,
@@ -42,7 +42,7 @@ const data: CommunityItem[] = [
   },
   {
     title: 'Twitter',
-    stat: '50,000+',
+    stat: '54,000+',
     statLabel: 'Followers',
     img: 'twitter.png',
     detail: () => (
@@ -53,7 +53,7 @@ const data: CommunityItem[] = [
   },
   {
     title: 'Discord',
-    stat: '10,000+',
+    stat: '12,000+',
     statLabel: 'SupaTroopers',
     img: 'discord.png',
     detail: () => (
diff --git a/apps/www/data/Footer.json b/apps/www/data/Footer.json
index fdfb80a9acf..1422e016687 100644
--- a/apps/www/data/Footer.json
+++ b/apps/www/data/Footer.json
@@ -27,8 +27,8 @@
         "url": "/pricing"
       },
       {
-        "text": "Beta",
-        "url": "/beta"
+        "text": "Launch Week 6",
+        "url": "/launch-week"
       }
     ]
   },
diff --git a/apps/www/data/Pricing.json b/apps/www/data/Pricing.json
index dd2589b08f3..ad23a24624d 100644
--- a/apps/www/data/Pricing.json
+++ b/apps/www/data/Pricing.json
@@ -22,6 +22,7 @@
       },
       {
         "title": "Database space",
+        "tooltip": "Billing is based on the average database size in GB throughout the billing period.",
         "tiers": {
           "free": "Up to 500 MB",
           "pro": "8 GB included, then $0.125 per GB",
@@ -33,15 +34,16 @@
         "tooltip": "Backups are entire copies of your database that can be restored in the future.",
         "tiers": {
           "free": false,
-          "pro": "7 days of backup* (* if > 1TB, contact enterprise)",
+          "pro": "7 days of backup (if > 1TB, contact enterprise)",
           "enterprise": "Custom"
         }
       },
       {
         "title": "Point in time recovery",
+        "tooltip": "PITR cannot be applied retroactively, projects can only be rolled back to the point from which PITR has been applied.",
         "tiers": {
           "free": false,
-          "pro": false,
+          "pro": "$100 per 7 day rollback period (if > 28 days, contact enterprise)",
           "enterprise": true
         }
       },
@@ -56,7 +58,7 @@
       },
       {
         "title": "Database egress",
-        "tooltip": "Good news, only download operations are counted towards the limit",
+        "tooltip": "Billing is based on the total sum of outgoing traffic of your database in GB throughout your billing period.",
         "tiers": {
           "free": "Up to 2GB",
           "pro": "50GB included per month, then $0.09 per GB",
@@ -80,7 +82,7 @@
       },
       {
         "title": "MAUs",
-        "tooltip": "Monthly Active Users; a user that has made an API request in the last month.",
+        "tooltip": "Distinct users requesting your API throughout the billing period.",
         "tiers": {
           "free": "Up to 50,000 MAUs",
           "pro": "100,000 included, then $0.00325 per MAU",
@@ -127,14 +129,6 @@
           "enterprise": true
         }
       },
-      {
-        "title": "Custom SMTP",
-        "tiers": {
-          "free": true,
-          "pro": true,
-          "enterprise": true
-        }
-      },
       {
         "title": "Supabase Auth emails",
         "tooltip": "Rate limits do not apply to Custom SMTP",
@@ -160,6 +154,7 @@
     "features": [
       {
         "title": "Storage",
+        "tooltip": "The sum of all objects' size in your storage buckets.",
         "tiers": {
           "free": "Up to 1 GB",
           "pro": "100 GB included, then $0.021 per GB",
@@ -168,7 +163,7 @@
       },
       {
         "title": "Storage egress",
-        "tooltip": "Good news, only download operations are counted towards the limit",
+        "tooltip": "Total sum of outgoing traffic (egress) from your storage buckets, only download operations are counted.",
         "tiers": {
           "free": "Up to 2 GB",
           "pro": "200 GB included, then $0.09 per GB",
@@ -194,10 +189,10 @@
       },
       {
         "title": "Asset transformations",
-        "tooltip": "Origin images are only relevant for image transformations. Images in the bucket which are not transformed do not count towards this limit.",
+        "tooltip": "Distinct count of all images that were transformed in the billing period, ignoring any transformations.",
         "tiers": {
           "free": false,
-          "pro": "Unlimited transformations for 100 origin images, then 5$ per 1000 origin images",
+          "pro": "Unlimited transformations for 100 origin images, then $5 per 1000 origin images",
           "enterprise": "Unlimited"
         }
       }
@@ -209,6 +204,7 @@
     "features": [
       {
         "title": "Invocations",
+        "tooltip": "Billing is based on the sum of all invocations, independent of response status, throughout your billing period.",
         "tiers": {
           "free": "500K per month",
           "pro": "2 Million per month, then $2 per 1 million invocations",
@@ -225,6 +221,7 @@
       },
       {
         "title": "Number of functions",
+        "tooltip": "Billing is based on the maximum amount of functions at any point in time throughout your billing period.",
         "tiers": {
           "free": "10",
           "pro": "100, then $10 per additional 100 functions",
@@ -247,6 +244,7 @@
       },
       {
         "title": "Concurrent Peak Connections",
+        "tooltip": "We only charge for successful connections - not connection attempts!",
         "tiers": {
           "free": "Up to 200",
           "pro": "Up to 500, then $10 per 1000",
@@ -254,10 +252,11 @@
         }
       },
       {
-        "title": "Max Messages Per Month",
+        "title": "Messages Per Month",
+        "tooltip": "Billing is based on the total sum of Realtime messages throughout your billing period.",
         "tiers": {
           "free": "2 Million (including database)",
-          "pro": "5 Million",
+          "pro": "5 Million, then $2.50 per million",
           "enterprise": "Volume discounts on messages"
         }
       },
@@ -379,7 +378,6 @@
       },
       {
         "title": "Custom Domains",
-        "tooltip": "Contact us to access this feature",
         "tiers": {
           "free": false,
           "pro": "$10 per domain per month per project add on",
diff --git a/apps/www/lib/redirects.js b/apps/www/lib/redirects.js
index de50060f023..b0cba9883b7 100644
--- a/apps/www/lib/redirects.js
+++ b/apps/www/lib/redirects.js
@@ -1155,7 +1155,7 @@ module.exports = [
   {
     permanent: true,
     source: '/docs/reference/cli/about',
-    destination: '/docs/reference/cli',
+    destination: '/docs/reference/cli/introduction',
   },
   {
     permanent: true,
@@ -1165,118 +1165,44 @@ module.exports = [
   {
     permanent: true,
     source: '/docs/reference/cli/supabase-help',
-    destination: '/docs/reference/cli/usage',
-  },
-  {
-    permanent: true,
-    source: '/docs/reference/cli/supabase-login',
-    destination: '/docs/reference/cli/usage',
-  },
-  {
-    permanent: true,
-    source: '/docs/reference/cli/supabase-link',
-    destination: '/docs/reference/cli/usage',
-  },
-  {
-    permanent: true,
-    source: '/docs/reference/cli/supabase-init',
-    destination: '/docs/reference/cli/usage',
-  },
-  {
-    permanent: true,
-    source: '/docs/reference/cli/supabase-start',
-    destination: '/docs/reference/cli/usage',
+    destination: '/docs/reference/cli/global-flags',
   },
   {
     permanent: true,
     source: '/docs/reference/cli/supabase-db-branch-list',
-    destination: '/docs/reference/cli/usage',
+    destination: '/docs/reference/supabase-db',
   },
   {
     permanent: true,
     source: '/docs/reference/cli/supabase-db-branch-create',
-    destination: '/docs/reference/cli/usage',
+    destination: '/docs/reference/supabase-db',
   },
   {
     permanent: true,
     source: '/docs/reference/cli/supabase-db-branch-delete',
-    destination: '/docs/reference/cli/usage',
+    destination: '/docs/reference/supabase-db',
   },
   {
     permanent: true,
     source: '/docs/reference/cli/supabase-db-switch',
-    destination: '/docs/reference/cli/usage',
+    destination: '/docs/reference/supabase-db',
   },
   {
     permanent: true,
     source: '/docs/reference/cli/supabase-db-changes',
-    destination: '/docs/reference/cli/usage',
+    destination: '/docs/reference/supabase-db',
   },
   {
     permanent: true,
     source: '/docs/reference/cli/supabase-db-commit',
-    destination: '/docs/reference/cli/usage',
+    destination: '/docs/reference/supabase-db',
   },
   {
     permanent: true,
     source: '/docs/reference/cli/supabase-db-remote-set',
-    destination: '/docs/reference/cli/usage',
-  },
-  {
-    permanent: true,
-    source: '/docs/reference/cli/supabase-functions-delete',
-    destination: '/docs/reference/cli/usage',
-  },
-  {
-    permanent: true,
-    source: '/docs/reference/cli/supabase-functions-deploy',
-    destination: '/docs/reference/cli/usage',
-  },
-  {
-    permanent: true,
-    source: '/docs/reference/cli/supabase-functions-new',
-    destination: '/docs/reference/cli/usage',
-  },
-  {
-    permanent: true,
-    source: '/docs/reference/cli/supabase-functions-serve',
-    destination: '/docs/reference/cli/usage',
-  },
-  {
-    permanent: true,
-    source: '/docs/reference/cli/supabase-migration-new',
-    destination: '/docs/reference/cli/usage',
-  },
-  {
-    permanent: true,
-    source: '/docs/reference/cli/supabase-orgs-list',
-    destination: '/docs/reference/cli/usage',
-  },
-  {
-    permanent: true,
-    source: '/docs/reference/cli/supabase-projects-list',
-    destination: '/docs/reference/cli/usage',
-  },
-  {
-    permanent: true,
-    source: '/docs/reference/cli/supabase-projects-create',
-    destination: '/docs/reference/cli/usage',
-  },
-  {
-    permanent: true,
-    source: '/docs/reference/cli/supabase-secrets-list',
-    destination: '/docs/reference/cli/usage',
-  },
-  {
-    permanent: true,
-    source: '/docs/reference/cli/supabase-secrets-set',
-    destination: '/docs/reference/cli/usage',
-  },
-  {
-    permanent: true,
-    source: '/docs/reference/cli/supabase-secrets-unset',
-    destination: '/docs/reference/cli/usage',
+    destination: '/docs/reference/supabase-db',
   },
+
   {
     permanent: true,
     source: '/docs/reference/tools/reference-auth',
@@ -1554,6 +1480,11 @@ module.exports = [
     source: '/docs/guides/functions/examples',
     destination: '/docs/guides/functions',
   },
+  {
+    permanent: true,
+    source: '/docs/guides/functions/best-practices',
+    destination: '/docs/guides/functions/quickstart',
+  },
   {
     permanent: true,
     source: '/projects',
@@ -1706,6 +1637,11 @@ module.exports = [
     source: '/docs/guides/database',
     destination: '/docs/guides/database/overview',
   },
+  {
+    permanent: true,
+    source: '/docs/getting-started',
+    destination: '/docs/guides/getting-started/architecture',
+  },
   {
     permanent: true,
     source: '/docs/architecture',
@@ -1781,6 +1717,11 @@ module.exports = [
     source: '/docs/guides/with-ionic-angular',
     destination: '/docs/guides/getting-started/tutorials/with-ionic-angular',
   },
+  {
+    permanent: true,
+    source: '/docs/guides/tutorials',
+    destination: '/docs/guides/getting-started#tutorials',
+  },
   {
     permanent: true,
     source: '/docs/guides/hosting/overview',
@@ -1803,18 +1744,18 @@ module.exports = [
   },
   {
     permanent: true,
-    source: '/docs/guides/cli',
-    destination: '/docs/guides/resources/supabase-cli',
+    source: '/docs/guides/resources/supabase-cli',
+    destination: '/docs/guides/cli',
   },
   {
     permanent: true,
-    source: '/docs/guides/cli/local-development',
-    destination: '/docs/guides/resources/supabase-cli/local-development',
+    source: '/docs/guides/resources/supabase-cli/local-development',
+    destination: '/docs/guides/cli/local-development',
   },
   {
     permanent: true,
-    source: '/docs/guides/cli/managing-environments',
-    destination: '/docs/guides/resources/supabase-cli/managing-environments',
+    source: '/docs/guides/resources/supabase-cli/managing-environments',
+    destination: '/docs/guides/cli/managing-environments',
   },
   {
     permanent: true,
@@ -1896,4 +1837,14 @@ module.exports = [
     source: '/docs/guides/api/generating-types',
     destination: '/docs/guides/database/api/generating-types',
   },
+  {
+    permanent: true,
+    source: '/docs/reference/javascript/upgrade-guide',
+    destination: '/docs/reference/javascript/v1/upgrade-guide',
+  },
+  {
+    permanent: true,
+    source: '/docs/reference/dart/upgrade-guide',
+    destination: '/docs/reference/dart/v0/upgrade-guide',
+  },
 ]
diff --git a/apps/www/package.json b/apps/www/package.json
index 5dd1f08a31f..69108a1066b 100644
--- a/apps/www/package.json
+++ b/apps/www/package.json
@@ -36,7 +36,7 @@
     "next-seo": "^4.20.0",
     "next-transpile-modules": "^9.0.0",
     "nodemailer": "^6.7.3",
-    "octokit": "^2.0.10",
+    "octokit": "^2.0.14",
     "parse-numeric-range": "^1.3.0",
     "react": "^17.0.2",
     "react-copy-to-clipboard": "^5.0.2",
diff --git a/apps/www/pages/pricing/CHANGELOG.txt b/apps/www/pages/pricing/CHANGELOG.txt
index 78652cdfa2f..8b3a8532477 100644
--- a/apps/www/pages/pricing/CHANGELOG.txt
+++ b/apps/www/pages/pricing/CHANGELOG.txt
@@ -1,5 +1,10 @@
 Pricing Changelog
 
+### 18 Jan 2023
+
+- Clarified over-usage of Realtime messages per month
+    - On the Pro tier, $2.50 per million after included 5 million messages
+
 ### 09 Jan 2023
 ----
 
diff --git a/apps/www/pages/realtime/Realtime.tsx b/apps/www/pages/realtime/Realtime.tsx
index cc062d0bde4..633b7bc7bae 100644
--- a/apps/www/pages/realtime/Realtime.tsx
+++ b/apps/www/pages/realtime/Realtime.tsx
@@ -238,7 +238,7 @@ function RealtimePage() {
               </p>,
             ]}
             // [TODO] Point to the correct docs URL
-            documentation_link={'/docs/guides//docs/guides/realtime/broadcast'}
+            documentation_link={'/docs/guides/realtime#broadcast'}
           />
         </SectionContainer>
 
diff --git a/apps/www/pages/support.tsx b/apps/www/pages/support.tsx
index acb8805807f..e6babad27d1 100644
--- a/apps/www/pages/support.tsx
+++ b/apps/www/pages/support.tsx
@@ -199,7 +199,7 @@ const Index = ({}: Props) => {
                     border-gray-100 bg-white p-5
                     pt-14 dark:border-gray-600"
                   >
-                    <a href="mailto:support@supabase.io">
+                    <a href="https://app.supabase.com/support/new">
                       <Button size="medium" type="default" iconRight={<IconMail />}>
                         Email Support
                       </Button>
diff --git a/docker/.dockerignore b/docker/.dockerignore
deleted file mode 100644
index b5924c32836..00000000000
--- a/docker/.dockerignore
+++ /dev/null
@@ -1,7 +0,0 @@
-node_modules/
-.vercel
-.next
-.env.local
-.env.production
-.env.dev
-.env.*
\ No newline at end of file
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index db91090408e..26a713e8b0c 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -9,8 +9,13 @@ version: "3.8"
 services:
   studio:
     container_name: supabase-studio
-    image: supabase/studio:20221214-4eecc99
+    image: supabase/studio:20230127-123d704
     restart: unless-stopped
+    healthcheck:
+      test: [ "CMD", "node", "-e", "require('http').get('http://localhost:3000/api/profile', (r) => {if (r.statusCode !== 200) throw new Error(r.statusCode)})" ]
+      timeout: 5s
+      interval: 5s
+      retries: 3
     ports:
       - ${STUDIO_PORT}:3000/tcp
     environment:
@@ -22,8 +27,6 @@ services:
 
       SUPABASE_URL: http://kong:8000
       SUPABASE_PUBLIC_URL: ${SUPABASE_PUBLIC_URL}
-      # Kept for backwards compatibility with studio:0.22.08
-      SUPABASE_REST_URL: ${API_EXTERNAL_URL}/rest/v1/
       SUPABASE_ANON_KEY: ${ANON_KEY}
       SUPABASE_SERVICE_KEY: ${SERVICE_ROLE_KEY}
 
@@ -51,6 +54,11 @@ services:
     depends_on:
       db: # Disable this if you are using an external Postgres database
         condition: service_healthy
+    healthcheck:
+      test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:9999/health" ]
+      timeout: 5s
+      interval: 5s
+      retries: 3
     restart: unless-stopped
     environment:
       GOTRUE_API_HOST: 0.0.0.0
@@ -109,12 +117,17 @@ services:
     depends_on:
       db: # Disable this if you are using an external Postgres database
         condition: service_healthy
+    healthcheck:
+      test: [ "CMD", "bash", "-c", "printf \\0 > /dev/tcp/localhost/4000" ]
+      timeout: 5s
+      interval: 5s
+      retries: 3
     restart: unless-stopped
     environment:
       PORT: 4000
       DB_HOST: ${POSTGRES_HOST}
       DB_PORT: ${POSTGRES_PORT}
-      DB_USER: ${POSTGRES_USER}
+      DB_USER: supabase_admin
       DB_PASSWORD: ${POSTGRES_PASSWORD}
       DB_NAME: ${POSTGRES_DB}
       DB_AFTER_CONNECT_QUERY: 'SET search_path TO _realtime'
@@ -137,6 +150,13 @@ services:
         condition: service_healthy
       rest:
         condition: service_started
+      imgproxy:
+        condition: service_started
+    healthcheck:
+      test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:5000/status" ]
+      timeout: 5s
+      interval: 5s
+      retries: 3
     restart: unless-stopped
     environment:
       ANON_KEY: ${ANON_KEY}
@@ -159,6 +179,11 @@ services:
   imgproxy:
     container_name: supabase-imgproxy
     image: darthsim/imgproxy:v3.11
+    healthcheck:
+      test: [ "CMD", "imgproxy", "health" ]
+      timeout: 5s
+      interval: 5s
+      retries: 3
     environment:
       IMGPROXY_BIND: ":5001"
       IMGPROXY_LOCAL_FILESYSTEM_ROOT: /
@@ -168,7 +193,7 @@ services:
 
   meta:
     container_name: supabase-meta
-    image: supabase/postgres-meta:v0.52.1
+    image: supabase/postgres-meta:v0.59.0
     depends_on:
       db: # Disable this if you are using an external Postgres database
         condition: service_healthy
@@ -184,7 +209,7 @@ services:
   # Comment out everything below this point if you are using an external Postgres database
   db:
     container_name: supabase-db
-    image: supabase/postgres:14.1.0.89
+    image: supabase/postgres:14.1.0.106
     healthcheck:
       test: pg_isready -U postgres -h localhost
       interval: 5s
diff --git a/examples/caching/with-nextjs-13-server-components/.env.local.example b/examples/caching/with-nextjs-13-server-components/.env.local.example
new file mode 100644
index 00000000000..86322ad66bb
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/.env.local.example
@@ -0,0 +1,5 @@
+# these values can be found in your project's API settings
+# https://app.supabase.com/project/_/settings/api
+
+NEXT_PUBLIC_SUPABASE_URL=your-supabase-url
+NEXT_PUBLIC_SUPABASE_ANON_KEY=your-supabase-anon-key
diff --git a/examples/caching/with-nextjs-13-server-components/.eslintrc.json b/examples/caching/with-nextjs-13-server-components/.eslintrc.json
new file mode 100644
index 00000000000..bffb357a712
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/.eslintrc.json
@@ -0,0 +1,3 @@
+{
+  "extends": "next/core-web-vitals"
+}
diff --git a/examples/caching/with-nextjs-13-server-components/.gitignore b/examples/caching/with-nextjs-13-server-components/.gitignore
new file mode 100644
index 00000000000..c87c9b392c0
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/.gitignore
@@ -0,0 +1,36 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.pnpm-debug.log*
+
+# local env files
+.env*.local
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts
diff --git a/examples/caching/with-nextjs-13-server-components/README.md b/examples/caching/with-nextjs-13-server-components/README.md
new file mode 100644
index 00000000000..a5d2f3302e2
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/README.md
@@ -0,0 +1,3 @@
+This is an example repo to show how to fetch and cache Supabase data with Next.js Server Components.
+
+Check out [the article](https://supabase.com/blog/fetching-and-caching-supabase-data-in-next-js-server-components) to learn more.
diff --git a/examples/caching/with-nextjs-13-server-components/app/client-side/page.tsx b/examples/caching/with-nextjs-13-server-components/app/client-side/page.tsx
new file mode 100644
index 00000000000..519b2939626
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/app/client-side/page.tsx
@@ -0,0 +1,21 @@
+'use client'
+
+import { useEffect, useState } from 'react'
+import supabase from '../../utils/supabase'
+
+export default function ClientPosts() {
+  const [isLoading, setIsLoading] = useState(true)
+  const [posts, setPosts] = useState<any>([])
+
+  useEffect(() => {
+    const fetchPosts = async () => {
+      const { data } = await supabase.from('posts').select()
+      setPosts(data)
+      setIsLoading(false)
+    }
+
+    fetchPosts()
+  }, [])
+
+  return isLoading ? <p>Loading</p> : <pre>{JSON.stringify(posts, null, 2)}</pre>
+}
diff --git a/examples/caching/with-nextjs-13-server-components/app/globals.css b/examples/caching/with-nextjs-13-server-components/app/globals.css
new file mode 100644
index 00000000000..36aac7e73df
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/app/globals.css
@@ -0,0 +1,26 @@
+html,
+body {
+  padding: 0;
+  margin: 0;
+  font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell,
+    Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
+}
+
+a {
+  color: inherit;
+  text-decoration: none;
+}
+
+* {
+  box-sizing: border-box;
+}
+
+@media (prefers-color-scheme: dark) {
+  html {
+    color-scheme: dark;
+  }
+  body {
+    color: white;
+    background: black;
+  }
+}
diff --git a/examples/caching/with-nextjs-13-server-components/app/head.tsx b/examples/caching/with-nextjs-13-server-components/app/head.tsx
new file mode 100644
index 00000000000..5ad797f1f21
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/app/head.tsx
@@ -0,0 +1,10 @@
+export default function Head() {
+  return (
+    <>
+      <title>Create Next App</title>
+      <meta content="width=device-width, initial-scale=1" name="viewport" />
+      <meta name="description" content="Generated by create next app" />
+      <link rel="icon" href="/favicon.ico" />
+    </>
+  )
+}
diff --git a/examples/caching/with-nextjs-13-server-components/app/layout.tsx b/examples/caching/with-nextjs-13-server-components/app/layout.tsx
new file mode 100644
index 00000000000..24b2aca547f
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/app/layout.tsx
@@ -0,0 +1,14 @@
+import './globals.css'
+
+export default function RootLayout({ children }: { children: React.ReactNode }) {
+  return (
+    <html lang="en">
+      {/*
+        <head /> will contain the components returned by the nearest parent
+        head.tsx. Find out more at https://beta.nextjs.org/docs/api-reference/file-conventions/head
+      */}
+      <head />
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/examples/caching/with-nextjs-13-server-components/app/page.module.css b/examples/caching/with-nextjs-13-server-components/app/page.module.css
new file mode 100644
index 00000000000..a978c99de57
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/app/page.module.css
@@ -0,0 +1,146 @@
+.container {
+  padding: 0 2rem;
+}
+
+.main {
+  min-height: 100vh;
+  padding: 4rem 0;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+
+.footer {
+  display: flex;
+  flex: 1;
+  padding: 2rem 0;
+  border-top: 1px solid #eaeaea;
+  justify-content: center;
+  align-items: center;
+}
+
+.footer a {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-grow: 1;
+}
+
+.title {
+  margin: 0;
+  line-height: 1.15;
+  font-size: 4rem;
+  font-style: normal;
+  font-weight: 800;
+  letter-spacing: -0.025em;
+}
+
+.title a {
+  text-decoration: none;
+  color: #0070f3;
+}
+
+.title a:hover,
+.title a:focus,
+.title a:active {
+  text-decoration: underline;
+}
+
+.title,
+.description {
+  text-align: center;
+}
+
+.description {
+  margin: 4rem 0;
+  line-height: 1.5;
+  font-size: 1.5rem;
+}
+
+.code {
+  background: #fafafa;
+  border-radius: 5px;
+  padding: 0.75rem;
+  font-size: 1.1rem;
+  font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono,
+    Bitstream Vera Sans Mono, Courier New, monospace;
+}
+
+.grid {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-wrap: wrap;
+  max-width: 1200px;
+}
+
+.card {
+  margin: 1rem;
+  padding: 1.5rem;
+  text-align: left;
+  color: inherit;
+  text-decoration: none;
+  border: 1px solid #eaeaea;
+  border-radius: 10px;
+  transition: color 0.15s ease, border-color 0.15s ease;
+  max-width: 300px;
+}
+
+.card:hover,
+.card:focus,
+.card:active {
+  color: #0070f3;
+  border-color: #0070f3;
+}
+
+.card h2 {
+  margin: 0 0 1rem 0;
+  font-size: 1.5rem;
+}
+
+.card p {
+  margin: 0;
+  font-size: 1.25rem;
+  line-height: 1.5;
+}
+
+.logo {
+  height: 1em;
+  margin-left: 0.5rem;
+}
+
+@media (max-width: 600px) {
+  .grid {
+    width: 100%;
+    flex-direction: column;
+  }
+}
+
+@media (prefers-color-scheme: dark) {
+  .title {
+    background: linear-gradient(180deg, #ffffff 0%, #aaaaaa 100%);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    background-clip: text;
+    text-fill-color: transparent;
+  }
+  .title a {
+    background: linear-gradient(180deg, #0070f3 0%, #0153af 100%);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    background-clip: text;
+    text-fill-color: transparent;
+  }
+  .card,
+  .footer {
+    border-color: #222;
+  }
+  .code {
+    background: #111;
+  }
+  .logo img {
+    filter: invert(1);
+  }
+}
diff --git a/examples/caching/with-nextjs-13-server-components/app/page.tsx b/examples/caching/with-nextjs-13-server-components/app/page.tsx
new file mode 100644
index 00000000000..951caeb2dc8
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/app/page.tsx
@@ -0,0 +1,53 @@
+import Image from 'next/image'
+import styles from './page.module.css'
+
+export default function Home() {
+  return (
+    <div className={styles.container}>
+      <main className={styles.main}>
+        <h1 className={styles.title}>
+          Welcome to <a href="https://nextjs.org">Next.js 13!</a>
+        </h1>
+
+        <p className={styles.description}>
+          Get started by editing <code className={styles.code}>app/page.tsx</code>
+        </p>
+
+        <div className={styles.grid}>
+          <a href="https://beta.nextjs.org/docs" className={styles.card}>
+            <h2>Documentation &rarr;</h2>
+            <p>Find in-depth information about Next.js 13</p>
+          </a>
+
+          <a href="https://github.com/vercel/next.js/tree/canary/examples" className={styles.card}>
+            <h2>Examples &rarr;</h2>
+            <p>Explore the Next.js 13 playground.</p>
+          </a>
+
+          <a
+            href="https://vercel.com/templates/next.js/app-directory?utm_source=create-next-app&utm_medium=default-template&utm_campaign=create-next-app"
+            target="_blank"
+            rel="noopener noreferrer"
+            className={styles.card}
+          >
+            <h2>Deploy &rarr;</h2>
+            <p>Deploy your Next.js site to a public URL with Vercel.</p>
+          </a>
+        </div>
+      </main>
+
+      <footer className={styles.footer}>
+        <a
+          href="https://vercel.com?utm_source=create-next-app&utm_medium=default-template&utm_campaign=create-next-app"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          Powered by{' '}
+          <span className={styles.logo}>
+            <Image src="/vercel.svg" alt="Vercel Logo" width={72} height={16} />
+          </span>
+        </a>
+      </footer>
+    </div>
+  )
+}
diff --git a/examples/caching/with-nextjs-13-server-components/app/realtime/page.tsx b/examples/caching/with-nextjs-13-server-components/app/realtime/page.tsx
new file mode 100644
index 00000000000..c14ed5303bb
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/app/realtime/page.tsx
@@ -0,0 +1,16 @@
+import supabase from '../../utils/supabase'
+import RealtimePosts from './realtime-posts'
+
+// do not cache this page
+export const revalidate = 0
+
+// this component fetches the current posts server-side
+// and subscribes to new posts client-side
+export default async function Realtime() {
+  const { data } = await supabase.from('posts').select('*')
+
+  // data can be passed from server components to client components
+  // this allows us to fetch the initial posts before rendering the page
+  // our <RealtimePosts /> component will then subscribe to new posts client-side
+  return <RealtimePosts serverPosts={data} />
+}
diff --git a/examples/caching/with-nextjs-13-server-components/app/realtime/realtime-posts.tsx b/examples/caching/with-nextjs-13-server-components/app/realtime/realtime-posts.tsx
new file mode 100644
index 00000000000..551c57dcea1
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/app/realtime/realtime-posts.tsx
@@ -0,0 +1,34 @@
+'use client'
+
+import { useEffect, useState } from 'react'
+import supabase from '../../utils/supabase'
+
+// realtime subscriptions need to be set up client-side
+// this component takes initial posts as props and automatically
+// updates when new posts are inserted into Supabase's `posts` table
+export default function RealtimePosts({ serverPosts }: { serverPosts: any }) {
+  const [posts, setPosts] = useState(serverPosts)
+
+  useEffect(() => {
+    // this overwrites `posts` any time the `serverPosts` prop changes
+    // this happens when the parent Server Component is re-rendered
+    setPosts(serverPosts)
+  }, [serverPosts])
+
+  useEffect(() => {
+    // ensure you have enabled replication on the `posts` table
+    // https://app.supabase.com/project/_/database/replication
+    const channel = supabase
+      .channel('*')
+      .on('postgres_changes', { event: 'INSERT', schema: 'public', table: 'posts' }, (payload) =>
+        setPosts((posts: any) => [...posts, payload.new])
+      )
+      .subscribe()
+
+    return () => {
+      supabase.removeChannel(channel)
+    }
+  }, [serverPosts])
+
+  return <pre>{JSON.stringify(posts, null, 2)}</pre>
+}
diff --git a/examples/caching/with-nextjs-13-server-components/app/server-rendered/[id]/page.tsx b/examples/caching/with-nextjs-13-server-components/app/server-rendered/[id]/page.tsx
new file mode 100644
index 00000000000..1b323e4d0c5
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/app/server-rendered/[id]/page.tsx
@@ -0,0 +1,23 @@
+import supabase from '../../../utils/supabase'
+import { notFound } from 'next/navigation'
+
+// do not cache this page
+export const revalidate = 0
+
+export async function generateStaticParams() {
+  const { data: posts } = await supabase.from('posts').select('id')
+
+  return posts?.map(({ id }) => ({
+    id,
+  }))
+}
+
+export default async function Post({ params: { id } }: { params: { id: string } }) {
+  const { data: post } = await supabase.from('posts').select().match({ id }).single()
+
+  if (!post) {
+    notFound()
+  }
+
+  return <pre>{JSON.stringify(post, null, 2)}</pre>
+}
diff --git a/examples/caching/with-nextjs-13-server-components/app/server-rendered/page.tsx b/examples/caching/with-nextjs-13-server-components/app/server-rendered/page.tsx
new file mode 100644
index 00000000000..2b96263ba99
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/app/server-rendered/page.tsx
@@ -0,0 +1,19 @@
+import Link from 'next/link'
+import supabase from '../../utils/supabase'
+
+// do not cache this page
+export const revalidate = 0
+
+export default async function Posts() {
+  const { data: posts } = await supabase.from('posts').select('id, title')
+
+  if (!posts) {
+    return <p>No posts found.</p>
+  }
+
+  return posts.map((post) => (
+    <p key={post.id}>
+      <Link href={`/static/${post.id}`}>{post.title}</Link>
+    </p>
+  ))
+}
diff --git a/examples/caching/with-nextjs-13-server-components/app/static-with-revalidation/[id]/page.tsx b/examples/caching/with-nextjs-13-server-components/app/static-with-revalidation/[id]/page.tsx
new file mode 100644
index 00000000000..06541e7a702
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/app/static-with-revalidation/[id]/page.tsx
@@ -0,0 +1,23 @@
+import supabase from '../../../utils/supabase'
+import { notFound } from 'next/navigation'
+
+// cache this page for 1 minute
+export const revalidate = 60
+
+export async function generateStaticParams() {
+  const { data: posts } = await supabase.from('posts').select('id')
+
+  return posts?.map(({ id }) => ({
+    id,
+  }))
+}
+
+export default async function Post({ params: { id } }: { params: { id: string } }) {
+  const { data: post } = await supabase.from('posts').select().match({ id }).single()
+
+  if (!post) {
+    notFound()
+  }
+
+  return <pre>{JSON.stringify(post, null, 2)}</pre>
+}
diff --git a/examples/caching/with-nextjs-13-server-components/app/static-with-revalidation/page.tsx b/examples/caching/with-nextjs-13-server-components/app/static-with-revalidation/page.tsx
new file mode 100644
index 00000000000..cb6879d2e28
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/app/static-with-revalidation/page.tsx
@@ -0,0 +1,19 @@
+import Link from 'next/link'
+import supabase from '../../utils/supabase'
+
+// cache this page for 1 minute
+export const revalidate = 60
+
+export default async function Posts() {
+  const { data: posts } = await supabase.from('posts').select('id, title')
+
+  if (!posts) {
+    return <p>No posts found.</p>
+  }
+
+  return posts.map((post) => (
+    <p key={post.id}>
+      <Link href={`/static/${post.id}`}>{post.title}</Link>
+    </p>
+  ))
+}
diff --git a/examples/caching/with-nextjs-13-server-components/app/static/[id]/page.tsx b/examples/caching/with-nextjs-13-server-components/app/static/[id]/page.tsx
new file mode 100644
index 00000000000..43f87fa9815
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/app/static/[id]/page.tsx
@@ -0,0 +1,20 @@
+import supabase from '../../../utils/supabase'
+import { notFound } from 'next/navigation'
+
+export async function generateStaticParams() {
+  const { data: posts } = await supabase.from('posts').select('id')
+
+  return posts?.map(({ id }) => ({
+    id,
+  }))
+}
+
+export default async function Post({ params: { id } }: { params: { id: string } }) {
+  const { data: post } = await supabase.from('posts').select().match({ id }).single()
+
+  if (!post) {
+    notFound()
+  }
+
+  return <pre>{JSON.stringify(post, null, 2)}</pre>
+}
diff --git a/examples/caching/with-nextjs-13-server-components/app/static/page.tsx b/examples/caching/with-nextjs-13-server-components/app/static/page.tsx
new file mode 100644
index 00000000000..0465d62bbca
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/app/static/page.tsx
@@ -0,0 +1,16 @@
+import Link from 'next/link'
+import supabase from '../../utils/supabase'
+
+export default async function Posts() {
+  const { data: posts } = await supabase.from('posts').select('id, title')
+
+  if (!posts) {
+    return <p>No posts found.</p>
+  }
+
+  return posts.map((post) => (
+    <p key={post.id}>
+      <Link href={`/static/${post.id}`}>{post.title}</Link>
+    </p>
+  ))
+}
diff --git a/examples/caching/with-nextjs-13-server-components/next.config.js b/examples/caching/with-nextjs-13-server-components/next.config.js
new file mode 100644
index 00000000000..dafb0c88e96
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/next.config.js
@@ -0,0 +1,8 @@
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+  experimental: {
+    appDir: true,
+  },
+}
+
+module.exports = nextConfig
diff --git a/examples/caching/with-nextjs-13-server-components/package-lock.json b/examples/caching/with-nextjs-13-server-components/package-lock.json
new file mode 100644
index 00000000000..ff2ad55b803
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/package-lock.json
@@ -0,0 +1,5302 @@
+{
+  "name": "next13",
+  "version": "0.1.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "next13",
+      "version": "0.1.0",
+      "dependencies": {
+        "@supabase/supabase-js": "^2.1.0",
+        "@types/node": "18.11.9",
+        "@types/react": "18.0.25",
+        "@types/react-dom": "18.0.9",
+        "eslint": "8.27.0",
+        "eslint-config-next": "13.0.3",
+        "next": "13.0.3",
+        "react": "18.2.0",
+        "react-dom": "18.2.0",
+        "typescript": "4.8.4"
+      }
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz",
+      "integrity": "sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==",
+      "dependencies": {
+        "regenerator-runtime": "^0.13.10"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/runtime-corejs3": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.20.1.tgz",
+      "integrity": "sha512-CGulbEDcg/ND1Im7fUNRZdGXmX2MTWVVZacQi/6DiKE5HNwZ3aVTm5PV4lO8HHz0B2h8WQyvKKjbX5XgTtydsg==",
+      "dependencies": {
+        "core-js-pure": "^3.25.1",
+        "regenerator-runtime": "^0.13.10"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
+      "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.4.0",
+        "globals": "^13.15.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.11.7",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz",
+      "integrity": "sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==",
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
+    },
+    "node_modules/@next/env": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-13.0.3.tgz",
+      "integrity": "sha512-/4WzeG61Ot/PxsghXkSqQJ6UohFfwXoZ3dtsypmR9EBP+OIax9JRq0trq8Z/LCT9Aq4JbihVkaazRWguORjTAw=="
+    },
+    "node_modules/@next/eslint-plugin-next": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-13.0.3.tgz",
+      "integrity": "sha512-slmTAHNKDyc7jhx4VF8lFbmOPWJ3PShtUUWpb6x9+ga59CyOxgP6AdcDhxfapnWYACKe/TwYiaveufu7LqXgZg==",
+      "dependencies": {
+        "glob": "7.1.7"
+      }
+    },
+    "node_modules/@next/swc-android-arm-eabi": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-13.0.3.tgz",
+      "integrity": "sha512-uxfUoj65CdFc1gX2q7GtBX3DhKv9Kn343LMqGNvXyuTpYTGMmIiVY7b9yF8oLWRV0gVKqhZBZifUmoPE8SJU6Q==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-android-arm64": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-13.0.3.tgz",
+      "integrity": "sha512-t2k+WDfg7Cq2z/EnalKGsd/9E5F4Hdo1xu+UzZXYDpKUI9zgE6Bz8ajQb8m8txv3qOaWdKuDa5j5ziq9Acd1Xw==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-darwin-arm64": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.0.3.tgz",
+      "integrity": "sha512-wV6j6SZ1bc/YHOLCLk9JVqaZTCCey6HBV7inl2DriHsHqIcO6F3+QiYf0KXwRP9BE0GSZZrYd5mZQm2JPTHdJA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-darwin-x64": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.0.3.tgz",
+      "integrity": "sha512-jaI2CMuYWvUtRixV3AIjUhnxUDU1FKOR+8hADMhYt3Yz+pCKuj4RZ0n0nY5qUf3qT1AtvnJXEgyatSFJhSp/wQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-freebsd-x64": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-freebsd-x64/-/swc-freebsd-x64-13.0.3.tgz",
+      "integrity": "sha512-nbyT0toBTJrcj5TCB9pVnQpGJ3utGyQj4CWegZs1ulaeUQ5Z7CS/qt8nRyYyOKYHtOdSCJ9Nw5F/RgKNkdpOdw==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-arm-gnueabihf": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-13.0.3.tgz",
+      "integrity": "sha512-1naLxYvRUQCoFCU1nMkcQueRc0Iux9xBv1L5pzH2ejtIWFg8BrSgyuluJG4nyAhFCx4WG863IEIkAaefOowVdA==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-arm64-gnu": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.0.3.tgz",
+      "integrity": "sha512-3Z4A8JkuGWpMVbUhUPQInK/SLY+kijTT78Q/NZCrhLlyvwrVxaQALJNlXzxDLraUgv4oVH0Wz/FIw1W9PUUhxA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-arm64-musl": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.0.3.tgz",
+      "integrity": "sha512-MoYe9SM40UaunTjC+01c9OILLH3uSoeri58kDMu3KF/EFEvn1LZ6ODeDj+SLGlAc95wn46hrRJS2BPmDDE+jFQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-x64-gnu": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.0.3.tgz",
+      "integrity": "sha512-z22T5WGnRanjLMXdF0NaNjSpBlEzzY43t5Ysp3nW1oI6gOkub6WdQNZeHIY7A2JwkgSWZmtjLtf+Fzzz38LHeQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-x64-musl": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.0.3.tgz",
+      "integrity": "sha512-ZOMT7zjBFmkusAtr47k8xs/oTLsNlTH6xvYb+iux7yly2hZGwhfBLzPGBsbeMZukZ96IphJTagT+C033s6LNVA==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-win32-arm64-msvc": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.0.3.tgz",
+      "integrity": "sha512-Q4BM16Djl+Oah9UdGrvjFYgoftYB2jNd+rtRGPX5Mmxo09Ry/KiLbOZnoUyoIxKc1xPyfqMXuaVsAFQLYs0KEQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-win32-ia32-msvc": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.0.3.tgz",
+      "integrity": "sha512-Sa8yGkNeRUsic8Qjf7MLIAfP0p0+einK/wIqJ8UO1y76j+8rRQu42AMs5H4Ax1fm9GEYq6I8njHtY59TVpTtGQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-win32-x64-msvc": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.0.3.tgz",
+      "integrity": "sha512-IAptmSqA7k4tQzaw2NAkoEjj3+Dz9ceuvlEHwYh770MMDL4V0ku2m+UHrmn5HUCEDHhgwwjg2nyf6728q2jr1w==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@rushstack/eslint-patch": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz",
+      "integrity": "sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg=="
+    },
+    "node_modules/@supabase/functions-js": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@supabase/functions-js/-/functions-js-2.0.0.tgz",
+      "integrity": "sha512-ozb7bds2yvf5k7NM2ZzUkxvsx4S4i2eRKFSJetdTADV91T65g4gCzEs9L3LUXSrghcGIkUaon03VPzOrFredqg==",
+      "dependencies": {
+        "cross-fetch": "^3.1.5"
+      }
+    },
+    "node_modules/@supabase/gotrue-js": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@supabase/gotrue-js/-/gotrue-js-2.3.0.tgz",
+      "integrity": "sha512-e50w8LkfbxtI2SJxUbuQNM7pN+Yu3HYkvCLsidwBgivTdcoFOkhFodwLvWSVdeaxY1mH6Gm66RiKeUMn1+BAow==",
+      "dependencies": {
+        "cross-fetch": "^3.1.5"
+      }
+    },
+    "node_modules/@supabase/postgrest-js": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@supabase/postgrest-js/-/postgrest-js-1.1.0.tgz",
+      "integrity": "sha512-qkY8TqIu5sJuae8gjeDPjEqPrefzcTraW9PNSVJQHq4TEv98ZmwaXGwBGz0bVL63bqrGA5hqREbQHkANUTXrvA==",
+      "dependencies": {
+        "cross-fetch": "^3.1.5"
+      }
+    },
+    "node_modules/@supabase/realtime-js": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@supabase/realtime-js/-/realtime-js-2.1.0.tgz",
+      "integrity": "sha512-iplLCofTeYjnx9FIOsIwHLhMp0+7UVyiA4/sCeq40VdOgN9eTIhjEno9Tgh4dJARi4aaXoKfRX1DTxgZaOpPAw==",
+      "dependencies": {
+        "@types/phoenix": "^1.5.4",
+        "websocket": "^1.0.34"
+      }
+    },
+    "node_modules/@supabase/storage-js": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@supabase/storage-js/-/storage-js-2.0.0.tgz",
+      "integrity": "sha512-7kXThdRt/xqnOOvZZxBqNkeX1CFNUWc0hYBJtNN/Uvt8ok9hD14foYmroWrHn046wEYFqUrB9U35JYsfTrvltA==",
+      "dependencies": {
+        "cross-fetch": "^3.1.5"
+      }
+    },
+    "node_modules/@supabase/supabase-js": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@supabase/supabase-js/-/supabase-js-2.1.0.tgz",
+      "integrity": "sha512-hODrAUDSC6RV6EhwuSMyhaQCF32gij0EBTceuDR+8suJsg7XcyUG0fYgeYecWIvt0nz61xAMY6E+Ywb0tJaAng==",
+      "dependencies": {
+        "@supabase/functions-js": "^2.0.0",
+        "@supabase/gotrue-js": "^2.3.0",
+        "@supabase/postgrest-js": "^1.1.0",
+        "@supabase/realtime-js": "^2.1.0",
+        "@supabase/storage-js": "^2.0.0",
+        "cross-fetch": "^3.1.5"
+      }
+    },
+    "node_modules/@swc/helpers": {
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.11.tgz",
+      "integrity": "sha512-rEUrBSGIoSFuYxwBYtlUFMlE2CwGhmW+w9355/5oduSw8e5h2+Tj4UrAGNNgP9915++wj5vkQo0UuOBqOAq4nw==",
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
+    },
+    "node_modules/@types/node": {
+      "version": "18.11.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
+      "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg=="
+    },
+    "node_modules/@types/phoenix": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@types/phoenix/-/phoenix-1.5.4.tgz",
+      "integrity": "sha512-L5eZmzw89eXBKkiqVBcJfU1QGx9y+wurRIEgt0cuLH0hwNtVUxtx+6cu0R2STwWj468sjXyBYPYDtGclUd1kjQ=="
+    },
+    "node_modules/@types/prop-types": {
+      "version": "15.7.5",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
+      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
+    },
+    "node_modules/@types/react": {
+      "version": "18.0.25",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.25.tgz",
+      "integrity": "sha512-xD6c0KDT4m7n9uD4ZHi02lzskaiqcBxf4zi+tXZY98a04wvc0hi/TcCPC2FOESZi51Nd7tlUeOJY8RofL799/g==",
+      "dependencies": {
+        "@types/prop-types": "*",
+        "@types/scheduler": "*",
+        "csstype": "^3.0.2"
+      }
+    },
+    "node_modules/@types/react-dom": {
+      "version": "18.0.9",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.9.tgz",
+      "integrity": "sha512-qnVvHxASt/H7i+XG1U1xMiY5t+IHcPGUK7TDMDzom08xa7e86eCeKOiLZezwCKVxJn6NEiiy2ekgX8aQssjIKg==",
+      "dependencies": {
+        "@types/react": "*"
+      }
+    },
+    "node_modules/@types/scheduler": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
+      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "5.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.43.0.tgz",
+      "integrity": "sha512-2iHUK2Lh7PwNUlhFxxLI2haSDNyXvebBO9izhjhMoDC+S3XI9qt2DGFUsiJ89m2k7gGYch2aEpYqV5F/+nwZug==",
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "5.43.0",
+        "@typescript-eslint/types": "5.43.0",
+        "@typescript-eslint/typescript-estree": "5.43.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.43.0.tgz",
+      "integrity": "sha512-XNWnGaqAtTJsUiZaoiGIrdJYHsUOd3BZ3Qj5zKp9w6km6HsrjPk/TGZv0qMTWyWj0+1QOqpHQ2gZOLXaGA9Ekw==",
+      "dependencies": {
+        "@typescript-eslint/types": "5.43.0",
+        "@typescript-eslint/visitor-keys": "5.43.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "5.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.43.0.tgz",
+      "integrity": "sha512-jpsbcD0x6AUvV7tyOlyvon0aUsQpF8W+7TpJntfCUWU1qaIKu2K34pMwQKSzQH8ORgUrGYY6pVIh1Pi8TNeteg==",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.43.0.tgz",
+      "integrity": "sha512-BZ1WVe+QQ+igWal2tDbNg1j2HWUkAa+CVqdU79L4HP9izQY6CNhXfkNwd1SS4+sSZAP/EthI1uiCSY/+H0pROg==",
+      "dependencies": {
+        "@typescript-eslint/types": "5.43.0",
+        "@typescript-eslint/visitor-keys": "5.43.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.43.0.tgz",
+      "integrity": "sha512-icl1jNH/d18OVHLfcwdL3bWUKsBeIiKYTGxMJCoGe7xFht+E4QgzOqoWYrU8XSLJWhVw8nTacbm03v23J/hFTg==",
+      "dependencies": {
+        "@typescript-eslint/types": "5.43.0",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+    },
+    "node_modules/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+      "dependencies": {
+        "@babel/runtime": "^7.10.2",
+        "@babel/runtime-corejs3": "^7.10.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
+      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
+      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
+      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ast-types-flow": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+      "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag=="
+    },
+    "node_modules/axe-core": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.5.2.tgz",
+      "integrity": "sha512-u2MVsXfew5HBvjsczCv+xlwdNnB1oQR9HlAcsejZttNjKKSkeDNVwB1vMThIUIFI9GoT57Vtk8iQLwqOfAkboA==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/axobject-query": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
+      "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA=="
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/bufferutil": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.7.tgz",
+      "integrity": "sha512-kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "node-gyp-build": "^4.3.0"
+      },
+      "engines": {
+        "node": ">=6.14.2"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001431",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz",
+      "integrity": "sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        }
+      ]
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/client-only": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz",
+      "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA=="
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "node_modules/core-js-pure": {
+      "version": "3.26.1",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.26.1.tgz",
+      "integrity": "sha512-VVXcDpp/xJ21KdULRq/lXdLzQAtX7+37LzpyfFM973il0tWSsDEoyzG38G14AjTpK9VTfiNM9jnFauq/CpaWGQ==",
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/cross-fetch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
+      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
+      "dependencies": {
+        "node-fetch": "2.6.7"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/csstype": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
+      "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
+    },
+    "node_modules/d": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "dependencies": {
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
+      }
+    },
+    "node_modules/damerau-levenshtein": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
+      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA=="
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
+    },
+    "node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "dependencies": {
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
+    },
+    "node_modules/es-abstract": {
+      "version": "1.20.4",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
+      "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.3",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.2",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.4.3",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trimend": "^1.0.5",
+        "string.prototype.trimstart": "^1.0.5",
+        "unbox-primitive": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dependencies": {
+        "has": "^1.0.3"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es5-ext": {
+      "version": "0.10.62",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
+      "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.3",
+        "next-tick": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "node_modules/es6-symbol": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "dependencies": {
+        "d": "^1.0.1",
+        "ext": "^1.1.2"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "8.27.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.27.0.tgz",
+      "integrity": "sha512-0y1bfG2ho7mty+SiILVf9PfuRA49ek4Nc60Wmmu62QlobNR+CeXa4xXIJgcuwSQgZiWaPH+5BDsctpIW0PR/wQ==",
+      "dependencies": {
+        "@eslint/eslintrc": "^1.3.3",
+        "@humanwhocodes/config-array": "^0.11.6",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.4.0",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.15.0",
+        "grapheme-splitter": "^1.0.4",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-sdsl": "^4.1.4",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-next": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.0.3.tgz",
+      "integrity": "sha512-i2JoQP8gGv303GjXTonA27fm1ckRRkRoAP1WYEQgN0D2DDoFeBPqlJgHlMHnXKWjmNct/sW8jQEvy9am2juc8g==",
+      "dependencies": {
+        "@next/eslint-plugin-next": "13.0.3",
+        "@rushstack/eslint-patch": "^1.1.3",
+        "@typescript-eslint/parser": "^5.42.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-import-resolver-typescript": "^2.7.1",
+        "eslint-plugin-import": "^2.26.0",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
+        "eslint-plugin-react": "^7.31.7",
+        "eslint-plugin-react-hooks": "^4.5.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.23.0 || ^8.0.0",
+        "typescript": ">=3.3.1"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "dependencies": {
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-import-resolver-typescript": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.7.1.tgz",
+      "integrity": "sha512-00UbgGwV8bSgUv34igBDbTOtKhqoRMy9bFjNehT40bXg6585PNIct8HhXZ0SybqB9rWtXj9crcku8ndDn/gIqQ==",
+      "dependencies": {
+        "debug": "^4.3.4",
+        "glob": "^7.2.0",
+        "is-glob": "^4.0.3",
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "*",
+        "eslint-plugin-import": "*"
+      }
+    },
+    "node_modules/eslint-import-resolver-typescript/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
+      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+      "dependencies": {
+        "debug": "^3.2.7"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
+      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "dependencies": {
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
+        "debug": "^2.6.9",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.3",
+        "has": "^1.0.3",
+        "is-core-module": "^2.8.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.values": "^1.1.5",
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/eslint-plugin-jsx-a11y": {
+      "version": "6.6.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz",
+      "integrity": "sha512-sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q==",
+      "dependencies": {
+        "@babel/runtime": "^7.18.9",
+        "aria-query": "^4.2.2",
+        "array-includes": "^3.1.5",
+        "ast-types-flow": "^0.0.7",
+        "axe-core": "^4.4.3",
+        "axobject-query": "^2.2.0",
+        "damerau-levenshtein": "^1.0.8",
+        "emoji-regex": "^9.2.2",
+        "has": "^1.0.3",
+        "jsx-ast-utils": "^3.3.2",
+        "language-tags": "^1.0.5",
+        "minimatch": "^3.1.2",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+      }
+    },
+    "node_modules/eslint-plugin-jsx-a11y/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/eslint-plugin-react": {
+      "version": "7.31.10",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.10.tgz",
+      "integrity": "sha512-e4N/nc6AAlg4UKW/mXeYWd3R++qUano5/o+t+wnWxIf+bLsOaH3a4q74kX3nDjYym3VBN4HyO9nEn1GcAqgQOA==",
+      "dependencies": {
+        "array-includes": "^3.1.5",
+        "array.prototype.flatmap": "^1.3.0",
+        "doctrine": "^2.1.0",
+        "estraverse": "^5.3.0",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.5",
+        "object.fromentries": "^2.0.5",
+        "object.hasown": "^1.1.1",
+        "object.values": "^1.1.5",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.3",
+        "semver": "^6.3.0",
+        "string.prototype.matchall": "^4.0.7"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+      }
+    },
+    "node_modules/eslint-plugin-react-hooks": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
+      "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/resolve": {
+      "version": "2.0.0-next.4",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
+      "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
+      "dependencies": {
+        "is-core-module": "^2.9.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dependencies": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=5"
+      }
+    },
+    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/espree": {
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
+      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
+      "dependencies": {
+        "acorn": "^8.8.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ext": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
+      "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
+      "dependencies": {
+        "type": "^2.7.2"
+      }
+    },
+    "node_modules/ext/node_modules/type": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
+      "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+    },
+    "node_modules/fast-glob": {
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-glob/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
+    },
+    "node_modules/fastq": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "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"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/globals": {
+      "version": "13.17.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "dependencies": {
+        "get-intrinsic": "^1.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ignore": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "dependencies": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
+    },
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+    },
+    "node_modules/js-sdsl": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz",
+      "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q=="
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
+    },
+    "node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/jsx-ast-utils": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz",
+      "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==",
+      "dependencies": {
+        "array-includes": "^3.1.5",
+        "object.assign": "^4.1.3"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/language-subtag-registry": {
+      "version": "0.3.22",
+      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz",
+      "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w=="
+    },
+    "node_modules/language-tags": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
+      "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
+      "dependencies": {
+        "language-subtag-registry": "~0.3.2"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
+    },
+    "node_modules/next": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/next/-/next-13.0.3.tgz",
+      "integrity": "sha512-rFQeepcenRxKzeKlh1CsmEnxsJwhIERtbUjmYnKZyDInZsU06lvaGw5DT44rlNp1Rv2MT/e9vffZ8vK+ytwXHA==",
+      "dependencies": {
+        "@next/env": "13.0.3",
+        "@swc/helpers": "0.4.11",
+        "caniuse-lite": "^1.0.30001406",
+        "postcss": "8.4.14",
+        "styled-jsx": "5.1.0",
+        "use-sync-external-store": "1.2.0"
+      },
+      "bin": {
+        "next": "dist/bin/next"
+      },
+      "engines": {
+        "node": ">=14.6.0"
+      },
+      "optionalDependencies": {
+        "@next/swc-android-arm-eabi": "13.0.3",
+        "@next/swc-android-arm64": "13.0.3",
+        "@next/swc-darwin-arm64": "13.0.3",
+        "@next/swc-darwin-x64": "13.0.3",
+        "@next/swc-freebsd-x64": "13.0.3",
+        "@next/swc-linux-arm-gnueabihf": "13.0.3",
+        "@next/swc-linux-arm64-gnu": "13.0.3",
+        "@next/swc-linux-arm64-musl": "13.0.3",
+        "@next/swc-linux-x64-gnu": "13.0.3",
+        "@next/swc-linux-x64-musl": "13.0.3",
+        "@next/swc-win32-arm64-msvc": "13.0.3",
+        "@next/swc-win32-ia32-msvc": "13.0.3",
+        "@next/swc-win32-x64-msvc": "13.0.3"
+      },
+      "peerDependencies": {
+        "fibers": ">= 3.1.0",
+        "node-sass": "^6.0.0 || ^7.0.0",
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0",
+        "sass": "^1.3.0"
+      },
+      "peerDependenciesMeta": {
+        "fibers": {
+          "optional": true
+        },
+        "node-sass": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/next-tick": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
+      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/node-gyp-build": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz",
+      "integrity": "sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==",
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
+      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.fromentries": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
+      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.hasown": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
+      "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
+      "dependencies": {
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
+      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.4.14",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
+      "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        }
+      ],
+      "dependencies": {
+        "nanoid": "^3.3.4",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/prop-types": {
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "dependencies": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/react": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
+      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+      "dependencies": {
+        "loose-envify": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-dom": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
+      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "scheduler": "^0.23.0"
+      },
+      "peerDependencies": {
+        "react": "^18.2.0"
+      }
+    },
+    "node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+    },
+    "node_modules/regenerator-runtime": {
+      "version": "0.13.10",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
+      "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="
+    },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "dependencies": {
+        "is-core-module": "^2.9.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/safe-regex-test": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-regex": "^1.1.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/scheduler": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
+      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+      "dependencies": {
+        "loose-envify": "^1.1.0"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/string.prototype.matchall": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
+      "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "regexp.prototype.flags": "^1.4.3",
+        "side-channel": "^1.0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/styled-jsx": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.0.tgz",
+      "integrity": "sha512-/iHaRJt9U7T+5tp6TRelLnqBqiaIT0HsO0+vgyj8hK2KUk7aejFqRrumqPUlAqDwAj8IbS/1hk3IhBAAK/FCUQ==",
+      "dependencies": {
+        "client-only": "0.0.1"
+      },
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "peerDependencies": {
+        "react": ">= 16.8.0 || 17.x.x || ^18.0.0-0"
+      },
+      "peerDependenciesMeta": {
+        "@babel/core": {
+          "optional": true
+        },
+        "babel-plugin-macros": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "node_modules/tsconfig-paths": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
+      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
+      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
+    },
+    "node_modules/tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "dependencies": {
+        "tslib": "^1.8.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+      }
+    },
+    "node_modules/tsutils/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+    },
+    "node_modules/type": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "dependencies": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
+      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/use-sync-external-store": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
+      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/utf-8-validate": {
+      "version": "5.0.10",
+      "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz",
+      "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "node-gyp-build": "^4.3.0"
+      },
+      "engines": {
+        "node": ">=6.14.2"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/websocket": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.34.tgz",
+      "integrity": "sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ==",
+      "dependencies": {
+        "bufferutil": "^4.0.1",
+        "debug": "^2.2.0",
+        "es5-ext": "^0.10.50",
+        "typedarray-to-buffer": "^3.1.5",
+        "utf-8-validate": "^5.0.2",
+        "yaeti": "^0.0.6"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/websocket/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/websocket/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "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"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    },
+    "node_modules/yaeti": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
+      "integrity": "sha512-MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug==",
+      "engines": {
+        "node": ">=0.10.32"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  },
+  "dependencies": {
+    "@babel/runtime": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz",
+      "integrity": "sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==",
+      "requires": {
+        "regenerator-runtime": "^0.13.10"
+      }
+    },
+    "@babel/runtime-corejs3": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.20.1.tgz",
+      "integrity": "sha512-CGulbEDcg/ND1Im7fUNRZdGXmX2MTWVVZacQi/6DiKE5HNwZ3aVTm5PV4lO8HHz0B2h8WQyvKKjbX5XgTtydsg==",
+      "requires": {
+        "core-js-pure": "^3.25.1",
+        "regenerator-runtime": "^0.13.10"
+      }
+    },
+    "@eslint/eslintrc": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
+      "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
+      "requires": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.4.0",
+        "globals": "^13.15.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      }
+    },
+    "@humanwhocodes/config-array": {
+      "version": "0.11.7",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz",
+      "integrity": "sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==",
+      "requires": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.5"
+      }
+    },
+    "@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="
+    },
+    "@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
+    },
+    "@next/env": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-13.0.3.tgz",
+      "integrity": "sha512-/4WzeG61Ot/PxsghXkSqQJ6UohFfwXoZ3dtsypmR9EBP+OIax9JRq0trq8Z/LCT9Aq4JbihVkaazRWguORjTAw=="
+    },
+    "@next/eslint-plugin-next": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-13.0.3.tgz",
+      "integrity": "sha512-slmTAHNKDyc7jhx4VF8lFbmOPWJ3PShtUUWpb6x9+ga59CyOxgP6AdcDhxfapnWYACKe/TwYiaveufu7LqXgZg==",
+      "requires": {
+        "glob": "7.1.7"
+      }
+    },
+    "@next/swc-android-arm-eabi": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-13.0.3.tgz",
+      "integrity": "sha512-uxfUoj65CdFc1gX2q7GtBX3DhKv9Kn343LMqGNvXyuTpYTGMmIiVY7b9yF8oLWRV0gVKqhZBZifUmoPE8SJU6Q==",
+      "optional": true
+    },
+    "@next/swc-android-arm64": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-13.0.3.tgz",
+      "integrity": "sha512-t2k+WDfg7Cq2z/EnalKGsd/9E5F4Hdo1xu+UzZXYDpKUI9zgE6Bz8ajQb8m8txv3qOaWdKuDa5j5ziq9Acd1Xw==",
+      "optional": true
+    },
+    "@next/swc-darwin-arm64": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.0.3.tgz",
+      "integrity": "sha512-wV6j6SZ1bc/YHOLCLk9JVqaZTCCey6HBV7inl2DriHsHqIcO6F3+QiYf0KXwRP9BE0GSZZrYd5mZQm2JPTHdJA==",
+      "optional": true
+    },
+    "@next/swc-darwin-x64": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.0.3.tgz",
+      "integrity": "sha512-jaI2CMuYWvUtRixV3AIjUhnxUDU1FKOR+8hADMhYt3Yz+pCKuj4RZ0n0nY5qUf3qT1AtvnJXEgyatSFJhSp/wQ==",
+      "optional": true
+    },
+    "@next/swc-freebsd-x64": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-freebsd-x64/-/swc-freebsd-x64-13.0.3.tgz",
+      "integrity": "sha512-nbyT0toBTJrcj5TCB9pVnQpGJ3utGyQj4CWegZs1ulaeUQ5Z7CS/qt8nRyYyOKYHtOdSCJ9Nw5F/RgKNkdpOdw==",
+      "optional": true
+    },
+    "@next/swc-linux-arm-gnueabihf": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-13.0.3.tgz",
+      "integrity": "sha512-1naLxYvRUQCoFCU1nMkcQueRc0Iux9xBv1L5pzH2ejtIWFg8BrSgyuluJG4nyAhFCx4WG863IEIkAaefOowVdA==",
+      "optional": true
+    },
+    "@next/swc-linux-arm64-gnu": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.0.3.tgz",
+      "integrity": "sha512-3Z4A8JkuGWpMVbUhUPQInK/SLY+kijTT78Q/NZCrhLlyvwrVxaQALJNlXzxDLraUgv4oVH0Wz/FIw1W9PUUhxA==",
+      "optional": true
+    },
+    "@next/swc-linux-arm64-musl": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.0.3.tgz",
+      "integrity": "sha512-MoYe9SM40UaunTjC+01c9OILLH3uSoeri58kDMu3KF/EFEvn1LZ6ODeDj+SLGlAc95wn46hrRJS2BPmDDE+jFQ==",
+      "optional": true
+    },
+    "@next/swc-linux-x64-gnu": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.0.3.tgz",
+      "integrity": "sha512-z22T5WGnRanjLMXdF0NaNjSpBlEzzY43t5Ysp3nW1oI6gOkub6WdQNZeHIY7A2JwkgSWZmtjLtf+Fzzz38LHeQ==",
+      "optional": true
+    },
+    "@next/swc-linux-x64-musl": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.0.3.tgz",
+      "integrity": "sha512-ZOMT7zjBFmkusAtr47k8xs/oTLsNlTH6xvYb+iux7yly2hZGwhfBLzPGBsbeMZukZ96IphJTagT+C033s6LNVA==",
+      "optional": true
+    },
+    "@next/swc-win32-arm64-msvc": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.0.3.tgz",
+      "integrity": "sha512-Q4BM16Djl+Oah9UdGrvjFYgoftYB2jNd+rtRGPX5Mmxo09Ry/KiLbOZnoUyoIxKc1xPyfqMXuaVsAFQLYs0KEQ==",
+      "optional": true
+    },
+    "@next/swc-win32-ia32-msvc": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.0.3.tgz",
+      "integrity": "sha512-Sa8yGkNeRUsic8Qjf7MLIAfP0p0+einK/wIqJ8UO1y76j+8rRQu42AMs5H4Ax1fm9GEYq6I8njHtY59TVpTtGQ==",
+      "optional": true
+    },
+    "@next/swc-win32-x64-msvc": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.0.3.tgz",
+      "integrity": "sha512-IAptmSqA7k4tQzaw2NAkoEjj3+Dz9ceuvlEHwYh770MMDL4V0ku2m+UHrmn5HUCEDHhgwwjg2nyf6728q2jr1w==",
+      "optional": true
+    },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "requires": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      }
+    },
+    "@rushstack/eslint-patch": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz",
+      "integrity": "sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg=="
+    },
+    "@supabase/functions-js": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@supabase/functions-js/-/functions-js-2.0.0.tgz",
+      "integrity": "sha512-ozb7bds2yvf5k7NM2ZzUkxvsx4S4i2eRKFSJetdTADV91T65g4gCzEs9L3LUXSrghcGIkUaon03VPzOrFredqg==",
+      "requires": {
+        "cross-fetch": "^3.1.5"
+      }
+    },
+    "@supabase/gotrue-js": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@supabase/gotrue-js/-/gotrue-js-2.3.0.tgz",
+      "integrity": "sha512-e50w8LkfbxtI2SJxUbuQNM7pN+Yu3HYkvCLsidwBgivTdcoFOkhFodwLvWSVdeaxY1mH6Gm66RiKeUMn1+BAow==",
+      "requires": {
+        "cross-fetch": "^3.1.5"
+      }
+    },
+    "@supabase/postgrest-js": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@supabase/postgrest-js/-/postgrest-js-1.1.0.tgz",
+      "integrity": "sha512-qkY8TqIu5sJuae8gjeDPjEqPrefzcTraW9PNSVJQHq4TEv98ZmwaXGwBGz0bVL63bqrGA5hqREbQHkANUTXrvA==",
+      "requires": {
+        "cross-fetch": "^3.1.5"
+      }
+    },
+    "@supabase/realtime-js": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@supabase/realtime-js/-/realtime-js-2.1.0.tgz",
+      "integrity": "sha512-iplLCofTeYjnx9FIOsIwHLhMp0+7UVyiA4/sCeq40VdOgN9eTIhjEno9Tgh4dJARi4aaXoKfRX1DTxgZaOpPAw==",
+      "requires": {
+        "@types/phoenix": "^1.5.4",
+        "websocket": "^1.0.34"
+      }
+    },
+    "@supabase/storage-js": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@supabase/storage-js/-/storage-js-2.0.0.tgz",
+      "integrity": "sha512-7kXThdRt/xqnOOvZZxBqNkeX1CFNUWc0hYBJtNN/Uvt8ok9hD14foYmroWrHn046wEYFqUrB9U35JYsfTrvltA==",
+      "requires": {
+        "cross-fetch": "^3.1.5"
+      }
+    },
+    "@supabase/supabase-js": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@supabase/supabase-js/-/supabase-js-2.1.0.tgz",
+      "integrity": "sha512-hODrAUDSC6RV6EhwuSMyhaQCF32gij0EBTceuDR+8suJsg7XcyUG0fYgeYecWIvt0nz61xAMY6E+Ywb0tJaAng==",
+      "requires": {
+        "@supabase/functions-js": "^2.0.0",
+        "@supabase/gotrue-js": "^2.3.0",
+        "@supabase/postgrest-js": "^1.1.0",
+        "@supabase/realtime-js": "^2.1.0",
+        "@supabase/storage-js": "^2.0.0",
+        "cross-fetch": "^3.1.5"
+      }
+    },
+    "@swc/helpers": {
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.11.tgz",
+      "integrity": "sha512-rEUrBSGIoSFuYxwBYtlUFMlE2CwGhmW+w9355/5oduSw8e5h2+Tj4UrAGNNgP9915++wj5vkQo0UuOBqOAq4nw==",
+      "requires": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
+    },
+    "@types/node": {
+      "version": "18.11.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
+      "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg=="
+    },
+    "@types/phoenix": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@types/phoenix/-/phoenix-1.5.4.tgz",
+      "integrity": "sha512-L5eZmzw89eXBKkiqVBcJfU1QGx9y+wurRIEgt0cuLH0hwNtVUxtx+6cu0R2STwWj468sjXyBYPYDtGclUd1kjQ=="
+    },
+    "@types/prop-types": {
+      "version": "15.7.5",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
+      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
+    },
+    "@types/react": {
+      "version": "18.0.25",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.25.tgz",
+      "integrity": "sha512-xD6c0KDT4m7n9uD4ZHi02lzskaiqcBxf4zi+tXZY98a04wvc0hi/TcCPC2FOESZi51Nd7tlUeOJY8RofL799/g==",
+      "requires": {
+        "@types/prop-types": "*",
+        "@types/scheduler": "*",
+        "csstype": "^3.0.2"
+      }
+    },
+    "@types/react-dom": {
+      "version": "18.0.9",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.9.tgz",
+      "integrity": "sha512-qnVvHxASt/H7i+XG1U1xMiY5t+IHcPGUK7TDMDzom08xa7e86eCeKOiLZezwCKVxJn6NEiiy2ekgX8aQssjIKg==",
+      "requires": {
+        "@types/react": "*"
+      }
+    },
+    "@types/scheduler": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
+      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
+    },
+    "@typescript-eslint/parser": {
+      "version": "5.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.43.0.tgz",
+      "integrity": "sha512-2iHUK2Lh7PwNUlhFxxLI2haSDNyXvebBO9izhjhMoDC+S3XI9qt2DGFUsiJ89m2k7gGYch2aEpYqV5F/+nwZug==",
+      "requires": {
+        "@typescript-eslint/scope-manager": "5.43.0",
+        "@typescript-eslint/types": "5.43.0",
+        "@typescript-eslint/typescript-estree": "5.43.0",
+        "debug": "^4.3.4"
+      }
+    },
+    "@typescript-eslint/scope-manager": {
+      "version": "5.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.43.0.tgz",
+      "integrity": "sha512-XNWnGaqAtTJsUiZaoiGIrdJYHsUOd3BZ3Qj5zKp9w6km6HsrjPk/TGZv0qMTWyWj0+1QOqpHQ2gZOLXaGA9Ekw==",
+      "requires": {
+        "@typescript-eslint/types": "5.43.0",
+        "@typescript-eslint/visitor-keys": "5.43.0"
+      }
+    },
+    "@typescript-eslint/types": {
+      "version": "5.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.43.0.tgz",
+      "integrity": "sha512-jpsbcD0x6AUvV7tyOlyvon0aUsQpF8W+7TpJntfCUWU1qaIKu2K34pMwQKSzQH8ORgUrGYY6pVIh1Pi8TNeteg=="
+    },
+    "@typescript-eslint/typescript-estree": {
+      "version": "5.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.43.0.tgz",
+      "integrity": "sha512-BZ1WVe+QQ+igWal2tDbNg1j2HWUkAa+CVqdU79L4HP9izQY6CNhXfkNwd1SS4+sSZAP/EthI1uiCSY/+H0pROg==",
+      "requires": {
+        "@typescript-eslint/types": "5.43.0",
+        "@typescript-eslint/visitor-keys": "5.43.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      }
+    },
+    "@typescript-eslint/visitor-keys": {
+      "version": "5.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.43.0.tgz",
+      "integrity": "sha512-icl1jNH/d18OVHLfcwdL3bWUKsBeIiKYTGxMJCoGe7xFht+E4QgzOqoWYrU8XSLJWhVw8nTacbm03v23J/hFTg==",
+      "requires": {
+        "@typescript-eslint/types": "5.43.0",
+        "eslint-visitor-keys": "^3.3.0"
+      }
+    },
+    "acorn": {
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA=="
+    },
+    "acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "requires": {}
+    },
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+    },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
+    },
+    "argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+    },
+    "aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+      "requires": {
+        "@babel/runtime": "^7.10.2",
+        "@babel/runtime-corejs3": "^7.10.2"
+      }
+    },
+    "array-includes": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
+      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
+        "is-string": "^1.0.7"
+      }
+    },
+    "array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
+    },
+    "array.prototype.flat": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
+      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
+    "array.prototype.flatmap": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
+      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
+    "ast-types-flow": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+      "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag=="
+    },
+    "axe-core": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.5.2.tgz",
+      "integrity": "sha512-u2MVsXfew5HBvjsczCv+xlwdNnB1oQR9HlAcsejZttNjKKSkeDNVwB1vMThIUIFI9GoT57Vtk8iQLwqOfAkboA=="
+    },
+    "axobject-query": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
+      "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA=="
+    },
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
+    "bufferutil": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.7.tgz",
+      "integrity": "sha512-kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw==",
+      "requires": {
+        "node-gyp-build": "^4.3.0"
+      }
+    },
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
+    },
+    "caniuse-lite": {
+      "version": "1.0.30001431",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz",
+      "integrity": "sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ=="
+    },
+    "chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "requires": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      }
+    },
+    "client-only": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz",
+      "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA=="
+    },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "core-js-pure": {
+      "version": "3.26.1",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.26.1.tgz",
+      "integrity": "sha512-VVXcDpp/xJ21KdULRq/lXdLzQAtX7+37LzpyfFM973il0tWSsDEoyzG38G14AjTpK9VTfiNM9jnFauq/CpaWGQ=="
+    },
+    "cross-fetch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
+      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
+      "requires": {
+        "node-fetch": "2.6.7"
+      }
+    },
+    "cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "requires": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      }
+    },
+    "csstype": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
+      "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
+    },
+    "d": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "requires": {
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
+      }
+    },
+    "damerau-levenshtein": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
+      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA=="
+    },
+    "debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "requires": {
+        "ms": "2.1.2"
+      }
+    },
+    "deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
+    },
+    "define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "requires": {
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      }
+    },
+    "dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "requires": {
+        "path-type": "^4.0.0"
+      }
+    },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
+    },
+    "es-abstract": {
+      "version": "1.20.4",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
+      "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.3",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.2",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.4.3",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trimend": "^1.0.5",
+        "string.prototype.trimstart": "^1.0.5",
+        "unbox-primitive": "^1.0.2"
+      }
+    },
+    "es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "es5-ext": {
+      "version": "0.10.62",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
+      "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==",
+      "requires": {
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.3",
+        "next-tick": "^1.1.0"
+      }
+    },
+    "es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "es6-symbol": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "requires": {
+        "d": "^1.0.1",
+        "ext": "^1.1.2"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
+    },
+    "eslint": {
+      "version": "8.27.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.27.0.tgz",
+      "integrity": "sha512-0y1bfG2ho7mty+SiILVf9PfuRA49ek4Nc60Wmmu62QlobNR+CeXa4xXIJgcuwSQgZiWaPH+5BDsctpIW0PR/wQ==",
+      "requires": {
+        "@eslint/eslintrc": "^1.3.3",
+        "@humanwhocodes/config-array": "^0.11.6",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.4.0",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.15.0",
+        "grapheme-splitter": "^1.0.4",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-sdsl": "^4.1.4",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0"
+      }
+    },
+    "eslint-config-next": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.0.3.tgz",
+      "integrity": "sha512-i2JoQP8gGv303GjXTonA27fm1ckRRkRoAP1WYEQgN0D2DDoFeBPqlJgHlMHnXKWjmNct/sW8jQEvy9am2juc8g==",
+      "requires": {
+        "@next/eslint-plugin-next": "13.0.3",
+        "@rushstack/eslint-patch": "^1.1.3",
+        "@typescript-eslint/parser": "^5.42.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-import-resolver-typescript": "^2.7.1",
+        "eslint-plugin-import": "^2.26.0",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
+        "eslint-plugin-react": "^7.31.7",
+        "eslint-plugin-react-hooks": "^4.5.0"
+      }
+    },
+    "eslint-import-resolver-node": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "requires": {
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "eslint-import-resolver-typescript": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.7.1.tgz",
+      "integrity": "sha512-00UbgGwV8bSgUv34igBDbTOtKhqoRMy9bFjNehT40bXg6585PNIct8HhXZ0SybqB9rWtXj9crcku8ndDn/gIqQ==",
+      "requires": {
+        "debug": "^4.3.4",
+        "glob": "^7.2.0",
+        "is-glob": "^4.0.3",
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.1.1",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
+      }
+    },
+    "eslint-module-utils": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
+      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+      "requires": {
+        "debug": "^3.2.7"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "eslint-plugin-import": {
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
+      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "requires": {
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
+        "debug": "^2.6.9",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.3",
+        "has": "^1.0.3",
+        "is-core-module": "^2.8.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.values": "^1.1.5",
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "requires": {
+            "esutils": "^2.0.2"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        }
+      }
+    },
+    "eslint-plugin-jsx-a11y": {
+      "version": "6.6.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz",
+      "integrity": "sha512-sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q==",
+      "requires": {
+        "@babel/runtime": "^7.18.9",
+        "aria-query": "^4.2.2",
+        "array-includes": "^3.1.5",
+        "ast-types-flow": "^0.0.7",
+        "axe-core": "^4.4.3",
+        "axobject-query": "^2.2.0",
+        "damerau-levenshtein": "^1.0.8",
+        "emoji-regex": "^9.2.2",
+        "has": "^1.0.3",
+        "jsx-ast-utils": "^3.3.2",
+        "language-tags": "^1.0.5",
+        "minimatch": "^3.1.2",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+        }
+      }
+    },
+    "eslint-plugin-react": {
+      "version": "7.31.10",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.10.tgz",
+      "integrity": "sha512-e4N/nc6AAlg4UKW/mXeYWd3R++qUano5/o+t+wnWxIf+bLsOaH3a4q74kX3nDjYym3VBN4HyO9nEn1GcAqgQOA==",
+      "requires": {
+        "array-includes": "^3.1.5",
+        "array.prototype.flatmap": "^1.3.0",
+        "doctrine": "^2.1.0",
+        "estraverse": "^5.3.0",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.5",
+        "object.fromentries": "^2.0.5",
+        "object.hasown": "^1.1.1",
+        "object.values": "^1.1.5",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.3",
+        "semver": "^6.3.0",
+        "string.prototype.matchall": "^4.0.7"
+      },
+      "dependencies": {
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "requires": {
+            "esutils": "^2.0.2"
+          }
+        },
+        "resolve": {
+          "version": "2.0.0-next.4",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
+          "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
+          "requires": {
+            "is-core-module": "^2.9.0",
+            "path-parse": "^1.0.7",
+            "supports-preserve-symlinks-flag": "^1.0.0"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+        }
+      }
+    },
+    "eslint-plugin-react-hooks": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
+      "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
+      "requires": {}
+    },
+    "eslint-scope": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "requires": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      }
+    },
+    "eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "requires": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
+        }
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="
+    },
+    "espree": {
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
+      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
+      "requires": {
+        "acorn": "^8.8.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.3.0"
+      }
+    },
+    "esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "requires": {
+        "estraverse": "^5.1.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "requires": {
+        "estraverse": "^5.2.0"
+      }
+    },
+    "estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
+    },
+    "ext": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
+      "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
+      "requires": {
+        "type": "^2.7.2"
+      },
+      "dependencies": {
+        "type": {
+          "version": "2.7.2",
+          "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
+          "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="
+        }
+      }
+    },
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+    },
+    "fast-glob": {
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+      "requires": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "dependencies": {
+        "glob-parent": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        }
+      }
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
+    },
+    "fastq": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "requires": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "requires": {
+        "flat-cache": "^3.0.4"
+      }
+    },
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
+    "find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "requires": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      }
+    },
+    "flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "requires": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      }
+    },
+    "flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
+      }
+    },
+    "functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
+    },
+    "get-intrinsic": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      }
+    },
+    "get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      }
+    },
+    "glob": {
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "requires": {
+        "is-glob": "^4.0.3"
+      }
+    },
+    "globals": {
+      "version": "13.17.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+      "requires": {
+        "type-fest": "^0.20.2"
+      }
+    },
+    "globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "requires": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      }
+    },
+    "grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="
+    },
+    "has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+    },
+    "has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "requires": {
+        "get-intrinsic": "^1.1.1"
+      }
+    },
+    "has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+    },
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "ignore": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="
+    },
+    "import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "requires": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      }
+    },
+    "is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "requires": {
+        "has-bigints": "^1.0.1"
+      }
+    },
+    "is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
+    },
+    "is-core-module": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
+    },
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
+    },
+    "is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="
+    },
+    "is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
+    },
+    "is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
+    },
+    "is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+    },
+    "js-sdsl": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz",
+      "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q=="
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "requires": {
+        "argparse": "^2.0.1"
+      }
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
+    },
+    "json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "requires": {
+        "minimist": "^1.2.0"
+      }
+    },
+    "jsx-ast-utils": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz",
+      "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==",
+      "requires": {
+        "array-includes": "^3.1.5",
+        "object.assign": "^4.1.3"
+      }
+    },
+    "language-subtag-registry": {
+      "version": "0.3.22",
+      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz",
+      "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w=="
+    },
+    "language-tags": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
+      "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
+      "requires": {
+        "language-subtag-registry": "~0.3.2"
+      }
+    },
+    "levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "requires": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      }
+    },
+    "locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "requires": {
+        "p-locate": "^5.0.0"
+      }
+    },
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
+    "lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "requires": {
+        "yallist": "^4.0.0"
+      }
+    },
+    "merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
+    },
+    "micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "requires": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      }
+    },
+    "minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "nanoid": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
+    },
+    "next": {
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/next/-/next-13.0.3.tgz",
+      "integrity": "sha512-rFQeepcenRxKzeKlh1CsmEnxsJwhIERtbUjmYnKZyDInZsU06lvaGw5DT44rlNp1Rv2MT/e9vffZ8vK+ytwXHA==",
+      "requires": {
+        "@next/env": "13.0.3",
+        "@next/swc-android-arm-eabi": "13.0.3",
+        "@next/swc-android-arm64": "13.0.3",
+        "@next/swc-darwin-arm64": "13.0.3",
+        "@next/swc-darwin-x64": "13.0.3",
+        "@next/swc-freebsd-x64": "13.0.3",
+        "@next/swc-linux-arm-gnueabihf": "13.0.3",
+        "@next/swc-linux-arm64-gnu": "13.0.3",
+        "@next/swc-linux-arm64-musl": "13.0.3",
+        "@next/swc-linux-x64-gnu": "13.0.3",
+        "@next/swc-linux-x64-musl": "13.0.3",
+        "@next/swc-win32-arm64-msvc": "13.0.3",
+        "@next/swc-win32-ia32-msvc": "13.0.3",
+        "@next/swc-win32-x64-msvc": "13.0.3",
+        "@swc/helpers": "0.4.11",
+        "caniuse-lite": "^1.0.30001406",
+        "postcss": "8.4.14",
+        "styled-jsx": "5.1.0",
+        "use-sync-external-store": "1.2.0"
+      }
+    },
+    "next-tick": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
+      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
+    },
+    "node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "requires": {
+        "whatwg-url": "^5.0.0"
+      }
+    },
+    "node-gyp-build": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz",
+      "integrity": "sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg=="
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+    },
+    "object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
+    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+    },
+    "object.assign": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      }
+    },
+    "object.entries": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
+      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "object.fromentries": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
+      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "object.hasown": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
+      "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
+      "requires": {
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "object.values": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
+      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "requires": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      }
+    },
+    "p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "requires": {
+        "yocto-queue": "^0.1.0"
+      }
+    },
+    "p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "requires": {
+        "p-limit": "^3.0.2"
+      }
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
+    "path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
+    },
+    "path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+    },
+    "path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
+    "path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
+    },
+    "picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
+    "picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
+    },
+    "postcss": {
+      "version": "8.4.14",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
+      "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
+      "requires": {
+        "nanoid": "^3.3.4",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
+      }
+    },
+    "prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
+    },
+    "prop-types": {
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "requires": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+    },
+    "queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
+    },
+    "react": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
+      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+      "requires": {
+        "loose-envify": "^1.1.0"
+      }
+    },
+    "react-dom": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
+      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "scheduler": "^0.23.0"
+      }
+    },
+    "react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+    },
+    "regenerator-runtime": {
+      "version": "0.13.10",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
+      "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="
+    },
+    "regexp.prototype.flags": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
+      }
+    },
+    "regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="
+    },
+    "resolve": {
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "requires": {
+        "is-core-module": "^2.9.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
+    },
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
+    },
+    "rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "requires": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "safe-regex-test": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-regex": "^1.1.4"
+      }
+    },
+    "scheduler": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
+      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+      "requires": {
+        "loose-envify": "^1.1.0"
+      }
+    },
+    "semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "requires": {
+        "lru-cache": "^6.0.0"
+      }
+    },
+    "shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "requires": {
+        "shebang-regex": "^3.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
+    },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
+    "slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
+    },
+    "source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
+    },
+    "string.prototype.matchall": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
+      "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "regexp.prototype.flags": "^1.4.3",
+        "side-channel": "^1.0.4"
+      }
+    },
+    "string.prototype.trimend": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "string.prototype.trimstart": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "requires": {
+        "ansi-regex": "^5.0.1"
+      }
+    },
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="
+    },
+    "strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
+    },
+    "styled-jsx": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.0.tgz",
+      "integrity": "sha512-/iHaRJt9U7T+5tp6TRelLnqBqiaIT0HsO0+vgyj8hK2KUk7aejFqRrumqPUlAqDwAj8IbS/1hk3IhBAAK/FCUQ==",
+      "requires": {
+        "client-only": "0.0.1"
+      }
+    },
+    "supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "requires": {
+        "has-flag": "^4.0.0"
+      }
+    },
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
+    },
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
+    "tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "tsconfig-paths": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
+      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "requires": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "tslib": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
+      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
+    },
+    "tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "requires": {
+        "tslib": "^1.8.1"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
+      }
+    },
+    "type": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
+    },
+    "type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "requires": {
+        "prelude-ls": "^1.2.1"
+      }
+    },
+    "type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
+    },
+    "typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "requires": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
+    "typescript": {
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
+      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ=="
+    },
+    "unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      }
+    },
+    "uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "use-sync-external-store": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
+      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
+      "requires": {}
+    },
+    "utf-8-validate": {
+      "version": "5.0.10",
+      "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz",
+      "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==",
+      "requires": {
+        "node-gyp-build": "^4.3.0"
+      }
+    },
+    "webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "websocket": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.34.tgz",
+      "integrity": "sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ==",
+      "requires": {
+        "bufferutil": "^4.0.1",
+        "debug": "^2.2.0",
+        "es5-ext": "^0.10.50",
+        "typedarray-to-buffer": "^3.1.5",
+        "utf-8-validate": "^5.0.2",
+        "yaeti": "^0.0.6"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        }
+      }
+    },
+    "whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "requires": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "requires": {
+        "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"
+      }
+    },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    },
+    "yaeti": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
+      "integrity": "sha512-MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug=="
+    },
+    "yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
+    }
+  }
+}
diff --git a/examples/caching/with-nextjs-13-server-components/package.json b/examples/caching/with-nextjs-13-server-components/package.json
new file mode 100644
index 00000000000..c9f034b12d9
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "next13",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "dev": "next dev",
+    "build": "next build",
+    "start": "next start",
+    "lint": "next lint"
+  },
+  "dependencies": {
+    "@supabase/supabase-js": "^2.1.0",
+    "@types/node": "18.11.9",
+    "@types/react": "18.0.25",
+    "@types/react-dom": "18.0.9",
+    "eslint": "8.27.0",
+    "eslint-config-next": "13.0.3",
+    "next": "13.0.3",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
+    "typescript": "4.8.4"
+  }
+}
diff --git a/examples/caching/with-nextjs-13-server-components/pages/api/hello.ts b/examples/caching/with-nextjs-13-server-components/pages/api/hello.ts
new file mode 100644
index 00000000000..9bafa6e258d
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/pages/api/hello.ts
@@ -0,0 +1,10 @@
+// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
+import type { NextApiRequest, NextApiResponse } from 'next'
+
+type Data = {
+  name: string
+}
+
+export default function handler(req: NextApiRequest, res: NextApiResponse<Data>) {
+  res.status(200).json({ name: 'John Doe' })
+}
diff --git a/examples/caching/with-nextjs-13-server-components/public/favicon.ico b/examples/caching/with-nextjs-13-server-components/public/favicon.ico
new file mode 100644
index 00000000000..718d6fea483
Binary files /dev/null and b/examples/caching/with-nextjs-13-server-components/public/favicon.ico differ
diff --git a/examples/caching/with-nextjs-13-server-components/public/vercel.svg b/examples/caching/with-nextjs-13-server-components/public/vercel.svg
new file mode 100644
index 00000000000..fbf0e25a651
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/public/vercel.svg
@@ -0,0 +1,4 @@
+<svg width="283" height="64" viewBox="0 0 283 64" fill="none" 
+    xmlns="http://www.w3.org/2000/svg">
+    <path d="M141.04 16c-11.04 0-19 7.2-19 18s8.96 18 20 18c6.67 0 12.55-2.64 16.19-7.09l-7.65-4.42c-2.02 2.21-5.09 3.5-8.54 3.5-4.79 0-8.86-2.5-10.37-6.5h28.02c.22-1.12.35-2.28.35-3.5 0-10.79-7.96-17.99-19-17.99zm-9.46 14.5c1.25-3.99 4.67-6.5 9.45-6.5 4.79 0 8.21 2.51 9.45 6.5h-18.9zM248.72 16c-11.04 0-19 7.2-19 18s8.96 18 20 18c6.67 0 12.55-2.64 16.19-7.09l-7.65-4.42c-2.02 2.21-5.09 3.5-8.54 3.5-4.79 0-8.86-2.5-10.37-6.5h28.02c.22-1.12.35-2.28.35-3.5 0-10.79-7.96-17.99-19-17.99zm-9.45 14.5c1.25-3.99 4.67-6.5 9.45-6.5 4.79 0 8.21 2.51 9.45 6.5h-18.9zM200.24 34c0 6 3.92 10 10 10 4.12 0 7.21-1.87 8.8-4.92l7.68 4.43c-3.18 5.3-9.14 8.49-16.48 8.49-11.05 0-19-7.2-19-18s7.96-18 19-18c7.34 0 13.29 3.19 16.48 8.49l-7.68 4.43c-1.59-3.05-4.68-4.92-8.8-4.92-6.07 0-10 4-10 10zm82.48-29v46h-9V5h9zM36.95 0L73.9 64H0L36.95 0zm92.38 5l-27.71 48L73.91 5H84.3l17.32 30 17.32-30h10.39zm58.91 12v9.69c-1-.29-2.06-.49-3.2-.49-5.81 0-10 4-10 10V51h-9V17h9v9.2c0-5.08 5.91-9.2 13.2-9.2z" fill="#000"/>
+</svg>
\ No newline at end of file
diff --git a/examples/caching/with-nextjs-13-server-components/tsconfig.json b/examples/caching/with-nextjs-13-server-components/tsconfig.json
new file mode 100644
index 00000000000..6ef5cd577f6
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/tsconfig.json
@@ -0,0 +1,25 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve",
+    "incremental": true,
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ]
+  },
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+  "exclude": ["node_modules"]
+}
diff --git a/examples/caching/with-nextjs-13-server-components/utils/supabase.ts b/examples/caching/with-nextjs-13-server-components/utils/supabase.ts
new file mode 100644
index 00000000000..03729d0b486
--- /dev/null
+++ b/examples/caching/with-nextjs-13-server-components/utils/supabase.ts
@@ -0,0 +1,6 @@
+import { createClient } from '@supabase/supabase-js'
+
+export default createClient(
+  process.env.NEXT_PUBLIC_SUPABASE_URL!,
+  process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!
+)
diff --git a/examples/caching/with-nextjs-13/pages/api/hello.ts b/examples/caching/with-nextjs-13/pages/api/hello.ts
new file mode 100644
index 00000000000..f8bcc7e5cae
--- /dev/null
+++ b/examples/caching/with-nextjs-13/pages/api/hello.ts
@@ -0,0 +1,13 @@
+// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
+import type { NextApiRequest, NextApiResponse } from 'next'
+
+type Data = {
+  name: string
+}
+
+export default function handler(
+  req: NextApiRequest,
+  res: NextApiResponse<Data>
+) {
+  res.status(200).json({ name: 'John Doe' })
+}
diff --git a/examples/edge-functions/supabase/functions/oak-server/index.ts b/examples/edge-functions/supabase/functions/oak-server/index.ts
index 8e96d1f0033..3f9f192f3ca 100644
--- a/examples/edge-functions/supabase/functions/oak-server/index.ts
+++ b/examples/edge-functions/supabase/functions/oak-server/index.ts
@@ -6,7 +6,7 @@ router
   .get('/oak-server', (context) => {
     context.response.body = 'This is an example Oak server running on Edge Functions!'
   })
-  .post('/oak-server/greet', (context) => {
+  .post('/oak-server/greet', async (context) => {
     // Note: request body will be streamed to the function as chunks, set limit to 0 to fully read it.
     const result = context.request.body({ type: 'json', limit: 0 })
     const body = await result.value
diff --git a/examples/user-management/flutter-user-management/lib/pages/splash_page.dart b/examples/user-management/flutter-user-management/lib/pages/splash_page.dart
index e3e43044097..81fa9483325 100644
--- a/examples/user-management/flutter-user-management/lib/pages/splash_page.dart
+++ b/examples/user-management/flutter-user-management/lib/pages/splash_page.dart
@@ -9,7 +9,7 @@ class SplashPage extends StatefulWidget {
 }
 
 class _SplashPageState extends State<SplashPage> {
-  bool _redicrectCalled = false;
+  bool _redirectCalled = false;
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
@@ -18,11 +18,11 @@ class _SplashPageState extends State<SplashPage> {
 
   Future<void> _redirect() async {
     await Future.delayed(Duration.zero);
-    if (_redicrectCalled || !mounted) {
+    if (_redirectCalled || !mounted) {
       return;
     }
 
-    _redicrectCalled = true;
+    _redirectCalled = true;
     final session = supabase.auth.currentSession;
     if (session != null) {
       Navigator.of(context).pushReplacementNamed('/account');
diff --git a/i18n/README.bg.md b/i18n/README.bg.md
index 4396669bd19..34d87827c84 100644
--- a/i18n/README.bg.md
+++ b/i18n/README.bg.md
@@ -27,7 +27,7 @@
 
 За пълната документация посетете [supabase.com/docs](https://supabase.com/docs)
 
-За да видите как да допринасяте, посетете [Getting Started](./DEVELOPERS.md)
+За да видите как да допринасяте, посетете [Getting Started](../DEVELOPERS.md)
 
 ## Общност & поддръжка
 
diff --git a/i18n/README.fi.md b/i18n/README.fi.md
index a5a841f8ab9..c810718b5c0 100644
--- a/i18n/README.fi.md
+++ b/i18n/README.fi.md
@@ -27,7 +27,7 @@
 
 Katso täydelliset dokumentaatiot osoitteesta [supabase.com/docs](https://supabase.com/docs)
 
-Katso ohjeet osallistumiseen vierailemalla [Aloitus](./DEVELOPERS.md)
+Katso ohjeet osallistumiseen vierailemalla [Aloitus](../DEVELOPERS.md)
 
 ## Yhteisö ja tuki
 
diff --git a/i18n/README.fr.md b/i18n/README.fr.md
index 4bec5cf7840..33cd09fee3f 100644
--- a/i18n/README.fr.md
+++ b/i18n/README.fr.md
@@ -23,7 +23,7 @@
 
 Pour une documentation complète, visitez [supabase.com/docs](https://supabase.com/docs)
 
-Pour voir comment Contribuer, visitez [Getting Started](./DEVELOPERS.md)
+Pour voir comment Contribuer, visitez [Getting Started](../DEVELOPERS.md)
 
 ## Communauté et Support
 
diff --git a/i18n/README.jp.md b/i18n/README.jp.md
index 607d473082d..0b999954e1b 100644
--- a/i18n/README.jp.md
+++ b/i18n/README.jp.md
@@ -27,7 +27,7 @@
 
 詳しいドキュメントは[supabase.com/docs](https://supabase.com/docs)をご覧ください。
 
-コントリビュート方法は[Getting Started](./DEVELOPERS.md)をご覧ください。
+コントリビュート方法は[Getting Started](../DEVELOPERS.md)をご覧ください。
 
 ## コミュニティとサポート
 
diff --git a/i18n/README.ne.md b/i18n/README.ne.md
index b0f74099bcb..65fae41f714 100644
--- a/i18n/README.ne.md
+++ b/i18n/README.ne.md
@@ -5,9 +5,9 @@
 
 ---
 
-# सुपबेस
+# सुपाबेस
 
-[सुपबेस](https://supabase.com) एक खुल्ला स्रोत फायरबेस विकल्प हो। हामीले यसमा उद्यम-ग्रेडका खुल्ला स्रोत उपकरणहरू प्रयोग गरेर फायरबेसका सुविधाहरू निर्माण गर्दैछौं।
+[सुपाबेस](https://supabase.com) एक खुल्ला स्रोत फायरबेस विकल्प हो। हामीले यसमा उद्यम-ग्रेडका खुल्ला स्रोत उपकरणहरू प्रयोग गरेर फायरबेसका सुविधाहरू निर्माण गर्दैछौं।
 
 - [x] होस्ट गरिएको Postgres डाटाबेस
 - [x] रियलटाइम सदस्यताहरू
@@ -31,7 +31,7 @@
 
 ## स्थिति
 
-- [x] अल्फा: हामी ग्राहकहरु को एक सानो समूह संग सुपबेस परीक्षण गर्दैछौं।
+- [x] अल्फा: हामी ग्राहकहरु को एक सानो समूह संग सुपाबेस परीक्षण गर्दैछौं।
 - [x] सार्वजनिक अल्फा: सबैले [app.supabase.com](https://app.supabase.com) मा साइनअप गर्न सक्दछन्। तर तपाईं केहि अवरोधहरू प्राप्त गर्न सक्नुहुन्छ।
 - [x] सार्वजनिक बीटा: अधिकतर गैर-उद्यम प्रयोगका मामलाहरुका लागि पर्याप्त स्थिर।
 - [ ] सार्वजनिक: उत्पादन प्रयोगको लागि तयार।
@@ -44,16 +44,16 @@
 
 ## यो कसरी काम गर्दछ
 
-सुपबेस एक खुल्ला स्रोत उपकरणहरूको संयोजन हो। हामी उद्यम-ग्रेड, खुल्ला स्रोत उत्पादनहरू प्रयोग गरेर फायरबेसको सुविधाहरू निर्माण गर्दैछौं। यदि उपकरण र समुदायहरू एमआईटी, अपाचे २ वा बराबरका खुल्ला लाइसेन्सको साथ अवस्थित छन् भने हामी त्यसको प्रयोग र समर्थन गर्दछौं। यदि उपकरण अवस्थित छैन भने, हामी त्यसलाई आफैं सिर्जना गर्छौं र स्रोत खुल्ला गर्छौ । सुपबेस फायरबेसको १ देखि १ म्यापि होईन। हाम्रो उद्देश्य भनेको विकासकर्ताहरूलाई खुल्ला-स्रोत उपकरणहरू प्रयोग गरेर फायरबेस जस्तो अनुभव दिने हो।
+सुपाबेस एक खुल्ला स्रोत उपकरणहरूको संयोजन हो। हामी उद्यम-ग्रेड, खुल्ला स्रोत उत्पादनहरू प्रयोग गरेर फायरबेसको सुविधाहरू निर्माण गर्दैछौं। यदि उपकरण र समुदायहरू एमआईटी, अपाचे २ वा बराबरका खुल्ला लाइसेन्सको साथ अवस्थित छन् भने हामी त्यसको प्रयोग र समर्थन गर्दछौं। यदि उपकरण अवस्थित छैन भने, हामी त्यसलाई आफैं सिर्जना गर्छौं र स्रोत खुल्ला गर्छौ । सुपाबेस फायरबेसको १ देखि १ म्यापि होईन। हाम्रो उद्देश्य भनेको विकासकर्ताहरूलाई खुल्ला-स्रोत उपकरणहरू प्रयोग गरेर फायरबेस जस्तो अनुभव दिने हो।
 
 **वर्तमान योजना**
 
-सुपबेस एक [होस्ट गरिएको प्लेटफर्म](https://app.supabase.com) हो। तपाई आफै साइन अप गर्न सक्नुहुन्छ र कुनै स्थापना बिना सुपबेस प्रयोग गर्न सक्नुहुन्छ। हामी अझै स्थानीय विकासको अनुभव सिर्जना गर्दैछौं। यो प्लेटफर्म स्थिरताको साथ हाम्रो मूल फोकस हो।
+सुपाबेस एक [होस्ट गरिएको प्लेटफर्म](https://app.supabase.com) हो। तपाई आफै साइन अप गर्न सक्नुहुन्छ र कुनै स्थापना बिना सुपाबेस प्रयोग गर्न सक्नुहुन्छ। हामी अझै स्थानीय विकासको अनुभव सिर्जना गर्दैछौं। यो प्लेटफर्म स्थिरताको साथ हाम्रो मूल फोकस हो।
 
 ![आर्किटेक्चर](https://user-images.githubusercontent.com/70828596/187547862-ffa9d058-0c3a-4851-a3e7-92ccfca4b596.png)
 
 - [PostgreSQL](https://www.postgresql.org/) एक वस्तु-रिलेशनल डाटाबेस प्रणाली हो जसले ३० बर्ष भन्दा बढी सक्रिय विकासको साथ विश्वसनीयता, सुविधा मजबूती र प्रदर्शनको बलियो प्रतिष्ठा कमाएको छ।
-- [Realtime](https://github.com/supabase/realtime) एक Elixer सर्भर हो जसले तपाइँलाई वेबसकेटहरू प्रयोग गरेर PostgreSQL इन्सर्टहरू, अपडेटहरु, र डिलीटहरु सुन्न अनुमति दिन्छ। सुपबेसले पोष्टग्रेसको भित्र निर्मित प्रतिकृति कार्यक्षमता सुन्दछ, प्रतिकृति बाइट स्ट्रिमलाई JSON मा रूपान्तरण गर्दछ, र त्यसपछि JSON लाई वेबसकेटमा प्रसारण गर्दछ।।
+- [Realtime](https://github.com/supabase/realtime) एक Elixer सर्भर हो जसले तपाइँलाई वेबसकेटहरू प्रयोग गरेर PostgreSQL इन्सर्टहरू, अपडेटहरु, र डिलीटहरु सुन्न अनुमति दिन्छ। सुपाबेसले पोष्टग्रेसको भित्र निर्मित प्रतिकृति कार्यक्षमता सुन्दछ, प्रतिकृति बाइट स्ट्रिमलाई JSON मा रूपान्तरण गर्दछ, र त्यसपछि JSON लाई वेबसकेटमा प्रसारण गर्दछ।।
 - [PostgREST](http://postgrest.org/) एक वेब सर्वर हो जसले तपाईको PostgreSQL डाटाबेसलाई सीधा एक RESTful एपीआई मा बदल्छ।
 - [Storage](https://github.com/supabase/storage-api) ले अनुमतिहरू प्रबन्ध गर्न पोष्टग्रेस प्रयोग गरेर S3 मा भण्डारित फाइलहरू प्रबन्ध गर्नका लागि RESTful ईन्टरफेस प्रदान गर्दछ।
 - [postgres-meta](https://github.com/supabase/postgres-meta) तपाईंको Postgres प्रबन्धको लागि RESTful एपीआई हो जसले तपाईंलाई टेबुलहरू प्राप्त गर्न, भूमिकाहरू थप्न र प्रश्नहरू चलाउन र अधिकको लागि अनुमति दिन्छ।
diff --git a/i18n/README.pt-br.md b/i18n/README.pt-br.md
index 66d5e0cafe4..63983cb8028 100644
--- a/i18n/README.pt-br.md
+++ b/i18n/README.pt-br.md
@@ -27,7 +27,7 @@
 
 Para documentação completa, visite [supabase.com/docs](https://supabase.com/docs)
 
-Para ver como Contribuir, visite [Primeiros Passos](./DEVELOPERS.md)
+Para ver como Contribuir, visite [Primeiros Passos](../DEVELOPERS.md)
 
 ## Comunidade & Suporte
 
@@ -142,7 +142,7 @@ Nossa biblioteca de cliente é modular. Cada sub-biblioteca é uma implementaç
     <td>-</td>
     <td><a href="https://github.com/supabase-community/gotrue-java" target="_blank" rel="noopener noreferrer">gotrue-java</a></td>
     <td>-</td>
-    <td>-</td>
+    <td><a href="https://github.com/supabase-community/storage-java" target="_blank" rel="noopener noreferrer">storage-java</a></td>
     <td>-</td>
   </tr>
   <tr>
diff --git a/i18n/README.sr.md b/i18n/README.sr.md
index 2d3889901ed..e85529abdfa 100644
--- a/i18n/README.sr.md
+++ b/i18n/README.sr.md
@@ -27,7 +27,7 @@
 
 Za punu dokumentaciju, posetite [supabase.com/docs](https://supabase.com/docs)
 
-Da vidite kako možete doprineti razvoju, posetite [Getting Started](./DEVELOPERS.md)
+Da vidite kako možete doprineti razvoju, posetite [Getting Started](../DEVELOPERS.md)
 
 ## Zajednica & Podrška
 
diff --git a/i18n/README.vi-vn.md b/i18n/README.vi-vn.md
index 090c6f6f2e8..6e5994784ef 100644
--- a/i18n/README.vi-vn.md
+++ b/i18n/README.vi-vn.md
@@ -27,7 +27,7 @@
 
 Để có tài liệu đầy đủ, hãy truy cập [supabase.com/docs](https://supabase.com/docs)
 
-Để biết cách Đóng góp, hãy truy cập [Bắt đầu](./DEVELOPERS.md)
+Để biết cách Đóng góp, hãy truy cập [Bắt đầu](../DEVELOPERS.md)
 
 ## Hỗ trợ & Cộng đồng
 
diff --git a/package-lock.json b/package-lock.json
index 95377a815ed..a88e70ca30c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -868,7 +868,7 @@
         "next-seo": "^4.20.0",
         "next-transpile-modules": "^9.0.0",
         "nodemailer": "^6.7.3",
-        "octokit": "^2.0.10",
+        "octokit": "^2.0.14",
         "parse-numeric-range": "^1.3.0",
         "react": "^17.0.2",
         "react-copy-to-clipboard": "^5.0.2",
@@ -4406,6 +4406,124 @@
         "@jridgewell/sourcemap-codec": "1.4.14"
       }
     },
+    "node_modules/@mapbox/node-pre-gyp": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz",
+      "integrity": "sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==",
+      "dev": true,
+      "dependencies": {
+        "detect-libc": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "make-dir": "^3.1.0",
+        "node-fetch": "^2.6.7",
+        "nopt": "^5.0.0",
+        "npmlog": "^5.0.1",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.11"
+      },
+      "bin": {
+        "node-pre-gyp": "bin/node-pre-gyp"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/are-we-there-yet": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
+      "dev": true,
+      "dependencies": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/gauge": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
+      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
+      "dev": true,
+      "dependencies": {
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.2",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.1",
+        "object-assign": "^4.1.1",
+        "signal-exit": "^3.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/npmlog": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+      "dev": true,
+      "dependencies": {
+        "are-we-there-yet": "^2.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^3.0.0",
+        "set-blocking": "^2.0.0"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@mdx-js/loader": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@mdx-js/loader/-/loader-2.1.5.tgz",
@@ -5096,51 +5214,77 @@
       }
     },
     "node_modules/@octokit/app": {
-      "version": "13.0.11",
-      "resolved": "https://registry.npmjs.org/@octokit/app/-/app-13.0.11.tgz",
-      "integrity": "sha512-qlUynCN1+BNYQ6VaJOMCqDdCo/2yzPixuoFnbcUThakRV+5969Tp+LTAtsZWjjb/tUHfutaAYOnsia1EGTAzfA==",
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/@octokit/app/-/app-13.1.2.tgz",
+      "integrity": "sha512-Kf+h5sa1SOI33hFsuHvTsWj1jUrjp1x4MuiJBq7U/NicfEGa6nArPUoDnyfP/YTmcQ5cQ5yvOgoIBkbwPg6kzQ==",
       "dependencies": {
-        "@octokit/auth-app": "^4.0.0",
+        "@octokit/auth-app": "^4.0.8",
         "@octokit/auth-unauthenticated": "^3.0.0",
         "@octokit/core": "^4.0.0",
         "@octokit/oauth-app": "^4.0.7",
-        "@octokit/plugin-paginate-rest": "^5.0.0",
-        "@octokit/types": "^8.0.0",
+        "@octokit/plugin-paginate-rest": "^6.0.0",
+        "@octokit/types": "^9.0.0",
         "@octokit/webhooks": "^10.0.0"
       },
       "engines": {
         "node": ">= 14"
       }
     },
+    "node_modules/@octokit/app/node_modules/@octokit/openapi-types": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+      "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+    },
+    "node_modules/@octokit/app/node_modules/@octokit/types": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+      "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^16.0.0"
+      }
+    },
     "node_modules/@octokit/auth-app": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-app/-/auth-app-4.0.7.tgz",
-      "integrity": "sha512-hjjVCoI/+1oLminVHJPPexguYb9FP4Q60hEHExgy1uAKMMJ5Zf8iJIeRJlIIqneTb4vt7NvUTEj4YDxBLZ1FLg==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-app/-/auth-app-4.0.9.tgz",
+      "integrity": "sha512-VFpKIXhHO+kVJtane5cEvdYPtjDKCOI0uKsRrsZfJP+uEu7rcPbQCLCcRKgyT+mUIzGr1IIOmwP/lFqSip1dXA==",
       "dependencies": {
         "@octokit/auth-oauth-app": "^5.0.0",
         "@octokit/auth-oauth-user": "^2.0.0",
         "@octokit/request": "^6.0.0",
         "@octokit/request-error": "^3.0.0",
-        "@octokit/types": "^8.0.0",
+        "@octokit/types": "^9.0.0",
         "@types/lru-cache": "^5.1.0",
         "deprecation": "^2.3.1",
         "lru-cache": "^6.0.0",
-        "universal-github-app-jwt": "^1.0.1",
+        "universal-github-app-jwt": "^1.1.1",
         "universal-user-agent": "^6.0.0"
       },
       "engines": {
         "node": ">= 14"
       }
     },
+    "node_modules/@octokit/auth-app/node_modules/@octokit/openapi-types": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+      "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+    },
+    "node_modules/@octokit/auth-app/node_modules/@octokit/types": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+      "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^16.0.0"
+      }
+    },
     "node_modules/@octokit/auth-oauth-app": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-app/-/auth-oauth-app-5.0.4.tgz",
-      "integrity": "sha512-zlWuii5hAN50vsV6SJC+uIJ7SMhyWjQMEmKJQxkmNDlieE9LjnkZnbOjqRsfcG7VO7WTl4K8ccpo/3A7Kdpmrw==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-app/-/auth-oauth-app-5.0.5.tgz",
+      "integrity": "sha512-UPX1su6XpseaeLVCi78s9droxpGtBWIgz9XhXAx9VXabksoF0MyI5vaa1zo1njyYt6VaAjFisC2A2Wchcu2WmQ==",
       "dependencies": {
         "@octokit/auth-oauth-device": "^4.0.0",
         "@octokit/auth-oauth-user": "^2.0.0",
         "@octokit/request": "^6.0.0",
-        "@octokit/types": "^8.0.0",
+        "@octokit/types": "^9.0.0",
         "@types/btoa-lite": "^1.0.0",
         "btoa-lite": "^1.0.0",
         "universal-user-agent": "^6.0.0"
@@ -5149,29 +5293,55 @@
         "node": ">= 14"
       }
     },
+    "node_modules/@octokit/auth-oauth-app/node_modules/@octokit/openapi-types": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+      "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+    },
+    "node_modules/@octokit/auth-oauth-app/node_modules/@octokit/types": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+      "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^16.0.0"
+      }
+    },
     "node_modules/@octokit/auth-oauth-device": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-device/-/auth-oauth-device-4.0.3.tgz",
-      "integrity": "sha512-KPTx5nMntKjNZzzltO3X4T68v22rd7Cp/TcLJXQE2U8aXPcZ9LFuww9q9Q5WUNSu3jwi3lRwzfkPguRfz1R8Vg==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-device/-/auth-oauth-device-4.0.4.tgz",
+      "integrity": "sha512-Xl85BZYfqCMv+Uvz33nVVUjE7I/PVySNaK6dRRqlkvYcArSr9vRcZC9KVjXYObGRTCN6mISeYdakAZvWEN4+Jw==",
       "dependencies": {
         "@octokit/oauth-methods": "^2.0.0",
         "@octokit/request": "^6.0.0",
-        "@octokit/types": "^8.0.0",
+        "@octokit/types": "^9.0.0",
         "universal-user-agent": "^6.0.0"
       },
       "engines": {
         "node": ">= 14"
       }
     },
+    "node_modules/@octokit/auth-oauth-device/node_modules/@octokit/openapi-types": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+      "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+    },
+    "node_modules/@octokit/auth-oauth-device/node_modules/@octokit/types": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+      "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^16.0.0"
+      }
+    },
     "node_modules/@octokit/auth-oauth-user": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-user/-/auth-oauth-user-2.0.4.tgz",
-      "integrity": "sha512-HrbDzTPqz6GcGSOUkR+wSeF3vEqsb9NMsmPja/qqqdiGmlk/Czkxctc3KeWYogHonp62Ml4kjz2VxKawrFsadQ==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-user/-/auth-oauth-user-2.1.1.tgz",
+      "integrity": "sha512-JgqnNNPf9CaWLxWm9uh2WgxcaVYhxBR09NVIPTiMU2dVZ3FObOHs3njBiLNw+zq84k+rEdm5Y7AsiASrZ84Apg==",
       "dependencies": {
         "@octokit/auth-oauth-device": "^4.0.0",
         "@octokit/oauth-methods": "^2.0.0",
         "@octokit/request": "^6.0.0",
-        "@octokit/types": "^8.0.0",
+        "@octokit/types": "^9.0.0",
         "btoa-lite": "^1.0.0",
         "universal-user-agent": "^6.0.0"
       },
@@ -5179,6 +5349,19 @@
         "node": ">= 14"
       }
     },
+    "node_modules/@octokit/auth-oauth-user/node_modules/@octokit/openapi-types": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+      "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+    },
+    "node_modules/@octokit/auth-oauth-user/node_modules/@octokit/types": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+      "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^16.0.0"
+      }
+    },
     "node_modules/@octokit/auth-token": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.2.tgz",
@@ -5191,17 +5374,30 @@
       }
     },
     "node_modules/@octokit/auth-unauthenticated": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-unauthenticated/-/auth-unauthenticated-3.0.3.tgz",
-      "integrity": "sha512-IyfLo1T5GmIC9+07hHGlD3gHtZI1Bona8PLhHXUnwcYDuZt0BhjlNJDYMoPG21C4r7v7+ZSxQHBKrGgkxpYb7A==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-unauthenticated/-/auth-unauthenticated-3.0.4.tgz",
+      "integrity": "sha512-AT74XGBylcLr4lmUp1s6mjSUgphGdlse21Qjtv5DzpX1YOl5FXKwvNcZWESdhyBbpDT8VkVyLFqa/7a7eqpPNw==",
       "dependencies": {
         "@octokit/request-error": "^3.0.0",
-        "@octokit/types": "^8.0.0"
+        "@octokit/types": "^9.0.0"
       },
       "engines": {
         "node": ">= 14"
       }
     },
+    "node_modules/@octokit/auth-unauthenticated/node_modules/@octokit/openapi-types": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+      "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+    },
+    "node_modules/@octokit/auth-unauthenticated/node_modules/@octokit/types": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+      "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^16.0.0"
+      }
+    },
     "node_modules/@octokit/core": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/@octokit/core/-/core-4.1.0.tgz",
@@ -5254,9 +5450,9 @@
       }
     },
     "node_modules/@octokit/oauth-app": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/oauth-app/-/oauth-app-4.1.0.tgz",
-      "integrity": "sha512-dGZcfmwPkS3VZ9CNnvNszp6mlnbOZh9+/uPNiK/AkvSUJGXTbUVIZTkMvAjbyIFw2WlIx++hhtrTeKNJq6uMbw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/oauth-app/-/oauth-app-4.2.0.tgz",
+      "integrity": "sha512-gyGclT77RQMkVUEW3YBeAKY+LBSc5u3eC9Wn/Uwt3WhuKuu9mrV18EnNpDqmeNll+mdV02yyBROU29Tlili6gg==",
       "dependencies": {
         "@octokit/auth-oauth-app": "^5.0.0",
         "@octokit/auth-oauth-user": "^2.0.0",
@@ -5281,31 +5477,44 @@
       }
     },
     "node_modules/@octokit/oauth-methods": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@octokit/oauth-methods/-/oauth-methods-2.0.4.tgz",
-      "integrity": "sha512-RDSa6XL+5waUVrYSmOlYROtPq0+cfwppP4VaQY/iIei3xlFb0expH6YNsxNrZktcLhJWSpm9uzeom+dQrXlS3A==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@octokit/oauth-methods/-/oauth-methods-2.0.5.tgz",
+      "integrity": "sha512-yQP6B5gE3axNxuM3U9KqWs/ErAQ+WLPaPgC/7EjsZsQibkf8sjdAfF8/y/EJW+Dd05XQvadX4WhQZPMnO1SE1A==",
       "dependencies": {
         "@octokit/oauth-authorization-url": "^5.0.0",
-        "@octokit/request": "^6.0.0",
-        "@octokit/request-error": "^3.0.0",
-        "@octokit/types": "^8.0.0",
+        "@octokit/request": "^6.2.3",
+        "@octokit/request-error": "^3.0.3",
+        "@octokit/types": "^9.0.0",
         "btoa-lite": "^1.0.0"
       },
       "engines": {
         "node": ">= 14"
       }
     },
+    "node_modules/@octokit/oauth-methods/node_modules/@octokit/openapi-types": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+      "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+    },
+    "node_modules/@octokit/oauth-methods/node_modules/@octokit/types": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+      "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^16.0.0"
+      }
+    },
     "node_modules/@octokit/openapi-types": {
       "version": "14.0.0",
       "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-14.0.0.tgz",
       "integrity": "sha512-HNWisMYlR8VCnNurDU6os2ikx0s0VyEjDYHNS/h4cgb8DeOxQ0n72HyinUtdDVxJhFy3FWLGl0DJhfEWk3P5Iw=="
     },
     "node_modules/@octokit/plugin-paginate-rest": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-5.0.1.tgz",
-      "integrity": "sha512-7A+rEkS70pH36Z6JivSlR7Zqepz3KVucEFVDnSrgHXzG7WLAzYwcHZbKdfTXHwuTHbkT1vKvz7dHl1+HNf6Qyw==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-6.0.0.tgz",
+      "integrity": "sha512-Sq5VU1PfT6/JyuXPyt04KZNVsFOSBaYOAq2QRZUwzVlI10KFvcbUo8lR258AAQL1Et60b0WuVik+zOWKLuDZxw==",
       "dependencies": {
-        "@octokit/types": "^8.0.0"
+        "@octokit/types": "^9.0.0"
       },
       "engines": {
         "node": ">= 14"
@@ -5314,12 +5523,25 @@
         "@octokit/core": ">=4"
       }
     },
-    "node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-6.7.0.tgz",
-      "integrity": "sha512-orxQ0fAHA7IpYhG2flD2AygztPlGYNAdlzYz8yrD8NDgelPfOYoRPROfEyIe035PlxvbYrgkfUZIhSBKju/Cvw==",
+    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+      "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+    },
+    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+      "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
       "dependencies": {
-        "@octokit/types": "^8.0.0",
+        "@octokit/openapi-types": "^16.0.0"
+      }
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-7.0.1.tgz",
+      "integrity": "sha512-pnCaLwZBudK5xCdrR823xHGNgqOzRnJ/mpC/76YPpNP7DybdsJtP7mdOwh+wYZxK5jqeQuhu59ogMI4NRlBUvA==",
+      "dependencies": {
+        "@octokit/types": "^9.0.0",
         "deprecation": "^2.3.1"
       },
       "engines": {
@@ -5329,6 +5551,19 @@
         "@octokit/core": ">=3"
       }
     },
+    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+      "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+      "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^16.0.0"
+      }
+    },
     "node_modules/@octokit/plugin-retry": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/@octokit/plugin-retry/-/plugin-retry-4.0.3.tgz",
@@ -5345,11 +5580,11 @@
       }
     },
     "node_modules/@octokit/plugin-throttling": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-4.3.2.tgz",
-      "integrity": "sha512-ZaCK599h3tzcoy0Jtdab95jgmD7X9iAk59E2E7hYKCAmnURaI4WpzwL9vckImilybUGrjY1JOWJapDs2N2D3vw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-5.0.1.tgz",
+      "integrity": "sha512-I4qxs7wYvYlFuY3PAUGWAVPhFXG3RwnvTiSr5Fu/Auz7bYhDLnzS2MjwV8nGLq/FPrWwYiweeZrI5yjs1YG4tQ==",
       "dependencies": {
-        "@octokit/types": "^8.0.0",
+        "@octokit/types": "^9.0.0",
         "bottleneck": "^2.15.3"
       },
       "engines": {
@@ -5359,14 +5594,27 @@
         "@octokit/core": "^4.0.0"
       }
     },
+    "node_modules/@octokit/plugin-throttling/node_modules/@octokit/openapi-types": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+      "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+    },
+    "node_modules/@octokit/plugin-throttling/node_modules/@octokit/types": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+      "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^16.0.0"
+      }
+    },
     "node_modules/@octokit/request": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-6.2.2.tgz",
-      "integrity": "sha512-6VDqgj0HMc2FUX2awIs+sM6OwLgwHvAi4KCK3mT2H2IKRt6oH9d0fej5LluF5mck1lRR/rFWN0YIDSYXYSylbw==",
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-6.2.3.tgz",
+      "integrity": "sha512-TNAodj5yNzrrZ/VxP+H5HiYaZep0H3GU0O7PaF+fhDrt8FPrnkei9Aal/txsN/1P7V3CPiThG0tIvpPDYUsyAA==",
       "dependencies": {
         "@octokit/endpoint": "^7.0.0",
         "@octokit/request-error": "^3.0.0",
-        "@octokit/types": "^8.0.0",
+        "@octokit/types": "^9.0.0",
         "is-plain-object": "^5.0.0",
         "node-fetch": "^2.6.7",
         "universal-user-agent": "^6.0.0"
@@ -5376,11 +5624,11 @@
       }
     },
     "node_modules/@octokit/request-error": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.2.tgz",
-      "integrity": "sha512-WMNOFYrSaX8zXWoJg9u/pKgWPo94JXilMLb2VManNOby9EZxrQaBe/QSC4a1TzpAlpxofg2X/jMnCyZgL6y7eg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.3.tgz",
+      "integrity": "sha512-crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ==",
       "dependencies": {
-        "@octokit/types": "^8.0.0",
+        "@octokit/types": "^9.0.0",
         "deprecation": "^2.0.0",
         "once": "^1.4.0"
       },
@@ -5388,6 +5636,32 @@
         "node": ">= 14"
       }
     },
+    "node_modules/@octokit/request-error/node_modules/@octokit/openapi-types": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+      "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+    },
+    "node_modules/@octokit/request-error/node_modules/@octokit/types": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+      "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^16.0.0"
+      }
+    },
+    "node_modules/@octokit/request/node_modules/@octokit/openapi-types": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+      "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+    },
+    "node_modules/@octokit/request/node_modules/@octokit/types": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+      "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^16.0.0"
+      }
+    },
     "node_modules/@octokit/request/node_modules/is-plain-object": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
@@ -5405,13 +5679,13 @@
       }
     },
     "node_modules/@octokit/webhooks": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/@octokit/webhooks/-/webhooks-10.3.1.tgz",
-      "integrity": "sha512-TSGiz9+IxP8Oh8LVFwhzLYTJ+8T/U6/fC/i1/iB39izyFzoEub3wNHlsfh8A6PUbde70w2pLr/O2ELlyQdrLgg==",
+      "version": "10.7.0",
+      "resolved": "https://registry.npmjs.org/@octokit/webhooks/-/webhooks-10.7.0.tgz",
+      "integrity": "sha512-zZBbQMpXXnK/ki/utrFG/TuWv9545XCSLibfDTxrYqR1PmU6zel02ebTOrA7t5XIGHzlEOc/NgISUIBUe7pMFA==",
       "dependencies": {
         "@octokit/request-error": "^3.0.0",
         "@octokit/webhooks-methods": "^3.0.0",
-        "@octokit/webhooks-types": "6.6.0",
+        "@octokit/webhooks-types": "6.10.0",
         "aggregate-error": "^3.1.0"
       },
       "engines": {
@@ -5419,17 +5693,17 @@
       }
     },
     "node_modules/@octokit/webhooks-methods": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@octokit/webhooks-methods/-/webhooks-methods-3.0.1.tgz",
-      "integrity": "sha512-XftYVcBxtzC2G05kdBNn9IYLtQ+Cz6ufKkjZd0DU/qGaZEFTPzM2OabXAWG5tvL0q/I+Exio1JnRiPfetiMSEw==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@octokit/webhooks-methods/-/webhooks-methods-3.0.2.tgz",
+      "integrity": "sha512-Vlnv5WBscf07tyAvfDbp7pTkMZUwk7z7VwEF32x6HqI+55QRwBTcT+D7DDjZXtad/1dU9E32x0HmtDlF9VIRaQ==",
       "engines": {
         "node": ">= 14"
       }
     },
     "node_modules/@octokit/webhooks-types": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@octokit/webhooks-types/-/webhooks-types-6.6.0.tgz",
-      "integrity": "sha512-czpEwg4UA3hb0G345BVk1zMXWwX0Qdaa4F/z7C3bP6baQ9AWY/VmCYydLU+Pi4z3aOPEJYCvt9zVhZ5CutqBKw=="
+      "version": "6.10.0",
+      "resolved": "https://registry.npmjs.org/@octokit/webhooks-types/-/webhooks-types-6.10.0.tgz",
+      "integrity": "sha512-lDNv83BeEyxxukdQ0UttiUXawk9+6DkdjjFtm2GFED+24IQhTVaoSbwV9vWWKONyGLzRmCQqZmoEWkDhkEmPlw=="
     },
     "node_modules/@pmmmwh/react-refresh-webpack-plugin": {
       "version": "0.5.9",
@@ -7115,9 +7389,10 @@
       }
     },
     "node_modules/@sinclair/typebox": {
-      "version": "0.19.2",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.19.2.tgz",
-      "integrity": "sha512-0U/RVPZQw1QxhrbKV0o281ZWI1Ve3osJnyEYnwOp3slydIQHyXumbJANJeNv9BqABDiHWlmzsxSVopPHMvt3Aw=="
+      "version": "0.25.21",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.21.tgz",
+      "integrity": "sha512-gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g==",
+      "dev": true
     },
     "node_modules/@sinonjs/commons": {
       "version": "1.8.5",
@@ -9594,17 +9869,22 @@
       }
     },
     "node_modules/@supabase/postgres-meta": {
-      "version": "0.26.1",
-      "resolved": "https://registry.npmjs.org/@supabase/postgres-meta/-/postgres-meta-0.26.1.tgz",
-      "integrity": "sha512-z4ws1fD+sPwb+J2PRMe2/Oe4HuVwGjPESjFqCR8uiWauTlfbtYR0bXFPMxPA6SkJFqOq/86uJPwzHgHURWZDiA==",
+      "version": "0.60.2",
+      "resolved": "https://registry.npmjs.org/@supabase/postgres-meta/-/postgres-meta-0.60.2.tgz",
+      "integrity": "sha512-Fjc5xKPzZJ38FhY3IbDFZ5cgVxPJTn8psLkgljZgBOMUyCd3QY3W1jV8rjwAkLfz/lxIOa2KlKZTIswMZMx4WQ==",
+      "dev": true,
       "dependencies": {
-        "@sinclair/typebox": "^0.19.2",
+        "@sinclair/typebox": "^0.25.1",
         "pg": "^8.7.1",
-        "pg-format": "^1.0.4"
+        "pg-format": "^1.0.4",
+        "pgsql-parser": "^13.3.0",
+        "postgres-array": "^3.0.1",
+        "prettier": "^2.6.0",
+        "prettier-plugin-sql": "^0.12.1"
       },
       "engines": {
-        "node": ">=14 <15",
-        "npm": ">=7"
+        "node": ">=16",
+        "npm": ">=8"
       }
     },
     "node_modules/@supabase/postgrest-js": {
@@ -9858,9 +10138,9 @@
       "dev": true
     },
     "node_modules/@types/aws-lambda": {
-      "version": "8.10.109",
-      "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.109.tgz",
-      "integrity": "sha512-/ME92FneNyXQzrAfcnQQlW1XkCZGPDlpi2ao1MJwecN+6SbeonKeggU8eybv1DfKli90FAVT1MlIZVXfwVuCyg=="
+      "version": "8.10.110",
+      "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.110.tgz",
+      "integrity": "sha512-r6egf2Cwv/JaFTTrF9OXFVUB3j/SXTgM9BwrlbBRjWAa2Tu6GWoDoLflppAZ8uSfbUJdXvC7Br3DjuN9pQ2NUQ=="
     },
     "node_modules/@types/babel__core": {
       "version": "7.1.20",
@@ -10108,9 +10388,9 @@
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
     },
     "node_modules/@types/jsonwebtoken": {
-      "version": "8.5.9",
-      "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.9.tgz",
-      "integrity": "sha512-272FMnFGzAVMGtu9tkr29hRL6bZj4Zs1KZNeHLnKqAvp06tAIcarTMwOh8/8bz4FmKRcMxZhZNeUAQsNLoiPhg==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.1.tgz",
+      "integrity": "sha512-c5ltxazpWabia/4UzhIoaDcIza4KViOQhdbjRlfcIGVnsE3c3brkz9Z+F/EeJIECOQP7W7US2hNE930cWWkPiw==",
       "dependencies": {
         "@types/node": "*"
       }
@@ -10986,6 +11266,12 @@
       "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
       "dev": true
     },
+    "node_modules/abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
+    },
     "node_modules/accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -11066,6 +11352,29 @@
         "node": ">= 6.0.0"
       }
     },
+    "node_modules/agentkeepalive": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz",
+      "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "depd": "^1.1.2",
+        "humanize-ms": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      }
+    },
+    "node_modules/agentkeepalive/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/aggregate-error": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
@@ -12472,7 +12781,6 @@
       "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
       "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
       "dev": true,
-      "optional": true,
       "engines": {
         "node": ">=0.6"
       }
@@ -12827,6 +13135,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz",
       "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==",
+      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -15492,9 +15801,9 @@
       }
     },
     "node_modules/decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
       "engines": {
         "node": ">=0.10"
       }
@@ -15686,6 +15995,15 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
+      "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/detect-newline": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
@@ -15799,6 +16117,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/discontinuous-range": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz",
+      "integrity": "sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==",
+      "dev": true
+    },
     "node_modules/dlv": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
@@ -15982,6 +16306,12 @@
       "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
       "dev": true
     },
+    "node_modules/dotty": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/dotty/-/dotty-0.1.2.tgz",
+      "integrity": "sha512-V0EWmKeH3DEhMwAZ+8ZB2Ao4OK6p++Z0hsDtZq3N0+0ZMVqkzrcEGROvOnZpLnvBg5PTNG23JEDLAm64gPaotQ==",
+      "dev": true
+    },
     "node_modules/duplexer": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
@@ -16085,6 +16415,27 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/encoding": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "optional": true,
+      "dependencies": {
+        "iconv-lite": "^0.6.2"
+      }
+    },
+    "node_modules/encoding/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "optional": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/end-of-stream": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -16144,6 +16495,21 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
+    "node_modules/env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
+      "dev": true
+    },
     "node_modules/errno": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
@@ -19560,6 +19926,12 @@
         "entities": "^2.0.0"
       }
     },
+    "node_modules/http-cache-semantics": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+      "dev": true
+    },
     "node_modules/http-errors": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
@@ -19616,6 +19988,15 @@
         "node": ">=10.17.0"
       }
     },
+    "node_modules/humanize-ms": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
+      "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.0.0"
+      }
+    },
     "node_modules/iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -20228,6 +20609,12 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/is-lambda": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
+      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
+      "dev": true
+    },
     "node_modules/is-map": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
@@ -22693,32 +23080,32 @@
       }
     },
     "node_modules/jsonwebtoken": {
-      "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
-      "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz",
+      "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==",
       "dependencies": {
         "jws": "^3.2.2",
-        "lodash.includes": "^4.3.0",
-        "lodash.isboolean": "^3.0.3",
-        "lodash.isinteger": "^4.0.4",
-        "lodash.isnumber": "^3.0.3",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.isstring": "^4.0.1",
-        "lodash.once": "^4.0.0",
+        "lodash": "^4.17.21",
         "ms": "^2.1.1",
-        "semver": "^5.6.0"
+        "semver": "^7.3.8"
       },
       "engines": {
-        "node": ">=4",
-        "npm": ">=1.4.28"
+        "node": ">=12",
+        "npm": ">=6"
       }
     },
     "node_modules/jsonwebtoken/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
       "bin": {
-        "semver": "bin/semver"
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/jsrsasign": {
@@ -22872,6 +23259,18 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/libpg-query": {
+      "version": "13.3.0",
+      "resolved": "https://registry.npmjs.org/libpg-query/-/libpg-query-13.3.0.tgz",
+      "integrity": "sha512-9PKW8iRWnSCw+IW5LlZYq+bLMmAhKsAIR2en8iRYnoRLBg4x+HKHBb+PQyqFy8+jC7AmzV65A+DsUO7tiZddEQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "@mapbox/node-pre-gyp": "^1.0.8",
+        "node-addon-api": "^1.6.3",
+        "node-gyp": "^8.0.0"
+      }
+    },
     "node_modules/lie": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
@@ -23024,31 +23423,11 @@
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
     },
-    "node_modules/lodash.includes": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
-      "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="
-    },
-    "node_modules/lodash.isboolean": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
-      "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="
-    },
     "node_modules/lodash.isequal": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
       "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
     },
-    "node_modules/lodash.isinteger": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
-      "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA=="
-    },
-    "node_modules/lodash.isnumber": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
-      "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="
-    },
     "node_modules/lodash.isplainobject": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
@@ -23070,11 +23449,6 @@
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
     },
-    "node_modules/lodash.once": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
-    },
     "node_modules/lodash.template": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
@@ -23226,6 +23600,33 @@
       "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
       "devOptional": true
     },
+    "node_modules/make-fetch-happen": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz",
+      "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==",
+      "dev": true,
+      "dependencies": {
+        "agentkeepalive": "^4.1.3",
+        "cacache": "^15.2.0",
+        "http-cache-semantics": "^4.1.0",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-lambda": "^1.0.1",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.3",
+        "minipass-collect": "^1.0.2",
+        "minipass-fetch": "^1.3.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^0.6.2",
+        "promise-retry": "^2.0.1",
+        "socks-proxy-agent": "^6.0.0",
+        "ssri": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/makeerror": {
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
@@ -25078,6 +25479,23 @@
         "node": ">= 8"
       }
     },
+    "node_modules/minipass-fetch": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz",
+      "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.1.0",
+        "minipass-sized": "^1.0.3",
+        "minizlib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "optionalDependencies": {
+        "encoding": "^0.1.12"
+      }
+    },
     "node_modules/minipass-flush": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
@@ -25102,6 +25520,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/minipass-sized": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
+      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/minizlib": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
@@ -25204,6 +25634,12 @@
       "resolved": "https://registry.npmjs.org/moment-mini/-/moment-mini-2.29.4.tgz",
       "integrity": "sha512-uhXpYwHFeiTbY9KSgPPRoo1nt8OxNVdMVoTBYHfSEKeRkIkwGpO+gERmhuhBtzfaeOyTkykSrm2+noJBgqt3Hg=="
     },
+    "node_modules/moo": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz",
+      "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==",
+      "dev": true
+    },
     "node_modules/moo-color": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/moo-color/-/moo-color-1.0.3.tgz",
@@ -25335,6 +25771,34 @@
       "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
       "dev": true
     },
+    "node_modules/nearley": {
+      "version": "2.20.1",
+      "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz",
+      "integrity": "sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==",
+      "dev": true,
+      "dependencies": {
+        "commander": "^2.19.0",
+        "moo": "^0.5.0",
+        "railroad-diagrams": "^1.0.0",
+        "randexp": "0.4.6"
+      },
+      "bin": {
+        "nearley-railroad": "bin/nearley-railroad.js",
+        "nearley-test": "bin/nearley-test.js",
+        "nearley-unparse": "bin/nearley-unparse.js",
+        "nearleyc": "bin/nearleyc.js"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://nearley.js.org/#give-to-nearley"
+      }
+    },
+    "node_modules/nearley/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
     "node_modules/negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@@ -25894,6 +26358,12 @@
         "tslib": "^2.0.3"
       }
     },
+    "node_modules/node-addon-api": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz",
+      "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==",
+      "dev": true
+    },
     "node_modules/node-cache": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/node-cache/-/node-cache-5.1.2.tgz",
@@ -25955,6 +26425,30 @@
         "webidl-conversions": "^3.0.0"
       }
     },
+    "node_modules/node-gyp": {
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz",
+      "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==",
+      "dev": true,
+      "dependencies": {
+        "env-paths": "^2.2.0",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.2.6",
+        "make-fetch-happen": "^9.1.0",
+        "nopt": "^5.0.0",
+        "npmlog": "^6.0.0",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.2",
+        "which": "^2.0.2"
+      },
+      "bin": {
+        "node-gyp": "bin/node-gyp.js"
+      },
+      "engines": {
+        "node": ">= 10.12.0"
+      }
+    },
     "node_modules/node-gyp-build": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz",
@@ -25965,6 +26459,82 @@
         "node-gyp-build-test": "build-test.js"
       }
     },
+    "node_modules/node-gyp/node_modules/are-we-there-yet": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
+      "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
+      "dev": true,
+      "dependencies": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/node-gyp/node_modules/gauge": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
+      "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
+      "dev": true,
+      "dependencies": {
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.3",
+        "console-control-strings": "^1.1.0",
+        "has-unicode": "^2.0.1",
+        "signal-exit": "^3.0.7",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.5"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/node-gyp/node_modules/npmlog": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
+      "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
+      "dev": true,
+      "dependencies": {
+        "are-we-there-yet": "^3.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^4.0.3",
+        "set-blocking": "^2.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/node-gyp/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/node-gyp/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -26011,6 +26581,18 @@
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
       "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="
     },
+    "node_modules/node-sql-parser": {
+      "version": "4.6.4",
+      "resolved": "https://registry.npmjs.org/node-sql-parser/-/node-sql-parser-4.6.4.tgz",
+      "integrity": "sha512-OPzbsiN5VX37/HM5BgGxcoDt1ggvFUc6gdzyQzoPjk8orTOHBlgHuDUugP5oRU+CcOw8GniilvV3pt5FBxp47A==",
+      "dev": true,
+      "dependencies": {
+        "big-integer": "^1.6.48"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/nodemailer": {
       "version": "6.8.0",
       "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.8.0.tgz",
@@ -26024,6 +26606,21 @@
       "resolved": "https://registry.npmjs.org/non-layered-tidy-tree-layout/-/non-layered-tidy-tree-layout-2.0.2.tgz",
       "integrity": "sha512-gkXMxRzUH+PB0ax9dUN0yYF0S25BqeAYqhgMaLUFmpXLEk7Fcu8f4emJuOAY0V8kjDICxROIKsTAKsV/v355xw=="
     },
+    "node_modules/nopt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "dev": true,
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -26526,23 +27123,36 @@
       "dev": true
     },
     "node_modules/octokit": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/octokit/-/octokit-2.0.10.tgz",
-      "integrity": "sha512-sI15RZVaV9iyqLLEky4i++tMM48Fo9a80zrpOXMdAtbomznBLDi/moi9mAjJg7Ii+EaSEyaWOVIh3M/Vk/a5mw==",
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/octokit/-/octokit-2.0.14.tgz",
+      "integrity": "sha512-z6cgZBFxirpFEQ1La8Lg83GCs5hOV2EPpkYYdjsGNbfQMv8qUGjq294MiRBCbZqLufviakGsPUxaNKe3JrPmsA==",
       "dependencies": {
-        "@octokit/app": "^13.0.5",
+        "@octokit/app": "^13.1.1",
         "@octokit/core": "^4.0.4",
         "@octokit/oauth-app": "^4.0.6",
-        "@octokit/plugin-paginate-rest": "^5.0.0",
-        "@octokit/plugin-rest-endpoint-methods": "^6.0.0",
+        "@octokit/plugin-paginate-rest": "^6.0.0",
+        "@octokit/plugin-rest-endpoint-methods": "^7.0.0",
         "@octokit/plugin-retry": "^4.0.3",
-        "@octokit/plugin-throttling": "^4.0.1",
-        "@octokit/types": "^8.0.0"
+        "@octokit/plugin-throttling": "^5.0.0",
+        "@octokit/types": "^9.0.0"
       },
       "engines": {
         "node": ">= 14"
       }
     },
+    "node_modules/octokit/node_modules/@octokit/openapi-types": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+      "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+    },
+    "node_modules/octokit/node_modules/@octokit/types": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+      "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^16.0.0"
+      }
+    },
     "node_modules/on-finished": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
@@ -26793,7 +27403,8 @@
     "node_modules/packet-reader": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz",
-      "integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="
+      "integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==",
+      "dev": true
     },
     "node_modules/pako": {
       "version": "1.0.11",
@@ -27002,6 +27613,7 @@
       "version": "8.8.0",
       "resolved": "https://registry.npmjs.org/pg/-/pg-8.8.0.tgz",
       "integrity": "sha512-UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw==",
+      "dev": true,
       "dependencies": {
         "buffer-writer": "2.0.0",
         "packet-reader": "1.0.0",
@@ -27026,12 +27638,14 @@
     "node_modules/pg-connection-string": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz",
-      "integrity": "sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="
+      "integrity": "sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==",
+      "dev": true
     },
     "node_modules/pg-format": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/pg-format/-/pg-format-1.0.4.tgz",
       "integrity": "sha512-YyKEF78pEA6wwTAqOUaHIN/rWpfzzIuMh9KdAhc3rSLQ/7zkRFcCgYBAEGatDstLyZw4g0s9SNICmaTGnBVeyw==",
+      "dev": true,
       "engines": {
         "node": ">=4.0"
       }
@@ -27040,6 +27654,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
       "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
+      "dev": true,
       "engines": {
         "node": ">=4.0.0"
       }
@@ -27048,6 +27663,7 @@
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.2.tgz",
       "integrity": "sha512-His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w==",
+      "dev": true,
       "peerDependencies": {
         "pg": ">=8.0"
       }
@@ -27055,12 +27671,14 @@
     "node_modules/pg-protocol": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz",
-      "integrity": "sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="
+      "integrity": "sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==",
+      "dev": true
     },
     "node_modules/pg-types": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
       "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
+      "dev": true,
       "dependencies": {
         "pg-int8": "1.0.1",
         "postgres-array": "~2.0.0",
@@ -27072,14 +27690,61 @@
         "node": ">=4"
       }
     },
+    "node_modules/pg-types/node_modules/postgres-array": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
+      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/pgpass": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
       "integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==",
+      "dev": true,
       "dependencies": {
         "split2": "^4.1.0"
       }
     },
+    "node_modules/pgsql-deparser": {
+      "version": "13.3.15",
+      "resolved": "https://registry.npmjs.org/pgsql-deparser/-/pgsql-deparser-13.3.15.tgz",
+      "integrity": "sha512-Q/ZrQWYsymM+HefLaLK6PX1DNeDdfoKAH5wzfRrOxCsxRoTouIbWhwgVp3QaiovStjVPSeYNH+pqkLH4JsSn2A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.11.2",
+        "dotty": "^0.1.0",
+        "lodash": "^4.17.20",
+        "pgsql-enums": "^13.1.3"
+      }
+    },
+    "node_modules/pgsql-enums": {
+      "version": "13.1.3",
+      "resolved": "https://registry.npmjs.org/pgsql-enums/-/pgsql-enums-13.1.3.tgz",
+      "integrity": "sha512-h3OSGbv1rB1r3lWL3l0gHIMVMVBTzEzROkP2/Wpz2s1eDAffPf9O5x0OqrRdLzhze92S9GUqO/FrS15u027xyg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.4.2"
+      }
+    },
+    "node_modules/pgsql-parser": {
+      "version": "13.4.0",
+      "resolved": "https://registry.npmjs.org/pgsql-parser/-/pgsql-parser-13.4.0.tgz",
+      "integrity": "sha512-d3ZQtQnUptz19f+WpmRP4OLfAZ33LgYDpycTA9ZSNCF+AZyURfm9e3sRZJ/amBcLtpwnZuto9EHjVz3EPpiksA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.11.2",
+        "libpg-query": "13.3.0",
+        "minimist": "^1.2.6",
+        "pgsql-deparser": "^13.3.14",
+        "pgsql-enums": "^13.1.3"
+      },
+      "bin": {
+        "pgsql-parser": "main/cli.js"
+      }
+    },
     "node_modules/phenomenon": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/phenomenon/-/phenomenon-1.6.0.tgz",
@@ -29055,17 +29720,19 @@
       }
     },
     "node_modules/postgres-array": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
-      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-3.0.1.tgz",
+      "integrity": "sha512-h7i53Dw2Yq3a1uuZ6lbVFAkvMMwssJ8jkzeAg0XaZm1XIFF/t/s+tockdqbWTymyEm07dVenOQbFisEi+kj8uA==",
+      "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=12"
       }
     },
     "node_modules/postgres-bytea": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
       "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -29074,6 +29741,7 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
       "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -29082,6 +29750,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
       "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
+      "dev": true,
       "dependencies": {
         "xtend": "^4.0.0"
       },
@@ -29121,6 +29790,26 @@
         "url": "https://github.com/prettier/prettier?sponsor=1"
       }
     },
+    "node_modules/prettier-plugin-sql": {
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-sql/-/prettier-plugin-sql-0.12.1.tgz",
+      "integrity": "sha512-2z0pMmQEC61Xywerw2FJFpEIaA9lJUjB5mj+9dfRU8HkU7iICFrIizpMjSSDMoGkhh5W+IRROVgLlgRdpphI7g==",
+      "dev": true,
+      "dependencies": {
+        "node-sql-parser": "^4.4.0",
+        "sql-formatter": "^10.0.0",
+        "tslib": "^2.4.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unts"
+      },
+      "peerDependencies": {
+        "prettier": "^2.0.0"
+      }
+    },
     "node_modules/pretty-error": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz",
@@ -29214,6 +29903,19 @@
       "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
       "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="
     },
+    "node_modules/promise-retry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+      "dev": true,
+      "dependencies": {
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/promise.allsettled": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/promise.allsettled/-/promise.allsettled-1.0.6.tgz",
@@ -29461,6 +30163,12 @@
       "resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz",
       "integrity": "sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ=="
     },
+    "node_modules/railroad-diagrams": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz",
+      "integrity": "sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==",
+      "dev": true
+    },
     "node_modules/ramda": {
       "version": "0.28.0",
       "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.28.0.tgz",
@@ -29471,6 +30179,19 @@
         "url": "https://opencollective.com/ramda"
       }
     },
+    "node_modules/randexp": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz",
+      "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==",
+      "dev": true,
+      "dependencies": {
+        "discontinuous-range": "1.0.0",
+        "ret": "~0.1.10"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
     "node_modules/randomatic": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
@@ -32049,6 +32770,15 @@
         "node": ">=0.12"
       }
     },
+    "node_modules/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -32819,6 +33549,16 @@
         "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
     "node_modules/snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -32980,6 +33720,34 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/socks": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
+      "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
+      "dev": true,
+      "dependencies": {
+        "ip": "^2.0.0",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz",
+      "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^6.0.2",
+        "debug": "^4.3.3",
+        "socks": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -33121,6 +33889,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/split2/-/split2-4.1.0.tgz",
       "integrity": "sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==",
+      "dev": true,
       "engines": {
         "node": ">= 10.x"
       }
@@ -33130,6 +33899,19 @@
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
     },
+    "node_modules/sql-formatter": {
+      "version": "10.7.2",
+      "resolved": "https://registry.npmjs.org/sql-formatter/-/sql-formatter-10.7.2.tgz",
+      "integrity": "sha512-YspJXMr2rKMGZY50zYRBs2nCtEO/AKDrmQOxmV2CrGEOFSXUhY3YbsOUe6lX0T/7xbBs4pAYv4UObmwf78vtKg==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1",
+        "nearley": "^2.20.1"
+      },
+      "bin": {
+        "sql-formatter": "bin/sql-formatter-cli.js"
+      }
+    },
     "node_modules/sqlstring": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.3.tgz",
@@ -35246,12 +36028,12 @@
       }
     },
     "node_modules/universal-github-app-jwt": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/universal-github-app-jwt/-/universal-github-app-jwt-1.1.0.tgz",
-      "integrity": "sha512-3b+ocAjjz4JTyqaOT+NNBd5BtTuvJTxWElIoeHSVelUV9J3Jp7avmQTdLKCaoqi/5Ox2o/q+VK19TJ233rVXVQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/universal-github-app-jwt/-/universal-github-app-jwt-1.1.1.tgz",
+      "integrity": "sha512-G33RTLrIBMFmlDV4u4CBF7dh71eWwykck4XgaxaIVeZKOYZRAAxvcGMRFTUclVY6xoUPQvO4Ne5wKGxYm/Yy9w==",
       "dependencies": {
-        "@types/jsonwebtoken": "^8.3.3",
-        "jsonwebtoken": "^8.5.1"
+        "@types/jsonwebtoken": "^9.0.0",
+        "jsonwebtoken": "^9.0.0"
       }
     },
     "node_modules/universal-user-agent": {
@@ -37519,7 +38301,6 @@
         "@sentry/nextjs": "^6.17.4",
         "@stripe/react-stripe-js": "^1.7.0",
         "@stripe/stripe-js": "^1.25.0",
-        "@supabase/postgres-meta": "^0.26.1",
         "@supabase/react-data-grid": "^7.1.0-beta.7",
         "@supabase/shared-types": "^0.1.29",
         "@supabase/supabase-js": "^2.1.1",
@@ -37595,6 +38376,7 @@
         "@storybook/addon-links": "^6.4.19",
         "@storybook/react": "^6.4.19",
         "@storybook/testing-library": "^0.0.9",
+        "@supabase/postgres-meta": "^0.60.2",
         "@tailwindcss/typography": "^0.5.2",
         "@testing-library/dom": "^8.19.0",
         "@testing-library/react": "^12.1.5",
@@ -40669,6 +41451,101 @@
         "@jridgewell/sourcemap-codec": "1.4.14"
       }
     },
+    "@mapbox/node-pre-gyp": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz",
+      "integrity": "sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==",
+      "dev": true,
+      "requires": {
+        "detect-libc": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "make-dir": "^3.1.0",
+        "node-fetch": "^2.6.7",
+        "nopt": "^5.0.0",
+        "npmlog": "^5.0.1",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.11"
+      },
+      "dependencies": {
+        "are-we-there-yet": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+          "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
+          "dev": true,
+          "requires": {
+            "delegates": "^1.0.0",
+            "readable-stream": "^3.6.0"
+          }
+        },
+        "gauge": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
+          "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
+          "dev": true,
+          "requires": {
+            "aproba": "^1.0.3 || ^2.0.0",
+            "color-support": "^1.1.2",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.1",
+            "object-assign": "^4.1.1",
+            "signal-exit": "^3.0.0",
+            "string-width": "^4.2.3",
+            "strip-ansi": "^6.0.1",
+            "wide-align": "^1.1.2"
+          }
+        },
+        "make-dir": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+          "dev": true,
+          "requires": {
+            "semver": "^6.0.0"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "6.3.0",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+              "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+              "dev": true
+            }
+          }
+        },
+        "npmlog": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+          "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+          "dev": true,
+          "requires": {
+            "are-we-there-yet": "^2.0.0",
+            "console-control-strings": "^1.1.0",
+            "gauge": "^3.0.0",
+            "set-blocking": "^2.0.0"
+          }
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "semver": {
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
+      }
+    },
     "@mdx-js/loader": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@mdx-js/loader/-/loader-2.1.5.tgz",
@@ -41091,72 +41968,147 @@
       }
     },
     "@octokit/app": {
-      "version": "13.0.11",
-      "resolved": "https://registry.npmjs.org/@octokit/app/-/app-13.0.11.tgz",
-      "integrity": "sha512-qlUynCN1+BNYQ6VaJOMCqDdCo/2yzPixuoFnbcUThakRV+5969Tp+LTAtsZWjjb/tUHfutaAYOnsia1EGTAzfA==",
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/@octokit/app/-/app-13.1.2.tgz",
+      "integrity": "sha512-Kf+h5sa1SOI33hFsuHvTsWj1jUrjp1x4MuiJBq7U/NicfEGa6nArPUoDnyfP/YTmcQ5cQ5yvOgoIBkbwPg6kzQ==",
       "requires": {
-        "@octokit/auth-app": "^4.0.0",
+        "@octokit/auth-app": "^4.0.8",
         "@octokit/auth-unauthenticated": "^3.0.0",
         "@octokit/core": "^4.0.0",
         "@octokit/oauth-app": "^4.0.7",
-        "@octokit/plugin-paginate-rest": "^5.0.0",
-        "@octokit/types": "^8.0.0",
+        "@octokit/plugin-paginate-rest": "^6.0.0",
+        "@octokit/types": "^9.0.0",
         "@octokit/webhooks": "^10.0.0"
+      },
+      "dependencies": {
+        "@octokit/openapi-types": {
+          "version": "16.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+          "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+        },
+        "@octokit/types": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+          "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+          "requires": {
+            "@octokit/openapi-types": "^16.0.0"
+          }
+        }
       }
     },
     "@octokit/auth-app": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-app/-/auth-app-4.0.7.tgz",
-      "integrity": "sha512-hjjVCoI/+1oLminVHJPPexguYb9FP4Q60hEHExgy1uAKMMJ5Zf8iJIeRJlIIqneTb4vt7NvUTEj4YDxBLZ1FLg==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-app/-/auth-app-4.0.9.tgz",
+      "integrity": "sha512-VFpKIXhHO+kVJtane5cEvdYPtjDKCOI0uKsRrsZfJP+uEu7rcPbQCLCcRKgyT+mUIzGr1IIOmwP/lFqSip1dXA==",
       "requires": {
         "@octokit/auth-oauth-app": "^5.0.0",
         "@octokit/auth-oauth-user": "^2.0.0",
         "@octokit/request": "^6.0.0",
         "@octokit/request-error": "^3.0.0",
-        "@octokit/types": "^8.0.0",
+        "@octokit/types": "^9.0.0",
         "@types/lru-cache": "^5.1.0",
         "deprecation": "^2.3.1",
         "lru-cache": "^6.0.0",
-        "universal-github-app-jwt": "^1.0.1",
+        "universal-github-app-jwt": "^1.1.1",
         "universal-user-agent": "^6.0.0"
+      },
+      "dependencies": {
+        "@octokit/openapi-types": {
+          "version": "16.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+          "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+        },
+        "@octokit/types": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+          "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+          "requires": {
+            "@octokit/openapi-types": "^16.0.0"
+          }
+        }
       }
     },
     "@octokit/auth-oauth-app": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-app/-/auth-oauth-app-5.0.4.tgz",
-      "integrity": "sha512-zlWuii5hAN50vsV6SJC+uIJ7SMhyWjQMEmKJQxkmNDlieE9LjnkZnbOjqRsfcG7VO7WTl4K8ccpo/3A7Kdpmrw==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-app/-/auth-oauth-app-5.0.5.tgz",
+      "integrity": "sha512-UPX1su6XpseaeLVCi78s9droxpGtBWIgz9XhXAx9VXabksoF0MyI5vaa1zo1njyYt6VaAjFisC2A2Wchcu2WmQ==",
       "requires": {
         "@octokit/auth-oauth-device": "^4.0.0",
         "@octokit/auth-oauth-user": "^2.0.0",
         "@octokit/request": "^6.0.0",
-        "@octokit/types": "^8.0.0",
+        "@octokit/types": "^9.0.0",
         "@types/btoa-lite": "^1.0.0",
         "btoa-lite": "^1.0.0",
         "universal-user-agent": "^6.0.0"
+      },
+      "dependencies": {
+        "@octokit/openapi-types": {
+          "version": "16.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+          "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+        },
+        "@octokit/types": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+          "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+          "requires": {
+            "@octokit/openapi-types": "^16.0.0"
+          }
+        }
       }
     },
     "@octokit/auth-oauth-device": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-device/-/auth-oauth-device-4.0.3.tgz",
-      "integrity": "sha512-KPTx5nMntKjNZzzltO3X4T68v22rd7Cp/TcLJXQE2U8aXPcZ9LFuww9q9Q5WUNSu3jwi3lRwzfkPguRfz1R8Vg==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-device/-/auth-oauth-device-4.0.4.tgz",
+      "integrity": "sha512-Xl85BZYfqCMv+Uvz33nVVUjE7I/PVySNaK6dRRqlkvYcArSr9vRcZC9KVjXYObGRTCN6mISeYdakAZvWEN4+Jw==",
       "requires": {
         "@octokit/oauth-methods": "^2.0.0",
         "@octokit/request": "^6.0.0",
-        "@octokit/types": "^8.0.0",
+        "@octokit/types": "^9.0.0",
         "universal-user-agent": "^6.0.0"
+      },
+      "dependencies": {
+        "@octokit/openapi-types": {
+          "version": "16.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+          "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+        },
+        "@octokit/types": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+          "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+          "requires": {
+            "@octokit/openapi-types": "^16.0.0"
+          }
+        }
       }
     },
     "@octokit/auth-oauth-user": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-user/-/auth-oauth-user-2.0.4.tgz",
-      "integrity": "sha512-HrbDzTPqz6GcGSOUkR+wSeF3vEqsb9NMsmPja/qqqdiGmlk/Czkxctc3KeWYogHonp62Ml4kjz2VxKawrFsadQ==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-user/-/auth-oauth-user-2.1.1.tgz",
+      "integrity": "sha512-JgqnNNPf9CaWLxWm9uh2WgxcaVYhxBR09NVIPTiMU2dVZ3FObOHs3njBiLNw+zq84k+rEdm5Y7AsiASrZ84Apg==",
       "requires": {
         "@octokit/auth-oauth-device": "^4.0.0",
         "@octokit/oauth-methods": "^2.0.0",
         "@octokit/request": "^6.0.0",
-        "@octokit/types": "^8.0.0",
+        "@octokit/types": "^9.0.0",
         "btoa-lite": "^1.0.0",
         "universal-user-agent": "^6.0.0"
+      },
+      "dependencies": {
+        "@octokit/openapi-types": {
+          "version": "16.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+          "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+        },
+        "@octokit/types": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+          "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+          "requires": {
+            "@octokit/openapi-types": "^16.0.0"
+          }
+        }
       }
     },
     "@octokit/auth-token": {
@@ -41168,12 +42120,27 @@
       }
     },
     "@octokit/auth-unauthenticated": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-unauthenticated/-/auth-unauthenticated-3.0.3.tgz",
-      "integrity": "sha512-IyfLo1T5GmIC9+07hHGlD3gHtZI1Bona8PLhHXUnwcYDuZt0BhjlNJDYMoPG21C4r7v7+ZSxQHBKrGgkxpYb7A==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-unauthenticated/-/auth-unauthenticated-3.0.4.tgz",
+      "integrity": "sha512-AT74XGBylcLr4lmUp1s6mjSUgphGdlse21Qjtv5DzpX1YOl5FXKwvNcZWESdhyBbpDT8VkVyLFqa/7a7eqpPNw==",
       "requires": {
         "@octokit/request-error": "^3.0.0",
-        "@octokit/types": "^8.0.0"
+        "@octokit/types": "^9.0.0"
+      },
+      "dependencies": {
+        "@octokit/openapi-types": {
+          "version": "16.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+          "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+        },
+        "@octokit/types": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+          "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+          "requires": {
+            "@octokit/openapi-types": "^16.0.0"
+          }
+        }
       }
     },
     "@octokit/core": {
@@ -41218,9 +42185,9 @@
       }
     },
     "@octokit/oauth-app": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/oauth-app/-/oauth-app-4.1.0.tgz",
-      "integrity": "sha512-dGZcfmwPkS3VZ9CNnvNszp6mlnbOZh9+/uPNiK/AkvSUJGXTbUVIZTkMvAjbyIFw2WlIx++hhtrTeKNJq6uMbw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/oauth-app/-/oauth-app-4.2.0.tgz",
+      "integrity": "sha512-gyGclT77RQMkVUEW3YBeAKY+LBSc5u3eC9Wn/Uwt3WhuKuu9mrV18EnNpDqmeNll+mdV02yyBROU29Tlili6gg==",
       "requires": {
         "@octokit/auth-oauth-app": "^5.0.0",
         "@octokit/auth-oauth-user": "^2.0.0",
@@ -41239,15 +42206,30 @@
       "integrity": "sha512-y1WhN+ERDZTh0qZ4SR+zotgsQUE1ysKnvBt1hvDRB2WRzYtVKQjn97HEPzoehh66Fj9LwNdlZh+p6TJatT0zzg=="
     },
     "@octokit/oauth-methods": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@octokit/oauth-methods/-/oauth-methods-2.0.4.tgz",
-      "integrity": "sha512-RDSa6XL+5waUVrYSmOlYROtPq0+cfwppP4VaQY/iIei3xlFb0expH6YNsxNrZktcLhJWSpm9uzeom+dQrXlS3A==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@octokit/oauth-methods/-/oauth-methods-2.0.5.tgz",
+      "integrity": "sha512-yQP6B5gE3axNxuM3U9KqWs/ErAQ+WLPaPgC/7EjsZsQibkf8sjdAfF8/y/EJW+Dd05XQvadX4WhQZPMnO1SE1A==",
       "requires": {
         "@octokit/oauth-authorization-url": "^5.0.0",
-        "@octokit/request": "^6.0.0",
-        "@octokit/request-error": "^3.0.0",
-        "@octokit/types": "^8.0.0",
+        "@octokit/request": "^6.2.3",
+        "@octokit/request-error": "^3.0.3",
+        "@octokit/types": "^9.0.0",
         "btoa-lite": "^1.0.0"
+      },
+      "dependencies": {
+        "@octokit/openapi-types": {
+          "version": "16.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+          "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+        },
+        "@octokit/types": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+          "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+          "requires": {
+            "@octokit/openapi-types": "^16.0.0"
+          }
+        }
       }
     },
     "@octokit/openapi-types": {
@@ -41256,20 +42238,50 @@
       "integrity": "sha512-HNWisMYlR8VCnNurDU6os2ikx0s0VyEjDYHNS/h4cgb8DeOxQ0n72HyinUtdDVxJhFy3FWLGl0DJhfEWk3P5Iw=="
     },
     "@octokit/plugin-paginate-rest": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-5.0.1.tgz",
-      "integrity": "sha512-7A+rEkS70pH36Z6JivSlR7Zqepz3KVucEFVDnSrgHXzG7WLAzYwcHZbKdfTXHwuTHbkT1vKvz7dHl1+HNf6Qyw==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-6.0.0.tgz",
+      "integrity": "sha512-Sq5VU1PfT6/JyuXPyt04KZNVsFOSBaYOAq2QRZUwzVlI10KFvcbUo8lR258AAQL1Et60b0WuVik+zOWKLuDZxw==",
       "requires": {
-        "@octokit/types": "^8.0.0"
+        "@octokit/types": "^9.0.0"
+      },
+      "dependencies": {
+        "@octokit/openapi-types": {
+          "version": "16.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+          "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+        },
+        "@octokit/types": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+          "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+          "requires": {
+            "@octokit/openapi-types": "^16.0.0"
+          }
+        }
       }
     },
     "@octokit/plugin-rest-endpoint-methods": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-6.7.0.tgz",
-      "integrity": "sha512-orxQ0fAHA7IpYhG2flD2AygztPlGYNAdlzYz8yrD8NDgelPfOYoRPROfEyIe035PlxvbYrgkfUZIhSBKju/Cvw==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-7.0.1.tgz",
+      "integrity": "sha512-pnCaLwZBudK5xCdrR823xHGNgqOzRnJ/mpC/76YPpNP7DybdsJtP7mdOwh+wYZxK5jqeQuhu59ogMI4NRlBUvA==",
       "requires": {
-        "@octokit/types": "^8.0.0",
+        "@octokit/types": "^9.0.0",
         "deprecation": "^2.3.1"
+      },
+      "dependencies": {
+        "@octokit/openapi-types": {
+          "version": "16.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+          "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+        },
+        "@octokit/types": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+          "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+          "requires": {
+            "@octokit/openapi-types": "^16.0.0"
+          }
+        }
       }
     },
     "@octokit/plugin-retry": {
@@ -41282,27 +42294,55 @@
       }
     },
     "@octokit/plugin-throttling": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-4.3.2.tgz",
-      "integrity": "sha512-ZaCK599h3tzcoy0Jtdab95jgmD7X9iAk59E2E7hYKCAmnURaI4WpzwL9vckImilybUGrjY1JOWJapDs2N2D3vw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-5.0.1.tgz",
+      "integrity": "sha512-I4qxs7wYvYlFuY3PAUGWAVPhFXG3RwnvTiSr5Fu/Auz7bYhDLnzS2MjwV8nGLq/FPrWwYiweeZrI5yjs1YG4tQ==",
       "requires": {
-        "@octokit/types": "^8.0.0",
+        "@octokit/types": "^9.0.0",
         "bottleneck": "^2.15.3"
+      },
+      "dependencies": {
+        "@octokit/openapi-types": {
+          "version": "16.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+          "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+        },
+        "@octokit/types": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+          "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+          "requires": {
+            "@octokit/openapi-types": "^16.0.0"
+          }
+        }
       }
     },
     "@octokit/request": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-6.2.2.tgz",
-      "integrity": "sha512-6VDqgj0HMc2FUX2awIs+sM6OwLgwHvAi4KCK3mT2H2IKRt6oH9d0fej5LluF5mck1lRR/rFWN0YIDSYXYSylbw==",
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-6.2.3.tgz",
+      "integrity": "sha512-TNAodj5yNzrrZ/VxP+H5HiYaZep0H3GU0O7PaF+fhDrt8FPrnkei9Aal/txsN/1P7V3CPiThG0tIvpPDYUsyAA==",
       "requires": {
         "@octokit/endpoint": "^7.0.0",
         "@octokit/request-error": "^3.0.0",
-        "@octokit/types": "^8.0.0",
+        "@octokit/types": "^9.0.0",
         "is-plain-object": "^5.0.0",
         "node-fetch": "^2.6.7",
         "universal-user-agent": "^6.0.0"
       },
       "dependencies": {
+        "@octokit/openapi-types": {
+          "version": "16.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+          "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+        },
+        "@octokit/types": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+          "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+          "requires": {
+            "@octokit/openapi-types": "^16.0.0"
+          }
+        },
         "is-plain-object": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
@@ -41311,13 +42351,28 @@
       }
     },
     "@octokit/request-error": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.2.tgz",
-      "integrity": "sha512-WMNOFYrSaX8zXWoJg9u/pKgWPo94JXilMLb2VManNOby9EZxrQaBe/QSC4a1TzpAlpxofg2X/jMnCyZgL6y7eg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.3.tgz",
+      "integrity": "sha512-crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ==",
       "requires": {
-        "@octokit/types": "^8.0.0",
+        "@octokit/types": "^9.0.0",
         "deprecation": "^2.0.0",
         "once": "^1.4.0"
+      },
+      "dependencies": {
+        "@octokit/openapi-types": {
+          "version": "16.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+          "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+        },
+        "@octokit/types": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+          "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+          "requires": {
+            "@octokit/openapi-types": "^16.0.0"
+          }
+        }
       }
     },
     "@octokit/types": {
@@ -41329,25 +42384,25 @@
       }
     },
     "@octokit/webhooks": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/@octokit/webhooks/-/webhooks-10.3.1.tgz",
-      "integrity": "sha512-TSGiz9+IxP8Oh8LVFwhzLYTJ+8T/U6/fC/i1/iB39izyFzoEub3wNHlsfh8A6PUbde70w2pLr/O2ELlyQdrLgg==",
+      "version": "10.7.0",
+      "resolved": "https://registry.npmjs.org/@octokit/webhooks/-/webhooks-10.7.0.tgz",
+      "integrity": "sha512-zZBbQMpXXnK/ki/utrFG/TuWv9545XCSLibfDTxrYqR1PmU6zel02ebTOrA7t5XIGHzlEOc/NgISUIBUe7pMFA==",
       "requires": {
         "@octokit/request-error": "^3.0.0",
         "@octokit/webhooks-methods": "^3.0.0",
-        "@octokit/webhooks-types": "6.6.0",
+        "@octokit/webhooks-types": "6.10.0",
         "aggregate-error": "^3.1.0"
       }
     },
     "@octokit/webhooks-methods": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@octokit/webhooks-methods/-/webhooks-methods-3.0.1.tgz",
-      "integrity": "sha512-XftYVcBxtzC2G05kdBNn9IYLtQ+Cz6ufKkjZd0DU/qGaZEFTPzM2OabXAWG5tvL0q/I+Exio1JnRiPfetiMSEw=="
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@octokit/webhooks-methods/-/webhooks-methods-3.0.2.tgz",
+      "integrity": "sha512-Vlnv5WBscf07tyAvfDbp7pTkMZUwk7z7VwEF32x6HqI+55QRwBTcT+D7DDjZXtad/1dU9E32x0HmtDlF9VIRaQ=="
     },
     "@octokit/webhooks-types": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@octokit/webhooks-types/-/webhooks-types-6.6.0.tgz",
-      "integrity": "sha512-czpEwg4UA3hb0G345BVk1zMXWwX0Qdaa4F/z7C3bP6baQ9AWY/VmCYydLU+Pi4z3aOPEJYCvt9zVhZ5CutqBKw=="
+      "version": "6.10.0",
+      "resolved": "https://registry.npmjs.org/@octokit/webhooks-types/-/webhooks-types-6.10.0.tgz",
+      "integrity": "sha512-lDNv83BeEyxxukdQ0UttiUXawk9+6DkdjjFtm2GFED+24IQhTVaoSbwV9vWWKONyGLzRmCQqZmoEWkDhkEmPlw=="
     },
     "@pmmmwh/react-refresh-webpack-plugin": {
       "version": "0.5.9",
@@ -42693,9 +43748,10 @@
       }
     },
     "@sinclair/typebox": {
-      "version": "0.19.2",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.19.2.tgz",
-      "integrity": "sha512-0U/RVPZQw1QxhrbKV0o281ZWI1Ve3osJnyEYnwOp3slydIQHyXumbJANJeNv9BqABDiHWlmzsxSVopPHMvt3Aw=="
+      "version": "0.25.21",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.21.tgz",
+      "integrity": "sha512-gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g==",
+      "dev": true
     },
     "@sinonjs/commons": {
       "version": "1.8.5",
@@ -44444,13 +45500,18 @@
       }
     },
     "@supabase/postgres-meta": {
-      "version": "0.26.1",
-      "resolved": "https://registry.npmjs.org/@supabase/postgres-meta/-/postgres-meta-0.26.1.tgz",
-      "integrity": "sha512-z4ws1fD+sPwb+J2PRMe2/Oe4HuVwGjPESjFqCR8uiWauTlfbtYR0bXFPMxPA6SkJFqOq/86uJPwzHgHURWZDiA==",
+      "version": "0.60.2",
+      "resolved": "https://registry.npmjs.org/@supabase/postgres-meta/-/postgres-meta-0.60.2.tgz",
+      "integrity": "sha512-Fjc5xKPzZJ38FhY3IbDFZ5cgVxPJTn8psLkgljZgBOMUyCd3QY3W1jV8rjwAkLfz/lxIOa2KlKZTIswMZMx4WQ==",
+      "dev": true,
       "requires": {
-        "@sinclair/typebox": "^0.19.2",
+        "@sinclair/typebox": "^0.25.1",
         "pg": "^8.7.1",
-        "pg-format": "^1.0.4"
+        "pg-format": "^1.0.4",
+        "pgsql-parser": "^13.3.0",
+        "postgres-array": "^3.0.1",
+        "prettier": "^2.6.0",
+        "prettier-plugin-sql": "^0.12.1"
       }
     },
     "@supabase/postgrest-js": {
@@ -44650,9 +45711,9 @@
       "dev": true
     },
     "@types/aws-lambda": {
-      "version": "8.10.109",
-      "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.109.tgz",
-      "integrity": "sha512-/ME92FneNyXQzrAfcnQQlW1XkCZGPDlpi2ao1MJwecN+6SbeonKeggU8eybv1DfKli90FAVT1MlIZVXfwVuCyg=="
+      "version": "8.10.110",
+      "resolved": "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.110.tgz",
+      "integrity": "sha512-r6egf2Cwv/JaFTTrF9OXFVUB3j/SXTgM9BwrlbBRjWAa2Tu6GWoDoLflppAZ8uSfbUJdXvC7Br3DjuN9pQ2NUQ=="
     },
     "@types/babel__core": {
       "version": "7.1.20",
@@ -44899,9 +45960,9 @@
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
     },
     "@types/jsonwebtoken": {
-      "version": "8.5.9",
-      "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.9.tgz",
-      "integrity": "sha512-272FMnFGzAVMGtu9tkr29hRL6bZj4Zs1KZNeHLnKqAvp06tAIcarTMwOh8/8bz4FmKRcMxZhZNeUAQsNLoiPhg==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.1.tgz",
+      "integrity": "sha512-c5ltxazpWabia/4UzhIoaDcIza4KViOQhdbjRlfcIGVnsE3c3brkz9Z+F/EeJIECOQP7W7US2hNE930cWWkPiw==",
       "requires": {
         "@types/node": "*"
       }
@@ -45653,6 +46714,12 @@
       "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
       "dev": true
     },
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
+    },
     "accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -45713,6 +46780,25 @@
         "debug": "4"
       }
     },
+    "agentkeepalive": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz",
+      "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.0",
+        "depd": "^1.1.2",
+        "humanize-ms": "^1.2.1"
+      },
+      "dependencies": {
+        "depd": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+          "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+          "dev": true
+        }
+      }
+    },
     "aggregate-error": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
@@ -46778,8 +47864,7 @@
       "version": "1.6.51",
       "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
       "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "big.js": {
       "version": "5.2.2",
@@ -47079,7 +48164,8 @@
     "buffer-writer": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz",
-      "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="
+      "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==",
+      "dev": true
     },
     "buffer-xor": {
       "version": "1.0.3",
@@ -49225,9 +50311,9 @@
       }
     },
     "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og=="
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="
     },
     "dedent": {
       "version": "0.7.0",
@@ -49372,6 +50458,12 @@
         "repeat-string": "^1.5.4"
       }
     },
+    "detect-libc": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
+      "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
+      "dev": true
+    },
     "detect-newline": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
@@ -49459,6 +50551,12 @@
         "path-type": "^4.0.0"
       }
     },
+    "discontinuous-range": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz",
+      "integrity": "sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==",
+      "dev": true
+    },
     "dlv": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
@@ -50106,6 +51204,12 @@
       "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
       "dev": true
     },
+    "dotty": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/dotty/-/dotty-0.1.2.tgz",
+      "integrity": "sha512-V0EWmKeH3DEhMwAZ+8ZB2Ao4OK6p++Z0hsDtZq3N0+0ZMVqkzrcEGROvOnZpLnvBg5PTNG23JEDLAm64gPaotQ==",
+      "dev": true
+    },
     "duplexer": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
@@ -50193,6 +51297,26 @@
       "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "dev": true
     },
+    "encoding": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "optional": true,
+      "requires": {
+        "iconv-lite": "^0.6.2"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+          "optional": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3.0.0"
+          }
+        }
+      }
+    },
     "end-of-stream": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -50242,6 +51366,18 @@
       "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
       "dev": true
     },
+    "env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "dev": true
+    },
+    "err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
+      "dev": true
+    },
     "errno": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
@@ -52828,6 +53964,12 @@
         "entities": "^2.0.0"
       }
     },
+    "http-cache-semantics": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+      "dev": true
+    },
     "http-errors": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
@@ -52872,6 +54014,15 @@
       "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true
     },
+    "humanize-ms": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
+      "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
+      "dev": true,
+      "requires": {
+        "ms": "^2.0.0"
+      }
+    },
     "iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -53305,6 +54456,12 @@
       "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
       "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw=="
     },
+    "is-lambda": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
+      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
+      "dev": true
+    },
     "is-map": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
@@ -55285,26 +56442,23 @@
       }
     },
     "jsonwebtoken": {
-      "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
-      "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz",
+      "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==",
       "requires": {
         "jws": "^3.2.2",
-        "lodash.includes": "^4.3.0",
-        "lodash.isboolean": "^3.0.3",
-        "lodash.isinteger": "^4.0.4",
-        "lodash.isnumber": "^3.0.3",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.isstring": "^4.0.1",
-        "lodash.once": "^4.0.0",
+        "lodash": "^4.17.21",
         "ms": "^2.1.1",
-        "semver": "^5.6.0"
+        "semver": "^7.3.8"
       },
       "dependencies": {
         "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
         }
       }
     },
@@ -55426,6 +56580,17 @@
         "type-check": "~0.4.0"
       }
     },
+    "libpg-query": {
+      "version": "13.3.0",
+      "resolved": "https://registry.npmjs.org/libpg-query/-/libpg-query-13.3.0.tgz",
+      "integrity": "sha512-9PKW8iRWnSCw+IW5LlZYq+bLMmAhKsAIR2en8iRYnoRLBg4x+HKHBb+PQyqFy8+jC7AmzV65A+DsUO7tiZddEQ==",
+      "dev": true,
+      "requires": {
+        "@mapbox/node-pre-gyp": "^1.0.8",
+        "node-addon-api": "^1.6.3",
+        "node-gyp": "^8.0.0"
+      }
+    },
     "lie": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
@@ -55550,31 +56715,11 @@
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
     },
-    "lodash.includes": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
-      "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="
-    },
-    "lodash.isboolean": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
-      "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="
-    },
     "lodash.isequal": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
       "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
     },
-    "lodash.isinteger": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
-      "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA=="
-    },
-    "lodash.isnumber": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
-      "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="
-    },
     "lodash.isplainobject": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
@@ -55596,11 +56741,6 @@
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
     },
-    "lodash.once": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
-    },
     "lodash.template": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
@@ -55724,6 +56864,30 @@
       "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
       "devOptional": true
     },
+    "make-fetch-happen": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz",
+      "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==",
+      "dev": true,
+      "requires": {
+        "agentkeepalive": "^4.1.3",
+        "cacache": "^15.2.0",
+        "http-cache-semantics": "^4.1.0",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-lambda": "^1.0.1",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.3",
+        "minipass-collect": "^1.0.2",
+        "minipass-fetch": "^1.3.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^0.6.2",
+        "promise-retry": "^2.0.1",
+        "socks-proxy-agent": "^6.0.0",
+        "ssri": "^8.0.0"
+      }
+    },
     "makeerror": {
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
@@ -57006,6 +58170,18 @@
         "minipass": "^3.0.0"
       }
     },
+    "minipass-fetch": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz",
+      "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==",
+      "dev": true,
+      "requires": {
+        "encoding": "^0.1.12",
+        "minipass": "^3.1.0",
+        "minipass-sized": "^1.0.3",
+        "minizlib": "^2.0.0"
+      }
+    },
     "minipass-flush": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
@@ -57024,6 +58200,15 @@
         "minipass": "^3.0.0"
       }
     },
+    "minipass-sized": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
+      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
+      "dev": true,
+      "requires": {
+        "minipass": "^3.0.0"
+      }
+    },
     "minizlib": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
@@ -57094,6 +58279,12 @@
       "resolved": "https://registry.npmjs.org/moment-mini/-/moment-mini-2.29.4.tgz",
       "integrity": "sha512-uhXpYwHFeiTbY9KSgPPRoo1nt8OxNVdMVoTBYHfSEKeRkIkwGpO+gERmhuhBtzfaeOyTkykSrm2+noJBgqt3Hg=="
     },
+    "moo": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz",
+      "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==",
+      "dev": true
+    },
     "moo-color": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/moo-color/-/moo-color-1.0.3.tgz",
@@ -57205,6 +58396,26 @@
       "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
       "dev": true
     },
+    "nearley": {
+      "version": "2.20.1",
+      "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz",
+      "integrity": "sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==",
+      "dev": true,
+      "requires": {
+        "commander": "^2.19.0",
+        "moo": "^0.5.0",
+        "railroad-diagrams": "^1.0.0",
+        "randexp": "0.4.6"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+          "dev": true
+        }
+      }
+    },
     "negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@@ -57610,6 +58821,12 @@
         "tslib": "^2.0.3"
       }
     },
+    "node-addon-api": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz",
+      "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==",
+      "dev": true
+    },
     "node-cache": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/node-cache/-/node-cache-5.1.2.tgz",
@@ -57656,6 +58873,84 @@
         }
       }
     },
+    "node-gyp": {
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz",
+      "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==",
+      "dev": true,
+      "requires": {
+        "env-paths": "^2.2.0",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.2.6",
+        "make-fetch-happen": "^9.1.0",
+        "nopt": "^5.0.0",
+        "npmlog": "^6.0.0",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.2",
+        "which": "^2.0.2"
+      },
+      "dependencies": {
+        "are-we-there-yet": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
+          "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
+          "dev": true,
+          "requires": {
+            "delegates": "^1.0.0",
+            "readable-stream": "^3.6.0"
+          }
+        },
+        "gauge": {
+          "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
+          "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
+          "dev": true,
+          "requires": {
+            "aproba": "^1.0.3 || ^2.0.0",
+            "color-support": "^1.1.3",
+            "console-control-strings": "^1.1.0",
+            "has-unicode": "^2.0.1",
+            "signal-exit": "^3.0.7",
+            "string-width": "^4.2.3",
+            "strip-ansi": "^6.0.1",
+            "wide-align": "^1.1.5"
+          }
+        },
+        "npmlog": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
+          "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
+          "dev": true,
+          "requires": {
+            "are-we-there-yet": "^3.0.0",
+            "console-control-strings": "^1.1.0",
+            "gauge": "^4.0.3",
+            "set-blocking": "^2.0.0"
+          }
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "semver": {
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
+      }
+    },
     "node-gyp-build": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz",
@@ -57709,6 +59004,15 @@
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
       "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="
     },
+    "node-sql-parser": {
+      "version": "4.6.4",
+      "resolved": "https://registry.npmjs.org/node-sql-parser/-/node-sql-parser-4.6.4.tgz",
+      "integrity": "sha512-OPzbsiN5VX37/HM5BgGxcoDt1ggvFUc6gdzyQzoPjk8orTOHBlgHuDUugP5oRU+CcOw8GniilvV3pt5FBxp47A==",
+      "dev": true,
+      "requires": {
+        "big-integer": "^1.6.48"
+      }
+    },
     "nodemailer": {
       "version": "6.8.0",
       "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.8.0.tgz",
@@ -57719,6 +59023,15 @@
       "resolved": "https://registry.npmjs.org/non-layered-tidy-tree-layout/-/non-layered-tidy-tree-layout-2.0.2.tgz",
       "integrity": "sha512-gkXMxRzUH+PB0ax9dUN0yYF0S25BqeAYqhgMaLUFmpXLEk7Fcu8f4emJuOAY0V8kjDICxROIKsTAKsV/v355xw=="
     },
+    "nopt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "dev": true,
+      "requires": {
+        "abbrev": "1"
+      }
+    },
     "normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -58095,18 +59408,33 @@
       "dev": true
     },
     "octokit": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/octokit/-/octokit-2.0.10.tgz",
-      "integrity": "sha512-sI15RZVaV9iyqLLEky4i++tMM48Fo9a80zrpOXMdAtbomznBLDi/moi9mAjJg7Ii+EaSEyaWOVIh3M/Vk/a5mw==",
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/octokit/-/octokit-2.0.14.tgz",
+      "integrity": "sha512-z6cgZBFxirpFEQ1La8Lg83GCs5hOV2EPpkYYdjsGNbfQMv8qUGjq294MiRBCbZqLufviakGsPUxaNKe3JrPmsA==",
       "requires": {
-        "@octokit/app": "^13.0.5",
+        "@octokit/app": "^13.1.1",
         "@octokit/core": "^4.0.4",
         "@octokit/oauth-app": "^4.0.6",
-        "@octokit/plugin-paginate-rest": "^5.0.0",
-        "@octokit/plugin-rest-endpoint-methods": "^6.0.0",
+        "@octokit/plugin-paginate-rest": "^6.0.0",
+        "@octokit/plugin-rest-endpoint-methods": "^7.0.0",
         "@octokit/plugin-retry": "^4.0.3",
-        "@octokit/plugin-throttling": "^4.0.1",
-        "@octokit/types": "^8.0.0"
+        "@octokit/plugin-throttling": "^5.0.0",
+        "@octokit/types": "^9.0.0"
+      },
+      "dependencies": {
+        "@octokit/openapi-types": {
+          "version": "16.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz",
+          "integrity": "sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="
+        },
+        "@octokit/types": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz",
+          "integrity": "sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw==",
+          "requires": {
+            "@octokit/openapi-types": "^16.0.0"
+          }
+        }
       }
     },
     "on-finished": {
@@ -58288,7 +59616,8 @@
     "packet-reader": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz",
-      "integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="
+      "integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==",
+      "dev": true
     },
     "pako": {
       "version": "1.0.11",
@@ -58463,6 +59792,7 @@
       "version": "8.8.0",
       "resolved": "https://registry.npmjs.org/pg/-/pg-8.8.0.tgz",
       "integrity": "sha512-UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw==",
+      "dev": true,
       "requires": {
         "buffer-writer": "2.0.0",
         "packet-reader": "1.0.0",
@@ -58476,49 +59806,98 @@
     "pg-connection-string": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz",
-      "integrity": "sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="
+      "integrity": "sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==",
+      "dev": true
     },
     "pg-format": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/pg-format/-/pg-format-1.0.4.tgz",
-      "integrity": "sha512-YyKEF78pEA6wwTAqOUaHIN/rWpfzzIuMh9KdAhc3rSLQ/7zkRFcCgYBAEGatDstLyZw4g0s9SNICmaTGnBVeyw=="
+      "integrity": "sha512-YyKEF78pEA6wwTAqOUaHIN/rWpfzzIuMh9KdAhc3rSLQ/7zkRFcCgYBAEGatDstLyZw4g0s9SNICmaTGnBVeyw==",
+      "dev": true
     },
     "pg-int8": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
-      "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="
+      "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
+      "dev": true
     },
     "pg-pool": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.2.tgz",
       "integrity": "sha512-His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w==",
+      "dev": true,
       "requires": {}
     },
     "pg-protocol": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz",
-      "integrity": "sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="
+      "integrity": "sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==",
+      "dev": true
     },
     "pg-types": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
       "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
+      "dev": true,
       "requires": {
         "pg-int8": "1.0.1",
         "postgres-array": "~2.0.0",
         "postgres-bytea": "~1.0.0",
         "postgres-date": "~1.0.4",
         "postgres-interval": "^1.1.0"
+      },
+      "dependencies": {
+        "postgres-array": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
+          "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
+          "dev": true
+        }
       }
     },
     "pgpass": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
       "integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==",
+      "dev": true,
       "requires": {
         "split2": "^4.1.0"
       }
     },
+    "pgsql-deparser": {
+      "version": "13.3.15",
+      "resolved": "https://registry.npmjs.org/pgsql-deparser/-/pgsql-deparser-13.3.15.tgz",
+      "integrity": "sha512-Q/ZrQWYsymM+HefLaLK6PX1DNeDdfoKAH5wzfRrOxCsxRoTouIbWhwgVp3QaiovStjVPSeYNH+pqkLH4JsSn2A==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.11.2",
+        "dotty": "^0.1.0",
+        "lodash": "^4.17.20",
+        "pgsql-enums": "^13.1.3"
+      }
+    },
+    "pgsql-enums": {
+      "version": "13.1.3",
+      "resolved": "https://registry.npmjs.org/pgsql-enums/-/pgsql-enums-13.1.3.tgz",
+      "integrity": "sha512-h3OSGbv1rB1r3lWL3l0gHIMVMVBTzEzROkP2/Wpz2s1eDAffPf9O5x0OqrRdLzhze92S9GUqO/FrS15u027xyg==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.4.2"
+      }
+    },
+    "pgsql-parser": {
+      "version": "13.4.0",
+      "resolved": "https://registry.npmjs.org/pgsql-parser/-/pgsql-parser-13.4.0.tgz",
+      "integrity": "sha512-d3ZQtQnUptz19f+WpmRP4OLfAZ33LgYDpycTA9ZSNCF+AZyURfm9e3sRZJ/amBcLtpwnZuto9EHjVz3EPpiksA==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.11.2",
+        "libpg-query": "13.3.0",
+        "minimist": "^1.2.6",
+        "pgsql-deparser": "^13.3.14",
+        "pgsql-enums": "^13.1.3"
+      }
+    },
     "phenomenon": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/phenomenon/-/phenomenon-1.6.0.tgz",
@@ -59983,24 +61362,28 @@
       "dev": true
     },
     "postgres-array": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
-      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-3.0.1.tgz",
+      "integrity": "sha512-h7i53Dw2Yq3a1uuZ6lbVFAkvMMwssJ8jkzeAg0XaZm1XIFF/t/s+tockdqbWTymyEm07dVenOQbFisEi+kj8uA==",
+      "dev": true
     },
     "postgres-bytea": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
-      "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w=="
+      "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
+      "dev": true
     },
     "postgres-date": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
-      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q=="
+      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
+      "dev": true
     },
     "postgres-interval": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
       "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
+      "dev": true,
       "requires": {
         "xtend": "^4.0.0"
       }
@@ -60021,6 +61404,17 @@
       "integrity": "sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA==",
       "dev": true
     },
+    "prettier-plugin-sql": {
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-sql/-/prettier-plugin-sql-0.12.1.tgz",
+      "integrity": "sha512-2z0pMmQEC61Xywerw2FJFpEIaA9lJUjB5mj+9dfRU8HkU7iICFrIizpMjSSDMoGkhh5W+IRROVgLlgRdpphI7g==",
+      "dev": true,
+      "requires": {
+        "node-sql-parser": "^4.4.0",
+        "sql-formatter": "^10.0.0",
+        "tslib": "^2.4.0"
+      }
+    },
     "pretty-error": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz",
@@ -60093,6 +61487,16 @@
       "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
       "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="
     },
+    "promise-retry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+      "dev": true,
+      "requires": {
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
+      }
+    },
     "promise.allsettled": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/promise.allsettled/-/promise.allsettled-1.0.6.tgz",
@@ -60283,12 +61687,28 @@
       "resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz",
       "integrity": "sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ=="
     },
+    "railroad-diagrams": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz",
+      "integrity": "sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==",
+      "dev": true
+    },
     "ramda": {
       "version": "0.28.0",
       "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.28.0.tgz",
       "integrity": "sha512-9QnLuG/kPVgWvMQ4aODhsBUFKOUmnbUnsSXACv+NCQZcHbeb+v8Lodp8OVxtRULN1/xOyYLLaL6npE6dMq5QTA==",
       "dev": true
     },
+    "randexp": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz",
+      "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==",
+      "dev": true,
+      "requires": {
+        "discontinuous-range": "1.0.0",
+        "ret": "~0.1.10"
+      }
+    },
     "randomatic": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
@@ -62099,6 +63519,12 @@
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
     },
+    "retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
+      "dev": true
+    },
     "reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -62714,6 +64140,12 @@
         "is-fullwidth-code-point": "^3.0.0"
       }
     },
+    "smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "dev": true
+    },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -62846,6 +64278,27 @@
         }
       }
     },
+    "socks": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
+      "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
+      "dev": true,
+      "requires": {
+        "ip": "^2.0.0",
+        "smart-buffer": "^4.2.0"
+      }
+    },
+    "socks-proxy-agent": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz",
+      "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==",
+      "dev": true,
+      "requires": {
+        "agent-base": "^6.0.2",
+        "debug": "^4.3.3",
+        "socks": "^2.6.2"
+      }
+    },
     "source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -62966,13 +64419,24 @@
     "split2": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/split2/-/split2-4.1.0.tgz",
-      "integrity": "sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ=="
+      "integrity": "sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==",
+      "dev": true
     },
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
     },
+    "sql-formatter": {
+      "version": "10.7.2",
+      "resolved": "https://registry.npmjs.org/sql-formatter/-/sql-formatter-10.7.2.tgz",
+      "integrity": "sha512-YspJXMr2rKMGZY50zYRBs2nCtEO/AKDrmQOxmV2CrGEOFSXUhY3YbsOUe6lX0T/7xbBs4pAYv4UObmwf78vtKg==",
+      "dev": true,
+      "requires": {
+        "argparse": "^2.0.1",
+        "nearley": "^2.20.1"
+      }
+    },
     "sqlstring": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.3.tgz",
@@ -63343,7 +64807,7 @@
         "@storybook/testing-library": "^0.0.9",
         "@stripe/react-stripe-js": "^1.7.0",
         "@stripe/stripe-js": "^1.25.0",
-        "@supabase/postgres-meta": "^0.26.1",
+        "@supabase/postgres-meta": "^0.60.2",
         "@supabase/react-data-grid": "^7.1.0-beta.7",
         "@supabase/shared-types": "^0.1.29",
         "@supabase/supabase-js": "^2.1.1",
@@ -65224,12 +66688,12 @@
       }
     },
     "universal-github-app-jwt": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/universal-github-app-jwt/-/universal-github-app-jwt-1.1.0.tgz",
-      "integrity": "sha512-3b+ocAjjz4JTyqaOT+NNBd5BtTuvJTxWElIoeHSVelUV9J3Jp7avmQTdLKCaoqi/5Ox2o/q+VK19TJ233rVXVQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/universal-github-app-jwt/-/universal-github-app-jwt-1.1.1.tgz",
+      "integrity": "sha512-G33RTLrIBMFmlDV4u4CBF7dh71eWwykck4XgaxaIVeZKOYZRAAxvcGMRFTUclVY6xoUPQvO4Ne5wKGxYm/Yy9w==",
       "requires": {
-        "@types/jsonwebtoken": "^8.3.3",
-        "jsonwebtoken": "^8.5.1"
+        "@types/jsonwebtoken": "^9.0.0",
+        "jsonwebtoken": "^9.0.0"
       }
     },
     "universal-user-agent": {
@@ -66560,7 +68024,7 @@
         "next-seo": "^4.20.0",
         "next-transpile-modules": "^9.0.0",
         "nodemailer": "^6.7.3",
-        "octokit": "^2.0.10",
+        "octokit": "^2.0.14",
         "parse-numeric-range": "^1.3.0",
         "postcss": "^8.4.18",
         "postcss-preset-env": "^6.7.0",
diff --git a/package.json b/package.json
index bf893aa1978..27c148a2ab9 100644
--- a/package.json
+++ b/package.json
@@ -62,5 +62,8 @@
     "mdx-mermaid": "^1.3.2",
     "mermaid": "^9.2.2",
     "mini-svg-data-uri": "^1.4.4"
+  },
+  "overrides": {
+    "pgsql-parser": "13.4.0"
   }
 }
diff --git a/packages/config/tailwind.config.js b/packages/config/tailwind.config.js
index 5fd41709ca8..bc54640b822 100644
--- a/packages/config/tailwind.config.js
+++ b/packages/config/tailwind.config.js
@@ -159,6 +159,7 @@ module.exports = ui({
               position: 'relative',
               transition: 'color 0.3s ease-in-out',
               paddingBottom: '2px',
+              fontWeight: '400',
               color: 'var(--colors-scale12)',
               textDecorationLine: 'underline',
               textDecorationColor: 'var(--colors-brand7)',
diff --git a/packages/ui/src/lib/theme/defaultTheme.ts b/packages/ui/src/lib/theme/defaultTheme.ts
index 03f568e2ec4..1265d536a10 100644
--- a/packages/ui/src/lib/theme/defaultTheme.ts
+++ b/packages/ui/src/lib/theme/defaultTheme.ts
@@ -441,9 +441,9 @@ export default {
     container: 'inline-flex font-medium',
     type: {
       primary: `
-        bg-brand-fixed-800 hover:bg-brand-fixed-900
+        bg-brand-fixed-1100 hover:bg-brand-fixed-1000
         text-white
-        bordershadow-brand-fixed-800 hover:bordershadow-brand-fixed-1000
+        bordershadow-brand-fixed-1000 hover:bordershadow-brand-fixed-900 dark:bordershadow-brand-fixed-1000 dark:hover:bordershadow-brand-fixed-1000
         focus-visible:outline-brand-600
       `,
       secondary: `
diff --git a/spec/cli_v1_commands.yaml b/spec/cli_v1_commands.yaml
index fabffeb3733..c060b75634e 100644
--- a/spec/cli_v1_commands.yaml
+++ b/spec/cli_v1_commands.yaml
@@ -1,7 +1,7 @@
 clispec: '001'
 info:
   id: cli
-  version: 1.27.0
+  version: 1.34.5
   title: Supabase CLI
   language: sh
   source: https://github.com/supabase/cli
@@ -155,6 +155,18 @@ commands:
   - id: supabase-stop
     title: supabase stop
     summary: Stop all local Supabase containers
+    examples:
+      - id: basic-usage
+        name: Basic usage
+        code: supabase stop
+        response: |
+          Stopped supabase local development setup.
+      - id: with-backup
+        name: Backup local database before stopping
+        code: supabase stop --backup
+        response: |
+          Database exported to supabase/.branches/main
+          Stopped supabase local development setup.
     tags:
       - local-dev
     links: []
@@ -168,6 +180,40 @@ commands:
   - id: supabase-status
     title: supabase status
     summary: Show status of local Supabase containers
+    examples:
+      - id: basic-usage
+        name: Basic usage
+        code: supabase status
+        response: |
+          supabase local development setup is running.
+
+                  API URL: http://localhost:54321
+                    DB URL: postgresql://postgres:postgres@localhost:54322/postgres
+                Studio URL: http://localhost:54323
+              Inbucket URL: http://localhost:54324
+                JWT secret: super-secret-jwt-token-with-at-least-32-characters-long
+                  anon key: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0
+          service_role key: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJzdJsyH-qQwv8Hdp7fsn3W0YpN81IU
+      - id: output-env
+        name: Format status as environment variables
+        code: supabase status -o env
+        response: |
+          ANON_KEY="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0"
+          API_URL="http://localhost:54321"
+          DB_URL="postgresql://postgres:postgres@localhost:54322/postgres"
+          INBUCKET_URL="http://localhost:54324"
+          JWT_SECRET="super-secret-jwt-token-with-at-least-32-characters-long"
+          SERVICE_ROLE_KEY="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJzdJsyH-qQwv8Hdp7fsn3W0YpN81IU"
+          STUDIO_URL="http://localhost:54323"
+      - id: output-custom-name
+        name: Customize the names of exported variables
+        code: supabase status -o env --override-name auth.anon_key=SUPABASE_ANON_KEY --override-name auth.service_role_key=SUPABASE_SERVICE_KEY
+        response: |
+          Stopped services: [supabase_inbucket_cli supabase_rest_cli supabase_studio_cli]
+          SUPABASE_ANON_KEY="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0"
+          DB_URL="postgresql://postgres:postgres@localhost:54322/postgres"
+          JWT_SECRET="super-secret-jwt-token-with-at-least-32-characters-long"
+          SUPABASE_SERVICE_KEY="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJzdJsyH-qQwv8Hdp7fsn3W0YpN81IU"
     tags:
       - local-dev
     links: []
@@ -201,6 +247,37 @@ commands:
   - id: supabase-start
     title: supabase start
     summary: Start containers for Supabase local development
+    description: |2
+
+      Starts the Supabase local development stack.
+
+      Requires `supabase/config.toml` to be created in your current working directory by running `supabase init`.
+
+      All service containers are started by default. You can exclude those not needed by passing in `-x` flag.
+
+      Health checks are automatically added to verify the started containers. Use `--ignore-health-check` flag to ignore these errors.
+    examples:
+      - id: basic-usage
+        name: Basic usage
+        code: supabase start
+        response: |
+          Applying migration 20220810154536_employee.sql...
+          Seeding data supabase/seed.sql...
+          Started supabase local development setup.
+      - id: without-studio
+        name: Start containers without studio
+        code: supabase start -x studio
+        response: |
+          Excluding container: supabase/studio:20221214-4eecc99
+          Seeding data supabase/seed.sql...
+          Started supabase local development setup.
+      - id: ignore-health-check
+        name: Ignore service health checks
+        code: supabase start --ignore-health-check
+        response: |
+          Seeding data supabase/seed.sql...
+          service not healthy: [supabase_storage_cli]
+          Started supabase local development setup.
     tags:
       - local-dev
     links: []
@@ -212,6 +289,10 @@ commands:
         description: |
           Names of containers to not start. [gotrue, realtime, storage-api, imgproxy, kong, inbucket, postgrest, pgadmin-schema-diff, migra, postgres-meta, studio, deno-relay]
         default_value: '[]'
+      - id: ignore-health-check
+        name: --ignore-health-check
+        description: Ignore unhealthy services and exit 0
+        default_value: 'false'
   - id: supabase-secrets
     title: supabase secrets
     summary: Manage Supabase secrets
@@ -528,6 +609,23 @@ commands:
   - id: supabase-login
     title: supabase login
     summary: Authenticate using an access token
+    description: |2
+
+      Connect the Supabase CLI to your Supabase account by logging in with your [personal access token](https://app.supabase.com/account/tokens).
+
+      Your access token is stored securely in [native credentials storage](https://github.com/zalando/go-keyring#dependencies). If native credentials storage is unavailable, it will be written to a plain text file at `~/.supabase/access-token`.
+
+      > If this behavior is not desired, such as in a CI environment, you may skip login by specifying the `SUPABASE_ACCESS_TOKEN` environment variable in other commands.
+
+      The Supabase CLI uses the stored token to access Management APIs for projects, functions, secrets, etc.
+    examples:
+      - id: basic-usage
+        name: Basic usage
+        code: supabase login
+        response: |
+          You can generate an access token from https://app.supabase.com/account/tokens
+          Enter your access token: sbp_****************************************
+          Finished supabase login.
     tags:
       - local-dev
     links: []
@@ -537,6 +635,28 @@ commands:
   - id: supabase-link
     title: supabase link
     summary: Link to a Supabase project
+    description: |2
+
+      Link your local development project to a hosted Supabase project.
+
+      PostgREST configurations are fetched from the Supabase platform and validated against your local configuration file.
+
+      Optionally, database settings can be validated if you provide a password. Your database password is saved in native credentials storage if available.
+
+      Some commands like `db dump`, `db push`, and `db remote commit` require your project to be linked first.
+    examples:
+      - id: basic-usage
+        name: Basic usage
+        code: supabase link --project-ref ********************
+        response: |
+          Enter your database password: ********
+          Finished supabase link.
+      - id: without-password
+        name: Link without database password
+        code: supabase link --project-ref ******************** <<< ""
+        response: |
+          Enter your database password:
+          Finished supabase link.
     tags:
       - local-dev
     links: []
@@ -555,6 +675,24 @@ commands:
   - id: supabase-init
     title: supabase init
     summary: Initialize a local project
+    description: |2
+
+      Initialize configurations for Supabase local development.
+
+      A `supabase/config.toml` file is created in your current working directory. This configuration is specific to each local project.
+
+      > You may override the directory path by specifying the `SUPABASE_WORKDIR` environment variable.
+
+      In addition to `config.toml`, the `supabase` directory may also contain other Supabase objects, such as `migrations`, `functions`, `tests`, etc.
+    examples:
+      - id: basic-usage
+        name: Basic usage
+        code: supabase init
+        response: Finished supabase init.
+      - id: from-workdir
+        name: Initialize from an existing directory
+        code: supabase init --workdir .
+        response: Finished supabase init.
     tags:
       - local-dev
     links: []
@@ -617,6 +755,7 @@ commands:
     subcommands:
       - supabase-functions-delete
       - supabase-functions-deploy
+      - supabase-functions-download
       - supabase-functions-new
       - supabase-functions-serve
     flags: []
@@ -649,6 +788,20 @@ commands:
     usage: supabase functions new <Function name>
     subcommands: []
     flags: []
+  - id: supabase-functions-download
+    title: supabase functions download
+    summary: Download a Function from Supabase
+    description: |
+      Download the source code for a Function from the linked Supabase project.
+    tags: []
+    links: []
+    usage: supabase functions download <Function name> [flags]
+    subcommands: []
+    flags:
+      - id: project-ref
+        name: --project-ref <string>
+        description: Project ref of the Supabase project.
+        default_value: ''
   - id: supabase-functions-deploy
     title: supabase functions deploy
     summary: Deploy a Function to Supabase
@@ -851,6 +1004,10 @@ commands:
         name: -p, --password <string>
         description: Password to your remote Postgres database.
         default_value: ''
+      - id: schema
+        name: -s, --schema <strings>
+        description: List of schema to include.
+        default_value: all
   - id: supabase-db-push
     title: supabase db push
     summary: Push new migrations to the remote database
@@ -890,7 +1047,7 @@ commands:
       - id: schema
         name: -s, --schema <strings>
         description: List of schema to include.
-        default_value: '[public]'
+        default_value: all
   - id: supabase-db-dump
     title: supabase db dump
     summary: Dumps schemas from the remote database
@@ -926,10 +1083,14 @@ commands:
       - id: schema
         name: -s, --schema <strings>
         description: List of schema to include.
-        default_value: '[public]'
+        default_value: all
       - id: use-migra
         name: --use-migra
         description: Use migra to generate schema diff.
+        default_value: 'true'
+      - id: use-pgadmin
+        name: --use-pgadmin
+        description: Use pgAdmin to generate schema diff.
         default_value: 'false'
   - id: supabase-completion
     title: supabase completion
diff --git a/spec/cli_v1_config.yaml b/spec/cli_v1_config.yaml
index 092ab7794f0..f068f0599c5 100644
--- a/spec/cli_v1_config.yaml
+++ b/spec/cli_v1_config.yaml
@@ -35,6 +35,9 @@ info:
     - id: local
       title: Local Development
       description: Local Development.
+    - id: edge-functions
+      title: Edge Functions
+      description: Edge Functions.
 
 # This section is an array of public functions which a user might need to execute.
 parameters:
@@ -42,7 +45,6 @@ parameters:
     title: 'project_id' # {string} Any name.
     tags: ['general'] # {string[]} These tags are useful for grouping parameters
     required: true
-    # default: '5432'
     description: |
       A string used to distinguish different Supabase projects on the same host. Defaults to the working directory name when running `supabase init`.
 
@@ -50,20 +52,32 @@ parameters:
     title: 'api.port'
     tags: ['api']
     required: true
-    default: '54321'
     description: |
       Port to use for the API URL.
     links:
       - name: 'PostgREST configuration'
         link: 'https://postgrest.org/en/stable/configuration.html'
 
+  - id: 'api.schemas'
+    title: 'api.schemas'
+    tags: ['api']
+    required: false
+    default: '["public", "storage", "graphql_public"]'
+    description: |
+      Schemas to expose in your API. Tables, views and functions in this schema
+      will get API endpoints. `public` and `storage` are always included.
+    links:
+      - name: 'PostgREST configuration'
+        link: 'https://postgrest.org/en/stable/configuration.html'
+
   - id: 'api.extra_search_path'
     title: 'api.extra_search_path'
     tags: ['api']
-    required: true
-    default: '["extensions"]'
+    required: false
+    default: '["public"]'
     description: |
-      Extra schemas to add to the `search_path` of every request.
+      Extra schemas to add to the search_path of every request. public is always
+      included.
     links:
       - name: 'PostgREST configuration'
         link: 'https://postgrest.org/en/stable/configuration.html'
@@ -71,7 +85,7 @@ parameters:
   - id: 'api.max_rows'
     title: 'api.max_rows'
     tags: ['api']
-    required: true
+    required: false
     default: '1000'
     description: |
       The maximum number of rows returned from a view, table, or stored procedure. Limits payload size for accidental or malicious requests.
@@ -83,13 +97,21 @@ parameters:
     title: 'db.port'
     tags: ['database']
     required: true
-    default: '54322'
     description: |
       Port to use for the local database URL.
     links:
       - name: 'PostgreSQL configuration'
         link: 'https://postgrest.org/en/stable/configuration.html'
 
+  - id: 'db.shadow_port'
+    title: 'db.shadow_port'
+    tags: ['database']
+    required: false
+    default: '54320'
+    description: |
+      Port to use for the local shadow database.
+    links: []
+
   - id: 'db.major_version'
     title: 'db.major_version'
     tags: ['database']
@@ -105,7 +127,6 @@ parameters:
     title: 'studio.port'
     tags: ['dashboard']
     required: true
-    default: '54323'
     description: |
       Port to use for Supabase Studio.
     links: []
@@ -114,7 +135,6 @@ parameters:
     title: 'inbucket.port'
     tags: ['local']
     required: true
-    default: '54324'
     description: |
       Port to use for the email testing server web interface.
 
@@ -123,6 +143,44 @@ parameters:
       - name: 'Inbucket documentation'
         link: 'https://www.inbucket.org'
 
+  - id: 'inbucket.smtp_port'
+    title: 'inbucket.smtp_port'
+    tags: ['local']
+    required: false
+    description: |
+      Port to use for the email testing server SMTP port.
+
+      Emails sent with the local dev setup are not actually sent - rather, they are monitored, and you can view the emails that would have been sent from the web interface.
+
+      If set, you can access the SMTP server from this port.
+    links:
+      - name: 'Inbucket documentation'
+        link: 'https://www.inbucket.org'
+
+  - id: 'inbucket.pop3_port'
+    title: 'inbucket.pop3_port'
+    tags: ['local']
+    required: false
+    description: |
+      Port to use for the email testing server POP3 port.
+
+      Emails sent with the local dev setup are not actually sent - rather, they are monitored, and you can view the emails that would have been sent from the web interface.
+
+      If set, you can access the POP3 server from this port.
+    links:
+      - name: 'Inbucket documentation'
+        link: 'https://www.inbucket.org'
+
+  - id: 'storage.file_size_limit'
+    title: 'storage.file_size_limit'
+    tags: ['local']
+    required: false
+    description: |
+      The maximum file size allowed (e.g. "5MB", "500KB").
+    links:
+      - name: 'Storage server configuration'
+        link: 'https://supabase.com/docs/guides/self-hosting/storage/config'
+
   - id: 'auth.site_url'
     title: 'auth.site_url'
     tags: ['auth']
@@ -228,7 +286,6 @@ parameters:
     title: 'auth.external.<provider>.client_id'
     tags: ['auth']
     required: true
-    default: '""'
     description: |
       Client ID for the external OAuth provider.
     links:
@@ -239,9 +296,61 @@ parameters:
     title: 'auth.external.<provider>.secret'
     tags: ['auth']
     required: true
-    default: '""'
     description: |
       Client secret for the external OAuth provider.
     links:
       - name: 'Auth Server configuration'
         link: 'https://supabase.com/docs/reference/auth'
+
+  - id: 'auth.external.provider.url'
+    title: 'auth.external.<provider>.url'
+    tags: ['auth']
+    required: false
+    default: '""'
+    description: |
+      The base URL used for constructing the URLs to request authorization and
+      access tokens. Used by gitlab and keycloak. For gitlab it defaults to
+      https://gitlab.com. For keycloak you need to set this to your instance,
+      for example: https://keycloak.example.com/realms/myrealm .
+    links:
+      - name: 'Auth Server configuration'
+        link: 'https://supabase.com/docs/reference/auth'
+
+  - id: 'auth.external.provider.redirect_uri'
+    title: 'auth.external.<provider>.redirect_uri'
+    tags: ['auth']
+    required: false
+    default: '""'
+    description: |
+      The URI a OAuth2 provider will redirect to with the code and state values.
+    links:
+      - name: 'Auth Server configuration'
+        link: 'https://supabase.com/docs/reference/auth'
+
+  - id: 'functions.function_name.verify_jwt'
+    title: 'functions.<function_name>.verify_jwt'
+    tags: ['edge-functions']
+    required: false
+    default: 'true'
+    description: |
+      By default, when you deploy your Edge Functions or serve them locally, it
+      will reject requests without a valid JWT in the Authorization header.
+      Setting this configuration changes the default behavior.
+
+      Note that the `--no-verify-jwt` flag overrides this configuration.
+    links:
+      - name: '`supabase functions` CLI subcommands'
+        link: 'https://supabase.com/docs/reference/cli/supabase-functions'
+
+  - id: 'functions.function_name.import_map'
+    title: 'functions.<function_name>.import_map'
+    tags: ['edge-functions']
+    required: false
+    default: 'true'
+    description: |
+      Specify the Deno import map file to use for the Function.
+
+      Note that the `--import-map` flag overrides this configuration.
+    links:
+      - name: '`supabase functions` CLI subcommands'
+        link: 'https://supabase.com/docs/reference/cli/supabase-functions'
diff --git a/spec/common-cli-sections.json b/spec/common-cli-sections.json
index 4481a05bacf..8e5dff89916 100644
--- a/spec/common-cli-sections.json
+++ b/spec/common-cli-sections.json
@@ -14,71 +14,81 @@
     "type": "markdown"
   },
   {
-    "title": "general",
+    "title": "General",
     "items": [
       {
         "id": "supabase-init",
-        "title": "supabase init",
+        "title": "Initialize a local project",
         "slug": "supabase-init",
         "type": "cli-command"
       },
       {
         "id": "supabase-login",
-        "title": "supabase login",
+        "title": "Log in to a Supabase account",
         "slug": "supabase-login",
         "type": "cli-command"
       },
       {
         "id": "supabase-link",
-        "title": "supabase link",
+        "title": "Link to a Supabase project",
         "slug": "supabase-link",
         "type": "cli-command"
       },
       {
         "id": "supabase-start",
-        "title": "supabase start",
+        "title": "Start a container",
         "slug": "supabase-start",
         "type": "cli-command"
       },
       {
         "id": "supabase-stop",
-        "title": "supabase stop",
+        "title": "Stop all containers",
         "slug": "supabase-stop",
         "type": "cli-command"
       },
       {
         "id": "supabase-status",
-        "title": "supabase status",
+        "title": "Retrieve container status",
         "slug": "supabase-status",
         "type": "cli-command"
-      },
+      }
+    ]
+  },
+  {
+    "title": "Testing",
+    "items": [
       {
         "id": "supabase-test",
-        "title": "supabase test",
+        "title": "Run tests",
         "slug": "supabase-test",
         "type": "cli-command"
       },
       {
         "id": "supabase-test-db",
-        "title": "supabase test db",
+        "title": "Run tests (pgTAP)",
         "slug": "supabase-test-db",
         "type": "cli-command"
-      },
+      }
+    ]
+  },
+  {
+    "title": "Generate Types",
+    "items": [
       {
         "id": "supabase-gen",
-        "title": "supabase gen",
+        "title": "Run code generation tools",
         "slug": "supabase-gen",
         "type": "cli-command"
       },
       {
         "id": "supabase-gen-types",
-        "title": "supabase gen types",
+        "title": "Generate types (Postgres schema)",
         "slug": "supabase-gen-types",
         "type": "cli-command"
       },
       {
         "id": "supabase-gen-types-typescript",
-        "title": "supabase gen types typescript",
+        "title": "Generate types (TypeScript)",
         "slug": "supabase-gen-types-typescript",
         "type": "cli-command"
       }
@@ -87,115 +97,120 @@
   {
     "title": "Database",
     "items": [
-      { "id": "supabase-db", "title": "supabase db", "slug": "supabase-db", "type": "cli-command" },
+      {
+        "id": "supabase-db",
+        "title": "Manage local databases",
+        "slug": "supabase-db",
+        "type": "cli-command"
+      },
       {
         "id": "supabase-db-dump",
-        "title": "supabase db dump",
+        "title": "Dump schema from remote database",
         "slug": "supabase-db-dump",
         "type": "cli-command"
       },
       {
         "id": "supabase-db-push",
-        "title": "supabase db push",
+        "title": "Push migration to remote database",
         "slug": "supabase-db-push",
         "type": "cli-command"
       },
       {
         "id": "supabase-db-reset",
-        "title": "supabase db reset",
+        "title": "Reset local database",
         "slug": "supabase-db-reset",
         "type": "cli-command"
       },
       {
         "id": "supabase-db-diff",
-        "title": "supabase db diff",
+        "title": "Diff local database",
         "slug": "supabase-db-diff",
         "type": "cli-command"
       },
       {
         "id": "supabase-db-lint",
-        "title": "supabase db lint",
+        "title": "Lint local database",
         "slug": "supabase-db-lint",
         "type": "cli-command"
       },
       {
         "id": "supabase-db-remote",
-        "title": "supabase db remote",
+        "title": "Manage remote databases",
         "slug": "supabase-db-remote",
         "type": "cli-command"
       },
       {
         "id": "supabase-db-remote-commit",
-        "title": "supabase db remote commit",
+        "title": "Commit remote database changes",
         "slug": "supabase-db-remote-commit",
         "type": "cli-command"
       }
     ]
   },
   {
-    "title": "migrations",
+    "title": "Migrations",
     "items": [
       {
         "id": "supabase-migration",
-        "title": "supabase migration",
+        "title": "Manage database migrations",
         "slug": "supabase-migration",
         "type": "cli-command"
       },
       {
         "id": "supabase-migration-new",
-        "title": "supabase migration new",
+        "title": "Create a migration",
         "slug": "supabase-migration-new",
         "type": "cli-command"
       },
       {
         "id": "supabase-migration-list",
-        "title": "supabase migration list",
+        "title": "List all migrations",
         "slug": "supabase-migration-list",
         "type": "cli-command"
       },
       {
         "id": "supabase-migration-repair",
-        "title": "supabase migration repair",
+        "title": "Repair migration history table",
         "slug": "supabase-migration-repair",
         "type": "cli-command"
       }
     ]
   },
   {
-    "title": "projects",
+    "title": "Projects",
     "items": [
       {
         "id": "supabase-projects",
-        "title": "supabase projects",
+        "title": "Manage projects",
         "slug": "supabase-projects",
         "type": "cli-command"
       },
       {
         "id": "supabase-projects-create",
-        "title": "supabase projects create",
+        "title": "Create a project",
         "slug": "supabase-projects-create",
         "type": "cli-command"
       },
       {
         "id": "supabase-projects-list",
-        "title": "supabase projects list",
+        "title": "List all projects",
         "slug": "supabase-projects-list",
         "type": "cli-command"
       }
     ]
   },
   {
-    "title": "organizations",
+    "title": "Organizations",
     "items": [
       {
         "id": "supabase-orgs",
-        "title": "supabase orgs",
+        "title": "Manage organizations",
         "slug": "supabase-orgs",
         "type": "cli-command"
       },
       {
         "id": "supabase-orgs-list",
-        "title": "supabase orgs list",
+        "title": "List all organizations",
         "slug": "supabase-orgs-list",
         "type": "cli-command"
       }
@@ -206,101 +221,107 @@
     "items": [
       {
         "id": "supabase-functions",
-        "title": "supabase functions",
+        "title": "Manage edge functions",
         "slug": "supabase-functions",
         "type": "cli-command"
       },
       {
         "id": "supabase-functions-new",
-        "title": "supabase functions new",
+        "title": "Create a function",
         "slug": "supabase-functions-new",
         "type": "cli-command"
       },
+      {
+        "id": "supabase-functions-download",
+        "title": "Download a function",
+        "slug": "supabase-functions-download",
+        "type": "cli-command"
+      },
       {
         "id": "supabase-functions-serve",
-        "title": "supabase functions serve",
+        "title": "Serve a function",
         "slug": "supabase-functions-serve",
         "type": "cli-command"
       },
       {
         "id": "supabase-functions-deploy",
-        "title": "supabase functions deploy",
+        "title": "Deploy a function",
         "slug": "supabase-functions-deploy",
         "type": "cli-command"
       },
       {
         "id": "supabase-functions-delete",
-        "title": "supabase functions delete",
+        "title": "Delete a function",
         "slug": "supabase-functions-delete",
         "type": "cli-command"
       }
     ]
   },
   {
-    "title": "secrets",
+    "title": "Secrets",
     "items": [
       {
         "id": "supabase-secrets",
-        "title": "supabase secrets",
+        "title": "Manage secrets",
         "slug": "supabase-secrets",
         "type": "cli-command"
       },
       {
         "id": "supabase-secrets-set",
-        "title": "supabase secrets set",
+        "title": "Set a secret",
         "slug": "supabase-secrets-set",
         "type": "cli-command"
       },
       {
         "id": "supabase-secrets-list",
-        "title": "supabase secrets list",
+        "title": "List all secrets",
         "slug": "supabase-secrets-list",
         "type": "cli-command"
       },
       {
         "id": "supabase-secrets-unset",
-        "title": "supabase secrets unset",
+        "title": "Unset a secret",
         "slug": "supabase-secrets-unset",
         "type": "cli-command"
       }
     ]
   },
   {
-    "title": "Domains",
+    "title": "Custom Domains",
     "items": [
       {
         "id": "supabase-domains",
-        "title": "supabase domains",
+        "title": "Manage custom domains",
         "slug": "supabase-domains",
         "type": "cli-command"
       },
       {
         "id": "supabase-domains-activate",
-        "title": "supabase domains activate",
+        "title": "Activate custom hostname",
         "slug": "supabase-domains-activate",
         "type": "cli-command"
       },
       {
         "id": "supabase-domains-create",
-        "title": "supabase domains create",
+        "title": "Create a custom hostname",
         "slug": "supabase-domains-create",
         "type": "cli-command"
       },
       {
         "id": "supabase-domains-get",
-        "title": "supabase domains get",
+        "title": "Retrieve custom hostname config",
         "slug": "supabase-domains-get",
         "type": "cli-command"
       },
       {
         "id": "supabase-domains-reverify",
-        "title": "supabase domains reverify",
+        "title": "Re-verify custom hostname config",
         "slug": "supabase-domains-reverify",
         "type": "cli-command"
       },
       {
         "id": "supabase-domains-delete",
-        "title": "supabase domains delete",
+        "title": "Delete custom hostname config",
         "slug": "supabase-domains-delete",
         "type": "cli-command"
       }
@@ -311,31 +332,31 @@
     "items": [
       {
         "id": "supabase-vanity-subdomains",
-        "title": "supabase vanity-subdomains",
+        "title": "Manage vanity subdomains",
         "slug": "supabase-vanity-subdomains",
         "type": "cli-command"
       },
       {
         "id": "supabase-vanity-subdomains-activate",
-        "title": "supabase vanity-subdomains activate",
+        "title": "Activate a vanity subdomain",
         "slug": "supabase-vanity-subdomains-activate",
         "type": "cli-command"
       },
       {
         "id": "supabase-vanity-subdomains-get",
-        "title": "supabase vanity-subdomains get",
+        "title": "Retrieve vanity subdomain",
         "slug": "supabase-vanity-subdomains-get",
         "type": "cli-command"
       },
       {
         "id": "supabase-vanity-subdomains-check-availability",
-        "title": "supabase vanity-subdomains check-availability",
+        "title": "Check subdomain availability",
         "slug": "supabase-vanity-subdomains-check-availability",
         "type": "cli-command"
       },
       {
         "id": "supabase-vanity-subdomains-delete",
-        "title": "supabase vanity-subdomains delete",
+        "title": "Delete vanity subdomain",
         "slug": "supabase-vanity-subdomains-delete",
         "type": "cli-command"
       }
@@ -346,19 +367,19 @@
     "items": [
       {
         "id": "supabase-network-bans",
-        "title": "supabase network-bans",
+        "title": "Manage network bans",
         "slug": "supabase-network-bans",
         "type": "cli-command"
       },
       {
         "id": "supabase-network-bans-get",
-        "title": "supabase network-bans get",
+        "title": "Retrieve network bans",
         "slug": "supabase-network-bans-get",
         "type": "cli-command"
       },
       {
         "id": "supabase-network-bans-remove",
-        "title": "supabase network-bans remove",
+        "title": "Remove a network ban",
         "slug": "supabase-network-bans-remove",
         "type": "cli-command"
       }
@@ -369,54 +390,54 @@
     "items": [
       {
         "id": "supabase-network-restrictions",
-        "title": "supabase network-restrictions",
+        "title": "Manage network restrictions",
         "slug": "supabase-network-restrictions",
         "type": "cli-command"
       },
       {
         "id": "supabase-network-restrictions-get",
-        "title": "supabase network-restrictions get",
+        "title": "Retrieve network restrictions",
         "slug": "supabase-network-restrictions-get",
         "type": "cli-command"
       },
       {
         "id": "supabase-network-restrictions-update",
-        "title": "supabase network-restrictions update",
+        "title": "Update network restrictions",
         "slug": "supabase-network-restrictions-update",
         "type": "cli-command"
       }
     ]
   },
   {
-    "title": "Completion",
+    "title": "Autocompletion Scripts",
     "items": [
       {
         "id": "supabase-completion",
-        "title": "supabase completion",
+        "title": "Generate autocompletion scripts",
         "slug": "supabase-completion",
         "type": "cli-command"
       },
       {
         "id": "supabase-completion-zsh",
-        "title": "supabase completion zsh",
+        "title": "Generate zsh script",
         "slug": "supabase-completion-zsh",
         "type": "cli-command"
       },
       {
         "id": "supabase-completion-powershell",
-        "title": "supabase completion powershell",
+        "title": "Generate powershell script",
         "slug": "supabase-completion-powershell",
         "type": "cli-command"
       },
       {
         "id": "supabase-completion-fish",
-        "title": "supabase completion fish",
+        "title": "Generate fish script",
         "slug": "supabase-completion-fish",
         "type": "cli-command"
       },
       {
         "id": "supabase-completion-bash",
-        "title": "supabase completion bash",
+        "title": "Generate bash script",
         "slug": "supabase-completion-bash",
         "type": "cli-command"
       }
diff --git a/spec/common-client-libs-sections.json b/spec/common-client-libs-sections.json
index c290fb91859..d8a51532a7a 100644
--- a/spec/common-client-libs-sections.json
+++ b/spec/common-client-libs-sections.json
@@ -9,7 +9,8 @@
     "title": "Installing",
     "id": "installing",
     "slug": "installing",
-    "type": "markdown"
+    "type": "markdown",
+    "excludes": ["reference_javascript_v1", "reference_dart_v0", "reference_python_v2"]
   },
   {
     "title": "Initializing",
@@ -21,13 +22,20 @@
     "title": "Typescript Support",
     "id": "typescript-support",
     "slug": "typescript-support",
-    "type": "markdown"
+    "type": "markdown",
+    "excludes": [
+      "reference_javascript_v1",
+      "reference_dart_v0",
+      "reference_dart_v1",
+      "reference_python_v2"
+    ]
   },
   {
     "title": "Upgrade guide",
     "id": "upgrade-guide",
     "slug": "upgrade-guide",
-    "type": "markdown"
+    "type": "markdown",
+    "excludes": ["reference_javascript_v2", "reference_dart_v1", "reference_python_v2"]
   },
   {
     "title": "Database",
@@ -650,7 +658,7 @@
       {
         "id": "invoke",
         "title": "Invoke a function",
-        "slug": "auth-admin-invoke",
+        "slug": "functions-invoke",
         "product": "functions",
         "type": "function"
       }
@@ -669,7 +677,7 @@
       },
       {
         "id": "subscribe",
-        "title": "Subscribe to database changes",
+        "title": "Subscribe to channel",
         "slug": "subscribe",
         "product": "realtime",
         "type": "function"
@@ -839,6 +847,7 @@
   },
   {
     "title": "Misc",
+    "excludes": ["reference_dart_v1", "reference_dart_v0"],
 
     "items": [
       {
diff --git a/spec/enrichments/tsdoc_v2/combined.json b/spec/enrichments/tsdoc_v2/combined.json
index 0c72523e032..57242f4b5bf 100644
--- a/spec/enrichments/tsdoc_v2/combined.json
+++ b/spec/enrichments/tsdoc_v2/combined.json
@@ -79596,7 +79596,7 @@
                       "kindString": "Call signature",
                       "flags": {},
                       "comment": {
-                        "shortText": "Retrieves the URL for an asset in a public bucket.\nThis function does not verify if the bucket is public. If a public URL is created for a bucket which is not public, you will not be able to download the asset."
+                        "shortText": "A simple convenience function to get the URL for an asset in a public bucket. If you do not want to use this function, you can construct the public URL by concatenating the bucket URL with the path to the asset.\nThis function does not verify if the bucket is public. If a public URL is created for a bucket which is not public, you will not be able to download the asset."
                       },
                       "parameters": [
                         {
diff --git a/spec/enrichments/tsdoc_v2/storage.json b/spec/enrichments/tsdoc_v2/storage.json
index 475ba699fc3..fb8baa1c895 100644
--- a/spec/enrichments/tsdoc_v2/storage.json
+++ b/spec/enrichments/tsdoc_v2/storage.json
@@ -5471,7 +5471,7 @@
                   "kindString": "Call signature",
                   "flags": {},
                   "comment": {
-                    "shortText": "Retrieves the URL for an asset in a public bucket.\nThis function does not verify if the bucket is public. If a public URL is created for a bucket which is not public, you will not be able to download the asset."
+                    "shortText": "A simple convenience function to get the URL for an asset in a public bucket. If you do not want to use this function, you can construct the public URL by concatenating the bucket URL with the path to the asset.\nThis function does not verify if the bucket is public. If a public URL is created for a bucket which is not public, you will not be able to download the asset."
                   },
                   "parameters": [
                     {
diff --git a/spec/enrichments/tsdoc_v2/storage_dereferenced.json b/spec/enrichments/tsdoc_v2/storage_dereferenced.json
index 634dd23b469..53596ea9650 100644
--- a/spec/enrichments/tsdoc_v2/storage_dereferenced.json
+++ b/spec/enrichments/tsdoc_v2/storage_dereferenced.json
@@ -5875,7 +5875,7 @@
                   "kindString": "Call signature",
                   "flags": {},
                   "comment": {
-                    "shortText": "Retrieves the URL for an asset in a public bucket.\nThis function does not verify if the bucket is public. If a public URL is created for a bucket which is not public, you will not be able to download the asset."
+                    "shortText": "A simple convenience function to get the URL for an asset in a public bucket. If you do not want to use this function, you can construct the public URL by concatenating the bucket URL with the path to the asset.\nThis function does not verify if the bucket is public. If a public URL is created for a bucket which is not public, you will not be able to download the asset."
                   },
                   "parameters": [
                     {
diff --git a/spec/examples/examples.yml b/spec/examples/examples.yml
index 02a3b73bd49..33e1d38f7fa 100644
--- a/spec/examples/examples.yml
+++ b/spec/examples/examples.yml
@@ -5010,8 +5010,8 @@ functions:
             })
             .subscribe()
           ```
-      - id: listening-to-a-specific-table
-        name: Listening to a specific table
+      - id: listen-to-a-specific-table
+        name: Listen to a specific table
         js: |
           ```js
           supabase
@@ -5021,8 +5021,8 @@ functions:
             })
             .subscribe()
           ```
-      - id: listening-to-inserts
-        name: Listening to inserts
+      - id: listen-to-inserts
+        name: Listen to inserts
         js: |
           ```js
           supabase
@@ -5032,8 +5032,8 @@ functions:
             })
             .subscribe()
           ```
-      - id: listening-to-updates
-        name: Listening to updates
+      - id: listen-to-updates
+        name: Listen to updates
         description: |
           By default, Supabase will send only the updated record. If you want to receive the previous values as well you can
           enable full replication for the table you are listening to:
@@ -5050,8 +5050,8 @@ functions:
             })
             .subscribe()
           ```
-      - id: listening-to-deletes
-        name: Listening to deletes
+      - id: listen-to-deletes
+        name: Listen to deletes
         description: |
           By default, Supabase does not send deleted records. If you want to receive the deleted record you can
           enable full replication for the table you are listening too:
@@ -5068,8 +5068,8 @@ functions:
             })
             .subscribe()
           ```
-      - id: listening-to-multiple-events
-        name: Listening to multiple events
+      - id: listen-to-multiple-events
+        name: Listen to multiple events
         description: You can chain listeners if you want to listen to multiple events for each table.
         js: |
           ```js
@@ -5080,7 +5080,7 @@ functions:
             .subscribe()
           ```
       - id: listening-to-row-level-changes
-        name: Listening to row level changes
+        name: Listen to row level changes
         description: You can listen to individual rows using the format `{table}:{col}=eq.{val}` - where `{col}` is the column name, and `{val}` is the value which you want to match.
         notes: |
           - ``eq`` filter works with all database types as under the hood, it's casting both the filter value and the database value to the correct type and then comparing them.
diff --git a/spec/supabase_dart_v0.yml b/spec/supabase_dart_v0.yml
index 34ef75264ff..748edf4edb6 100644
--- a/spec/supabase_dart_v0.yml
+++ b/spec/supabase_dart_v0.yml
@@ -700,8 +700,8 @@ functions:
             })
             .subscribe();
           ```
-      - id: listening-to-a-specific-table
-        name: Listening to a specific table
+      - id: listen-to-a-specific-table
+        name: Listen to a specific table
         code: |
           ```dart
           final mySubscription = supabase
@@ -711,8 +711,8 @@ functions:
             })
             .subscribe();
           ```
-      - id: listening-to-inserts
-        name: Listening to inserts
+      - id: listen-to-inserts
+        name: Listen to inserts
         code: |
           ```dart
           final mySubscription = supabase
@@ -722,8 +722,8 @@ functions:
             })
             .subscribe();
           ```
-      - id: listening-to-updates
-        name: Listening to updates
+      - id: listen-to-updates
+        name: Listen to updates
         description: |
           By default, Supabase will send only the updated record. If you want to receive the previous values as well you can
           enable full replication for the table you are listening too:
@@ -740,8 +740,8 @@ functions:
             })
             .subscribe();
           ```
-      - id: listening-to-deletes
-        name: Listening to deletes
+      - id: listen-to-deletes
+        name: Listen to deletes
         description: |
           By default, Supabase does not send deleted records. If you want to receive the deleted record you can
           enable full replication for the table you are listening too:
@@ -758,8 +758,8 @@ functions:
             })
             .subscribe();
           ```
-      - id: listening-to-multiple-events
-        name: Listening to multiple events
+      - id: listen-to-multiple-events
+        name: Listen to multiple events
         description: You can chain listeners if you want to listen to multiple events for each table.
         code: |
           ```dart
@@ -770,7 +770,7 @@ functions:
             .subscribe();
           ```
       - id: listening-to-row-level-changes
-        name: Listening to row level changes
+        name: Listen to row level changes
         description: You can listen to individual rows using the format `{table}:{col}=eq.{val}` - where `{col}` is the column name, and `{val}` is the value which you want to match.
         code: |
           ```dart
@@ -816,8 +816,8 @@ functions:
       - `stream()` will emit the initial data as well as any further change on the database as `Stream` of `List<Map<String, dynamic>>` by combining Postgrest and Realtime.
       - Takes a list of primary key columns as its argument.
     examples:
-      - id: listening-to-a-specific-table
-        name: Listening to a specific table
+      - id: listen-to-a-specific-table
+        name: Listen to a specific table
         isSpotlight: true
         code: |
           ```dart
@@ -1249,39 +1249,36 @@ functions:
     title: Using Filters
     description: |
       Filters can be used on `select()`, `update()`, and `delete()` queries.
-
       If a Stored Procedure returns a table response, you can also apply filters.
+      Filters must be applied to the end of queries and can also be chained together to produce advanced queries.
+    examples:
+      - id: applying-filters
+        name: Applying filters
+        code: |
+          ```dart
+          final res = await supabase
+            .from('cities')
+            .select('name, country_id')
+            .eq('name', 'The Shire')    // Correct
+            .execute();
 
-      ### Applying Filters
-
-      You must apply your filters to the end of your query. For example:
-
-      ```dart
-      final res = await supabase
-        .from('cities')
-        .select('name, country_id')
-        .eq('name', 'The Shire')    // Correct
-        .execute();
-
-      final res = await supabase
-        .from('cities')
-        .eq('name', 'The Shire')    // Incorrect
-        .select('name, country_id')
-        .execute();
-      ```
-
-      ### Chaining
-
-      Filters can be chained together to produce advanced queries. For example:
-
-      ```dart
-      final res = await supabase
-        .from('cities')
-        .select('name, country_id')
-        .gte('population', 1000)
-        .lt('population', 10000)
-        .execute();
-      ```
+          final res = await supabase
+            .from('cities')
+            .eq('name', 'The Shire')    // Incorrect
+            .select('name, country_id')
+            .execute();
+          ```
+      - id: chaining-filters
+        name: Chaining filters
+        code: |
+          ```dart
+          final res = await supabase
+            .from('cities')
+            .select('name, country_id')
+            .gte('population', 1000)
+            .lt('population', 10000)
+            .execute();
+          ```
 
   - id: or
     title: or()
diff --git a/spec/supabase_dart_v1.yml b/spec/supabase_dart_v1.yml
index e49d0ae89c3..f3f9c044a53 100644
--- a/spec/supabase_dart_v1.yml
+++ b/spec/supabase_dart_v1.yml
@@ -16,6 +16,41 @@ info:
       version: '0.0.1'
 
 functions:
+  - id: initializing
+    title: 'Initializing'
+    $ref: '@supabase/supabase-js.index.SupabaseClient.constructor'
+    description: |
+      You can initialize Supabase with the static `initialize()` method of `Supabase` class.
+
+      The Supabase client is your entrypoint to the rest of the Supabase functionality
+      and is the easiest way to interact with everything we offer within the Supabase ecosystem.
+
+    examples:
+      - id: flutter-initialize
+        name: For Flutter
+        code: |
+          ```dart
+          Future<void> main() async {
+            await Supabase.initialize(
+              url: 'https://xyzcompany.supabase.co',
+              anonKey: 'public-anon-key',
+            );
+
+            runApp(MyApp());
+          }
+
+          // Get a reference your Supabase client 
+          final supabase = Supabase.instance.client;
+          ```
+      - id: for-other-dart-projects
+        name: For other Dart projects
+        code: |
+          ```dart
+          final supabase = SupabaseClient(
+            'https://xyzcompany.supabase.co',
+            'public-anon-key',
+          );
+          ```
   - id: sign-up
     title: 'signUp()'
     description: |
@@ -696,8 +731,8 @@ functions:
             },
           ).subscribe();
           ```
-      - id: listening-to-a-specific-table
-        name: Listening to a specific table
+      - id: listen-to-a-specific-table
+        name: Listen to a specific table
         code: |
           ```dart
           supabase.channel('public:countries').on(
@@ -708,8 +743,8 @@ functions:
             },
           ).subscribe();
           ```
-      - id: listening-to-inserts
-        name: Listening to inserts
+      - id: listen-to-inserts
+        name: Listen to inserts
         code: |
           ```dart
           supabase.channel('public:countries').on(
@@ -720,8 +755,8 @@ functions:
             },
           ).subscribe();
           ```
-      - id: listening-to-updates
-        name: Listening to updates
+      - id: listen-to-updates
+        name: Listen to updates
         description: |
           By default, Supabase will send only the updated record. If you want to receive the previous values as well you can
           enable full replication for the table you are listening too:
@@ -739,8 +774,8 @@ functions:
             },
           ).subscribe();
           ```
-      - id: listening-to-deletes
-        name: Listening to deletes
+      - id: listen-to-deletes
+        name: Listen to deletes
         description: |
           By default, Supabase does not send deleted records. If you want to receive the deleted record you can
           enable full replication for the table you are listening too:
@@ -758,8 +793,8 @@ functions:
             },
           ).subscribe();
           ```
-      - id: listening-to-multiple-events
-        name: Listening to multiple events
+      - id: listen-to-multiple-events
+        name: Listen to multiple events
         description: You can chain listeners if you want to listen to multiple events for each table.
         code: |
           ```dart
@@ -774,7 +809,7 @@ functions:
           }).subscribe();
           ```
       - id: listening-to-row-level-changes
-        name: Listening to row level changes
+        name: Listen to row level changes
         description: You can listen to individual rows using the format `{table}:{col}=eq.{val}` - where `{col}` is the column name, and `{val}` is the value which you want to match.
         code: |
           ```dart
@@ -841,8 +876,8 @@ functions:
       - `stream()` will emit the initial data as well as any further change on the database as `Stream` of `List<Map<String, dynamic>>` by combining Postgrest and Realtime.
       - Takes a list of primary key columns as its argument.
     examples:
-      - id: listening-to-a-specific-table
-        name: Listening to a specific table
+      - id: listen-to-a-specific-table
+        name: Listen to a specific table
         isSpotlight: true
         code: |
           ```dart
@@ -1382,12 +1417,8 @@ functions:
           final data = await supabase
             .from('cities')
             .select('name, country_id')
-            .eq('name', 'The Shire');  // Correct
-
-          final data = await supabase
-            .from('cities')
-            .eq('name', 'The Shire')  // Incorrect
-            .select('name, country_id');
+            .gte('population', 1000)
+            .lt('population', 10000)
           ```
       - id: conditional-chaining
         name: Conditional Chaining
diff --git a/spec/supabase_js_v1.yml b/spec/supabase_js_v1.yml
index 007b92e0343..fa03852708b 100644
--- a/spec/supabase_js_v1.yml
+++ b/spec/supabase_js_v1.yml
@@ -1138,8 +1138,8 @@ functions:
             })
             .subscribe()
           ```
-      - id: listening-to-a-specific-table
-        name: Listening to a specific table
+      - id: listen-to-a-specific-table
+        name: Listen to a specific table
         code: |
           ```js
           const mySubscription = supabase
@@ -1149,8 +1149,8 @@ functions:
             })
             .subscribe()
           ```
-      - id: listening-to-inserts
-        name: Listening to inserts
+      - id: listen-to-inserts
+        name: Listen to inserts
         code: |
           ```js
           const mySubscription = supabase
@@ -1160,8 +1160,8 @@ functions:
             })
             .subscribe()
           ```
-      - id: listening-to-updates
-        name: Listening to updates
+      - id: listen-to-updates
+        name: Listen to updates
         description: |
           By default, Supabase will send only the updated record. If you want to receive the previous values as well you can
           enable full replication for the table you are listening too:
@@ -1178,8 +1178,8 @@ functions:
             })
             .subscribe()
           ```
-      - id: listening-to-deletes
-        name: Listening to deletes
+      - id: listen-to-deletes
+        name: Listen to deletes
         description: |
           By default, Supabase does not send deleted records. If you want to receive the deleted record you can
           enable full replication for the table you are listening too:
@@ -1196,8 +1196,8 @@ functions:
             })
             .subscribe()
           ```
-      - id: listening-to-multiple-events
-        name: Listening to multiple events
+      - id: listen-to-multiple-events
+        name: Listen to multiple events
         description: You can chain listeners if you want to listen to multiple events for each table.
         code: |
           ```js
@@ -1208,7 +1208,7 @@ functions:
             .subscribe()
           ```
       - id: listening-to-row-level-changes
-        name: Listening to row level changes
+        name: Listen to row level changes
         description: You can listen to individual rows using the format `{table}:{col}=eq.{val}` - where `{col}` is the column name, and `{val}` is the value which you want to match.
         notes: |
           - ``eq`` filter works with all database types as under the hood, it's casting both the filter value and the database value to the correct type and then comparing them.
@@ -1272,7 +1272,7 @@ functions:
         name: List buckets
         isSpotlight: true
         code: |
-          ```js
+          ```ts
           const { data, error } = await supabase
             .storage
             .listBuckets()
diff --git a/spec/supabase_js_v2.yml b/spec/supabase_js_v2.yml
index c04639b3a28..cc0c9e8ad74 100644
--- a/spec/supabase_js_v2.yml
+++ b/spec/supabase_js_v2.yml
@@ -156,7 +156,7 @@ functions:
             password: 'example-password',
           })
           ```
-      - id: sign-up-with-additional-user-metadata.
+      - id: sign-up-with-additional-user-metadata
         name: Sign up with additional user metadata
         isSpotlight: false
         code: |
@@ -174,6 +174,22 @@ functions:
             }
           )
           ```
+      - id: sign-up-with-redirect
+        name: Sign up with a redirect URL
+        description: |         
+          - See [redirect URLs and wildcards](/docs/guides/auth/overview#redirect-urls-and-wildcards) to add additional redirect URLs to your project.
+        code: |
+          ```js
+          const { data, error } = await supabase.auth.signUp(
+            {
+              email: 'example@email.com',
+              password: 'example-password',
+              options: {
+                emailRedirectTo: 'https://example.com/welcome'
+              }
+            }
+          )
+          ```
   - id: sign-in-with-password
     title: 'signInWithPassword()'
     $ref: '@supabase/gotrue-js.GoTrueClient.signInWithPassword'
@@ -217,6 +233,7 @@ functions:
       - If you're using phone, you can configure whether you want the user to receive a OTP.
       - The magic link's destination URL is determined by the [`SITE_URL`](/docs/reference/auth/config#site_url).
       - See [redirect URLs and wildcards](/docs/guides/auth/overview#redirect-urls-and-wildcards) to add additional redirect URLs to your project.
+      - Magic links and OTPs share the same implementation. To send users a one-time code instead of a magic link, [modify the magic link email template](https://app.supabase.com/project/_/auth/templates) to include `{{ .Token }}` instead of `{{ .ConfirmationURL }}`.
     examples:
       - id: sign-in-with-email
         name: Sign in with email
@@ -3429,8 +3446,8 @@ functions:
         code: |
           ```ts
           const { data, error } = await supabase
-            .from('cities')
-            .select('name', 'country_id')
+            .from('countries')
+            .select('id', 'name')
             .order('id', { ascending: false })
           ```
         data:
@@ -3980,42 +3997,111 @@ functions:
       - When a delete occurs, the contents of old_record will be broadcast to all subscribers to that table so ensure that each table's replica identity only contains information that is safe to expose publicly.
       - The channel name must exactly match the schema/table/filter you want to listen to separated by colons. See below examples for additional context.
     examples:
+      - id: listen-to-broadcast
+        name: Listen to broadcast messages
+        isSpotlight: true
+        code: |
+          ```js
+          supabase
+            .channel('any')
+            .on('broadcast', { event: 'cursor-pos' }, payload => {
+              console.log('Cursor position received!', payload)
+            })
+            .subscribe((status) => {
+              if (status === 'SUBSCRIBED') {
+                channel.send({
+                  type: 'broadcast',
+                  event: 'cursor-pos',
+                  payload: { x: Math.random(), y: Math.random() },
+                })
+              }
+            })
+          ```
+      - id: listen-to-presence-sync
+        name: Listen to presence sync
+        isSpotlight: true
+        code: |
+          ```js
+          const channel = supabase.channel('any')
+          channel
+            .on('presence', { event: 'sync' }, () => {
+              console.log('Synced presence state: ', channel.presenceState())
+            })
+            .subscribe(async (status) => {
+              if (status === 'SUBSCRIBED') {
+                await channel.track({ online_at: new Date().toISOString() })
+              }
+            })
+          ```
+      - id: listen-to-presence-join
+        name: Listen to presence join
+        isSpotlight: true
+        code: |
+          ```js
+          const channel = supabase.channel('any')
+          channel
+            .on('presence', { event: 'join' }, ({ newPresences }) => {
+              console.log('Newly joined presences: ', newPresences)
+            })
+            .subscribe(async (status) => {
+              if (status === 'SUBSCRIBED') {
+                await channel.track({ online_at: new Date().toISOString() })
+              }
+            })
+          ```
+      - id: listen-to-presence-leave
+        name: Listen to presence leave
+        isSpotlight: true
+        code: |
+          ```js
+          const channel = supabase.channel('any')
+          channel
+            .on('presence', { event: 'leave' }, ({ leftPresences }) => {
+              console.log('Newly left presences: ', leftPresences)
+            })
+            .subscribe(async (status) => {
+              if (status === 'SUBSCRIBED') {
+                await channel.track({ online_at: new Date().toISOString() })
+                await channel.untrack()
+              }
+            })
+          ```
       - id: listen-to-all-database-changes
         name: Listen to all database changes
         isSpotlight: true
         code: |
           ```js
           supabase
-            .channel('*')
+            .channel('any')
             .on('postgres_changes', { event: '*', schema: '*' }, payload => {
               console.log('Change received!', payload)
             })
             .subscribe()
           ```
-      - id: listening-to-a-specific-table
-        name: Listening to a specific table
+      - id: listen-to-a-specific-table
+        name: Listen to a specific table
         code: |
           ```js
           supabase
-            .channel('public:countries')
+            .channel('any')
             .on('postgres_changes', { event: '*', schema: 'public', table: 'countries' }, payload => {
               console.log('Change received!', payload)
             })
             .subscribe()
           ```
-      - id: listening-to-inserts
-        name: Listening to inserts
+      - id: listen-to-inserts
+        name: Listen to inserts
         code: |
           ```js
           supabase
-            .channel('public:countries')
+            .channel('any')
             .on('postgres_changes', { event: 'INSERT', schema: 'public', table: 'countries' }, payload => {
               console.log('Change received!', payload)
             })
             .subscribe()
           ```
-      - id: listening-to-updates
-        name: Listening to updates
+      - id: listen-to-updates
+        name: Listen to updates
         description: |
           By default, Supabase will send only the updated record. If you want to receive the previous values as well you can
           enable full replication for the table you are listening to:
@@ -4026,14 +4112,14 @@ functions:
         code: |
           ```js
           supabase
-            .channel('public:countries')
+            .channel('any')
             .on('postgres_changes', { event: 'UPDATE', schema: 'public', table: 'countries' }, payload => {
               console.log('Change received!', payload)
             })
             .subscribe()
           ```
-      - id: listening-to-deletes
-        name: Listening to deletes
+      - id: listen-to-deletes
+        name: Listen to deletes
         description: |
           By default, Supabase does not send deleted records. If you want to receive the deleted record you can
           enable full replication for the table you are listening too:
@@ -4044,32 +4130,32 @@ functions:
         code: |
           ```js
           supabase
-            .channel('public:countries')
+            .channel('any')
             .on('postgres_changes', { event: 'DELETE', schema: 'public', table: 'countries' }, payload => {
               console.log('Change received!', payload)
             })
             .subscribe()
           ```
-      - id: listening-to-multiple-events
-        name: Listening to multiple events
+      - id: listen-to-multiple-events
+        name: Listen to multiple events
         description: You can chain listeners if you want to listen to multiple events for each table.
         code: |
           ```js
           supabase
-            .channel('public:countries')
+            .channel('any')
             .on('postgres_changes', { event: 'INSERT', schema: 'public', table: 'countries' }, handleRecordInserted)
             .on('postgres_changes', { event: 'DELETE', schema: 'public', table: 'countries' }, handleRecordDeleted)
             .subscribe()
           ```
       - id: listening-to-row-level-changes
-        name: Listening to row level changes
+        name: Listen to row level changes
         description: You can listen to individual rows using the format `{table}:{col}=eq.{val}` - where `{col}` is the column name, and `{val}` is the value which you want to match.
         notes: |
           - ``eq`` filter works with all database types as under the hood, it's casting both the filter value and the database value to the correct type and then comparing them.
         code: |
           ```js
           supabase
-            .channel('public:countries:id=eq.200')
+            .channel('any')
             .on('postgres_changes', { event: 'UPDATE', schema: 'public', table: 'countries', filter: 'id=eq.200' }, handleRecordUpdated)
             .subscribe()
           ```
@@ -4127,7 +4213,7 @@ functions:
         name: List buckets
         isSpotlight: true
         code: |
-          ```js
+          ```ts
           const { data, error } = await supabase
             .storage
             .listBuckets()
diff --git a/spec/supabase_py_v2.yml b/spec/supabase_py_v2.yml
new file mode 100644
index 00000000000..0e151526427
--- /dev/null
+++ b/spec/supabase_py_v2.yml
@@ -0,0 +1,379 @@
+openref: 0.1
+
+info:
+  id: reference/supabase-py
+  title: Supabase Client
+  description: |
+
+    Supabase Python(Community).
+
+  definition: ../../spec/enrichments/tsdoc_v2/combined.json
+  specUrl: https://github.com/supabase/supabase/edit/master/spec/supabase_py_v2.yml
+  slugPrefix: '/'
+  libraries:
+    - name: 'Python'
+      id: 'py'
+      version: '0.0.1'
+
+functions:
+  - id: initializing
+    description: |
+      You can initialize a new Supabase client using the `create_client()` method.
+
+      The Supabase client is your entrypoint to the rest of the Supabase functionality
+      and is the easiest way to interact with everything we offer within the Supabase ecosystem.
+
+    examples:
+      - id: create-client
+        name: create_client()
+        code: |
+          ```
+          import os
+          from supabase import create_client, Client
+
+          url: str = os.environ.get("SUPABASE_URL")
+          key: str = os.environ.get("SUPABASE_KEY")
+          supabase: Client = create_client(url, key)
+          ```
+      - id: with-timeout-option
+        name: With timeout option
+        code: |
+          ```
+          import os
+          from supabase import create_client, Client
+
+          url: str = os.environ.get("SUPABASE_URL")
+          key: str = os.environ.get("SUPABASE_KEY")
+          supabase: Client = create_client(url, key, options={'timeout': 10})
+          ```
+
+  - id: sign-up
+    title: 'sign_up()'
+    notes: |
+      - By default, the user needs to verify their email address before logging in. To turn this off, disable **Confirm email** in [your project](https://app.supabase.com/project/_/auth/providers).
+      - **Confirm email** determines if users need to confirm their email address after signing up.
+        - If **Confirm email** is enabled, a `user` is returned but `session` is null.
+        - If **Confirm email** is disabled, both a `user` and a `session` are returned.
+      - By default, when the user confirms their email address, they are redirected to the [`SITE_URL`](https://supabase.com/docs/reference/auth/config#site_url). You can modify your `SITE_URL` or add additional redirect URLs in [your project](https://app.supabase.com/project/_/auth/url-configuration).
+      - If signUp() is called for an existing confirmed user:
+          - If **Confirm email** is enabled in [your project](https://app.supabase.com/project/_/auth/providers), an obfuscated/fake user object is returned.
+          - If **Confirm email** is disabled, the error message, `User already registered` is returned.
+      - To fetch the currently logged-in user, refer to [`getUser()`](/docs/reference/javascript/auth-getuser).
+    examples:
+      - id: signup
+        name: Sign up
+        code: |
+          ```
+          res = supabase.auth.signUp({
+            email: 'example@email.com',
+            password: 'example-password',
+          })
+          ```
+      - id: sign-up-with-additional-user-metadata
+        name: Sign up with additional user metadata
+        code: |
+          ```
+          res = supabase.auth.signUp({
+            email: 'example@email.com',
+            password: 'example-password',
+            options: {
+              data: {
+                first_name: 'John',
+                age: 27,
+              }
+            }
+          })
+          ```
+  - id: sign-out
+    title: 'sign_out()'
+    notes: |
+      - In order to use the `signOut()` method, the user needs to be signed in first.
+    examples:
+      - id: sign-out
+        name: Sign out
+        code: |
+          ```
+          res = supabase.auth.sign_out()
+          ```
+  - id: verify-otp
+    title: 'verify_otp()'
+    notes: |
+      - The `verifyOtp` method takes in different verification types. If a phone number is used, the type can either be `sms` or `phone_change`. If an email address is used, the type can be one of the following: `signup`, `magiclink`, `recovery`, `invite` or `email_change`.
+      - The verification type used should be determined based on the corresponding auth method called before `verifyOtp` to sign up / sign-in a user.
+    examples:
+      - id: verify-sms-one-time-password
+        name: Verify SMS One-Time Password (OTP)
+        code: |
+          ```
+          res = supabase.auth.verify_otp(phone, token)
+          ```
+
+  - id: get-session
+    title: 'get_session_from_url'
+    examples:
+      - id: get-session
+        name: Get the session data from URL
+        code: |
+          ```
+          res = supabase.auth.get_session_from_url(url)
+          ```
+
+  - id: set-session
+    title: 'set_session()'
+    notes: |
+      - `setSession()` takes in a refresh token and uses it to get a new session.
+      - The refresh token can only be used once to obtain a new session.
+      - [Refresh token rotation](/docs/reference/auth/config#refresh_token_rotation_enabled) is enabled by default on all projects to guard against replay attacks.
+      - You can configure the [`REFRESH_TOKEN_REUSE_INTERVAL`](https://supabase.com/docs/reference/auth/config#refresh_token_reuse_interval) which provides a short window in which the same refresh token can be used multiple times in the event of concurrency or offline issues.
+      - If you are using React Native, you will need to install a Buffer polyfill via a library such as [rn-nodeify](https://github.com/tradle/rn-nodeify) to properly use the library.
+    examples:
+      - id: set-session
+        name: Refresh the session
+        description: Sets the session data from refresh_token and returns current session or an error if the refresh_token is invalid.
+        code: |
+          ```
+          res = supabase.auth.set_session(refresh_token)
+          ```
+  - id: refresh-session
+    title: 'refresh_ession()'
+    notes: |
+      - This method will refresh the session whether the current one is expired or not.
+      - Both examples destructure `user` and `session` from `data`. This is not required; so `const { data, error } =` is also valid.
+    examples:
+      - id: refresh-session
+        name: Refresh session using the current session
+        code: |
+          ```
+          res = supabase.auth.refresh_session()
+          ```
+  - id: select
+    title: 'Fetch data: select()'
+    notes: |
+      - By default, Supabase projects return a maximum of 1,000 rows. This setting can be changed in your project's [API settings](https://app.supabase.com/project/_/settings/api). It's recommended that you keep it low to limit the payload size of accidental or malicious requests.
+      - `apikey` is a reserved keyword if you're using the [Supabase Platform](/docs/guides/platform) and [should be avoided as a column name](https://github.com/supabase/supabase/issues/5465).
+    examples:
+      - id: getting-your-data
+        name: Getting your data
+        code: |
+          ```
+          r = supabase
+          .from('countries')
+          .select("*")
+          ```
+      - id: selecting-specific-columns
+        name: Selecting specific columns
+        code: |
+          ```
+          r = await supabase
+          .from('countries')
+          .select('name')
+          ```
+
+  - id: invoke
+    title: 'invoke()'
+    description: |
+      Invoke a Supabase Function.
+    notes: |
+      - Requires an Authorization header.
+      - When you pass in a body to your function, we automatically attach the Content-Type header for `Blob`, `ArrayBuffer`, `File`, `FormData` and `String`. If it doesn't match any of these types we assume the payload is `json`, serialise it and attach the `Content-Type` header as `application/json`. You can override this behaviour by passing in a `Content-Type` header of your own.
+    examples:
+      - id: invoke-function
+        name: Basic invocation
+        description:
+        code: |
+          ```
+          func = supabase.functions()
+          @asyncio.coroutine
+          async def test_func(loop):
+            resp = await func.invoke("hello-world",invoke_options={'body':{}})
+            return resp
+
+          loop = asyncio.get_event_loop()
+          resp = loop.run_until_complete(test_func(loop))
+          loop.close()
+          ```
+
+  - id: list-buckets
+    title: 'list_buckets()'
+    notes: |
+      - RLS policy permissions required:
+        - `buckets` table permissions: `select`
+        - `objects` table permissions: none
+      - Refer to the [Storage guide](/docs/guides/storage#access-control) on how access control works
+    examples:
+      - id: list-buckets
+        name: List buckets
+        code: |
+          ```
+          res = supabase.storage().list_buckets()
+          ```
+
+  - id: get-bucket
+    title: 'get_bucket()'
+    notes: |
+      - RLS policy permissions required:
+        - `buckets` table permissions: `select`
+        - `objects` table permissions: none
+      - Refer to the [Storage guide](/docs/guides/storage#access-control) on how access control works
+    examples:
+      - id: get-bucket
+        name: Get bucket
+        code: |
+          ```
+          res = supabase.storage().get_bucket(name)
+          ```
+
+  - id: create-bucket
+    title: 'create_bucket()'
+    notes: |
+      - RLS policy permissions required:
+        - `buckets` table permissions: `insert`
+        - `objects` table permissions: none
+      - Refer to the [Storage guide](/docs/guides/storage#access-control) on how access control works
+    examples:
+      - id: create-bucket
+        name: Create bucket
+        code: |
+          ```
+          res = supabase.storage().create_bucket(name)
+          ```
+
+  - id: empty-bucket
+    title: 'empty_bucket()'
+    notes: |
+      - RLS policy permissions required:
+        - `buckets` table permissions: `select`
+        - `objects` table permissions: `select` and `delete`
+      - Refer to the [Storage guide](/docs/guides/storage#access-control) on how access control works
+    examples:
+      - id: empty-bucket
+        name: Empty bucket
+        code: |
+          ```
+          res = supabase.storage().empty_bucket(name)
+          ```
+  - id: delete-bucket
+    title: 'delete_bucket()'
+    notes: |
+      - RLS policy permissions required:
+        - `buckets` table permissions: `select` and `delete`
+        - `objects` table permissions: none
+      - Refer to the [Storage guide](/docs/guides/storage#access-control) on how access control works
+    examples:
+      - id: delete-bucket
+        name: Delete bucket
+        code: |
+          ```
+          res = supabase.storage().delete_bucket(name)
+          ```
+
+  - id: from-upload
+    title: 'from_.upload()'
+    notes: |
+      - RLS policy permissions required:
+        - `buckets` table permissions: none
+        - `objects` table permissions: `insert`
+      - Refer to the [Storage guide](/docs/guides/storage#access-control) on how access control works
+    examples:
+      - id: upload-file
+        name: Upload file using filepath
+        code: |
+          ```
+          with open(source, 'rb+') as f:
+            res = supabase.storage().from_('bucket').upload(destination, os.path.abspath(source))
+          ```
+  - id: from-move
+    title: 'from_.move()'
+    notes: |
+      - RLS policy permissions required:
+        - `buckets` table permissions: none
+        - `objects` table permissions: `update` and `select`
+      - Refer to the [Storage guide](/docs/guides/storage#access-control) on how access control works
+    examples:
+      - id: move-file
+        name: Move file
+        code: |
+          ```
+          res = supabase.storage().from_(bucket).move('public/avatar1.png', 'private/avatar2.png')
+          ```
+
+  - id: from-create-signed-url
+    title: 'from_.create_signed_url()'
+    notes: |
+      - RLS policy permissions required:
+        - `buckets` table permissions: none
+        - `objects` table permissions: `select`
+      - Refer to the [Storage guide](/docs/guides/storage#access-control) on how access control works
+    examples:
+      - id: create-signed-url
+        name: Create Signed URL
+        code: |
+          ```
+          res = supabase.storage().from_(bucket_name).create_signed_url(filepath, expiry_duration)
+          ```
+
+  - id: from-get-public-url
+    title: 'from_.get_public_url()'
+    notes: |
+      - The bucket needs to be set to public, either via [updateBucket()](/docs/reference/javascript/storage-updatebucket) or by going to Storage on [app.supabase.com](https://app.supabase.com), clicking the overflow menu on a bucket and choosing "Make public"
+      - RLS policy permissions required:
+        - `buckets` table permissions: none
+        - `objects` table permissions: none
+      - Refer to the [Storage guide](/docs/guides/storage#access-control) on how access control works
+    examples:
+      - id: get-public-url
+        name: Returns the URL for an asset in a public bucket
+        code: |
+          ```
+          res = supabase.storage().from_(bucket_name).get_public_url('test/avatar1.jpg')
+          ```
+
+  - id: from-download
+    title: 'from_.download()'
+    notes: |
+      - RLS policy permissions required:
+        - `buckets` table permissions: none
+        - `objects` table permissions: `select`
+      - Refer to the [Storage guide](/docs/guides/storage#access-control) on how access control works
+    examples:
+      - id: download-file
+        name: Download file
+        code: |
+          ```
+          with open(destination, 'wb+') as f:
+            res = supabase.storage().from_(bucket_name).download(source)
+            f.write(res)
+          ```
+
+  - id: from-remove
+    title: 'from_.remove()'
+    notes: |
+      - RLS policy permissions required:
+        - `buckets` table permissions: none
+        - `objects` table permissions: `delete` and `select`
+      - Refer to the [Storage guide](/docs/guides/storage#access-control) on how access control works
+    examples:
+      - id: delete-file
+        name: Delete file
+        code: |
+          ```
+          res = supabase.storage().from_('test').remove('test.jpg')
+          ```
+  - id: from-list
+    title: 'from_.list()'
+    notes: |
+      - RLS policy permissions required:
+        - `buckets` table permissions: none
+        - `objects` table permissions: `select`
+      - Refer to the [Storage guide](/docs/guides/storage#access-control) on how access control works
+    examples:
+      - id: list-files
+        name: List files in a bucket
+        code: |
+          ```
+          res = supabase.storage().from_('test').list()
+          ```
+  - id: subscribe
+    title: on().subscribe()
+    notes: |
+      - We are implementing this feature at the moment. If you have queries feel free to open an issue on the [realtime-py](https://github.com/supabase-community) repository.
diff --git a/studio/.dockerignore b/studio/.dockerignore
deleted file mode 100644
index b5924c32836..00000000000
--- a/studio/.dockerignore
+++ /dev/null
@@ -1,7 +0,0 @@
-node_modules/
-.vercel
-.next
-.env.local
-.env.production
-.env.dev
-.env.*
\ No newline at end of file
diff --git a/studio/.env b/studio/.env
index bd29782c04e..e66cc5523ed 100644
--- a/studio/.env
+++ b/studio/.env
@@ -6,13 +6,11 @@ DEFAULT_PROJECT_NAME=Default Project
 
 SUPABASE_URL=http://localhost:8000
 SUPABASE_PUBLIC_URL=http://localhost:8000
-NEXT_PUBLIC_SUPABASE_URL=$SUPABASE_URL
-NEXT_PUBLIC_SUPABASE_PUBLIC_URL=$SUPABASE_PUBLIC_URL
 SUPABASE_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJhbm9uIiwKICAgICJpc3MiOiAic3VwYWJhc2UtZGVtbyIsCiAgICAiaWF0IjogMTY0MTc2OTIwMCwKICAgICJleHAiOiAxNzk5NTM1NjAwCn0.dc_X5iR_VP_qT0zsiyj_I_OZ2T9FtRU2BBNWN8Bu4GE
 SUPABASE_SERVICE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJzZXJ2aWNlX3JvbGUiLAogICAgImlzcyI6ICJzdXBhYmFzZS1kZW1vIiwKICAgICJpYXQiOiAxNjQxNzY5MjAwLAogICAgImV4cCI6IDE3OTk1MzU2MDAKfQ.DaYlNEoUrrEn2Ig7tqibS-PHK5vgusbcbo7X36XVt4Q
 
 # TODO: evaluate these variables at runtime instead
 # https://nextjs.org/docs/basic-features/environment-variables#loading-environment-variables
 NEXT_PUBLIC_SITE_URL=http://localhost:3000
-NEXT_PUBLIC_GOTRUE_URL=$NEXT_PUBLIC_SUPABASE_PUBLIC_URL/auth/v1
+NEXT_PUBLIC_GOTRUE_URL=$SUPABASE_PUBLIC_URL/auth/v1
 NEXT_PUBLIC_HCAPTCHA_SITE_KEY=10000000-ffff-ffff-ffff-000000000001
diff --git a/studio/Dockerfile b/studio/Dockerfile
index 9ff4a0ca6fc..32fe1d0f128 100644
--- a/studio/Dockerfile
+++ b/studio/Dockerfile
@@ -1,9 +1,11 @@
+# To be run in the root of the turbo monorepo
+# NOTE: It's highly raccomended to use the new builder, Buildkit. https://docs.docker.com/build/buildkit/
 ## USAGE:
-# Build:        docker build --target production -t supabase/studio:latest .
+# Build:        docker buildx build --target production -t supabase/studio:latest .
 # Run:          docker run -p 3000:3000 supabase/studio
 # Deploy:       docker push supabase/studio:latest
 # Clean build:
-#    docker build --target production --no-cache -t supabase/studio:latest .
+#    docker buildx build --target production --no-cache -t supabase/studio:latest .
 #    docker builder prune
 
 FROM node:16-slim as base
@@ -11,36 +13,53 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     python3 \
     build-essential \
     && rm -rf /var/lib/apt/lists/*
+RUN npm i -g turbo
 
-FROM base as builder
-WORKDIR /usr/src/app
-COPY package*.json .
-COPY turbo.json .
-COPY packages packages
-COPY studio studio
-# the following command is still unsupported for npm // https://github.com/vercel/turborepo/issues/1830
-# RUN npm i -g turbo
-# RUN turbo prune --scope=studio --docker
-# RUN npm clean-install && npm cache clean --force
+# Calculate if dependencies are outdated
+FROM base as turbo
+WORKDIR /app
+COPY . .
+# Prune unneeded dependencies with turbo (from apps/ for example)
+RUN turbo prune --scope=studio --docker
+
+# Install dev dependencies (only if needed)
+FROM base as deps
+WORKDIR /app
+COPY --from=turbo /app/out/json/ .
+COPY --from=turbo /app/out/package-lock.json ./
+RUN npm clean-install && npm cache clean --force
+
+FROM deps as deps-prod
+RUN npm prune --production
+# Remove packages dependencies (not needed in production)
+RUN rm -rf /app/packages
+
+# builder contains dependencies and source code not compiled
+FROM deps as builder
+WORKDIR /app
+COPY --from=turbo /app/out/full ./
 ENTRYPOINT ["docker-entrypoint.sh"]
 
 FROM builder as dev
-COPY --from=builder /usr/src/app ./
-RUN npm clean-install && npm cache clean --force
 EXPOSE 8082
 CMD ["npx", "turbo", "run", "dev", "--filter=studio"]
 
+# Compile NextJS
 FROM builder as productionprep
 WORKDIR /app
-COPY --from=builder /usr/src/app ./
-RUN npm clean-install \
-    && npm cache clean --force \
-    && npx turbo run build --scope=studio --include-dependencies --no-deps \
-    && rm -rf ./studio/.next/cache/webpack \
-    && npm prune --production
+RUN npx turbo run build --scope=studio --include-dependencies --no-deps \
+    && rm -rf ./studio/.next/cache/webpack
 
+# Copy only compiled code and dependencies
 FROM node:16-slim as production
-COPY --from=productionprep /app /app
+# Copy package(s).json and package-lock.json
+COPY --from=turbo /app/out/json /app
+# Copy all dependencies for production
+COPY --from=deps-prod /app /app
+# Copy necessary files
+COPY --from=turbo /app/out/full/studio /app/studio
+COPY --from=productionprep /app/studio/.next /app/studio/.next
 WORKDIR /app/studio
 EXPOSE 3000
+HEALTHCHECK --interval=5s --timeout=5s --retries=3 CMD node -e "require('http').get('http://localhost:3000/api/profile', (r) => {if (r.statusCode !== 200) throw new Error(r.statusCode)})"
 CMD ["npm", "run", "start"]
diff --git a/studio/components/grid/components/editor/SelectEditor.tsx b/studio/components/grid/components/editor/SelectEditor.tsx
index f980583fad0..9c65b367e11 100644
--- a/studio/components/grid/components/editor/SelectEditor.tsx
+++ b/studio/components/grid/components/editor/SelectEditor.tsx
@@ -1,10 +1,10 @@
-import { Listbox } from '@supabase/ui'
+import { Select } from 'ui'
 import { EditorProps } from '@supabase/react-data-grid'
 
 import { useTrackedState } from 'components/grid/store'
 
 interface SelectEditorProps<TRow, TSummaryRow = unknown> extends EditorProps<TRow, TSummaryRow> {
-  options: { label: string; value: string }[]
+  options: { label: string; _value: string }[]
 }
 
 export function SelectEditor<TRow, TSummaryRow = unknown>({
@@ -19,11 +19,12 @@ export function SelectEditor<TRow, TSummaryRow = unknown>({
 
   const value = row[column.key as keyof TRow] as unknown as string
 
-  function onChange(value: string) {
-    if (!value || value == '') {
+  function onChange(event: any) {
+    debugger
+    if (!event.target.value || event.target.value == '') {
       onRowChange({ ...row, [column.key]: null }, true)
     } else {
-      onRowChange({ ...row, [column.key]: value }, true)
+      onRowChange({ ...row, [column.key]: event.target.value }, true)
     }
   }
 
@@ -32,7 +33,7 @@ export function SelectEditor<TRow, TSummaryRow = unknown>({
   }
 
   return (
-    <Listbox
+    <Select
       autoFocus
       id="select-editor"
       name="select-editor"
@@ -44,14 +45,12 @@ export function SelectEditor<TRow, TSummaryRow = unknown>({
       onChange={onChange}
       onBlur={onBlur}
     >
-      <Listbox.Option id="NULL" label="NULL" value="">
-        NULL
-      </Listbox.Option>
-      {options.map(({ label, value }) => (
-        <Listbox.Option key={value} label={label} value={value}>
+      <Select.Option value="">NULL</Select.Option>
+      {options.map(({ label, _value }) => (
+        <Select.Option key={_value} value={_value} selected={_value === value}>
           {label}
-        </Listbox.Option>
+        </Select.Option>
       ))}
-    </Listbox>
+    </Select>
   )
 }
diff --git a/studio/components/grid/components/header/Header.tsx b/studio/components/grid/components/header/Header.tsx
index 1b3e8ae89bc..4ad75e4eaef 100644
--- a/studio/components/grid/components/header/Header.tsx
+++ b/studio/components/grid/components/header/Header.tsx
@@ -40,10 +40,7 @@ const Header: FC<HeaderProps> = ({ sorts, filters, onAddColumn, onAddRow, header
           onAddRow={onAddRow}
         />
       )}
-      <div className="sb-grid-header__inner">
-        <RefreshButton filters={filters} sorts={sorts} />
-        {headerActions}
-      </div>
+      <div className="sb-grid-header__inner">{headerActions}</div>
     </div>
   )
 }
@@ -77,6 +74,7 @@ const DefaultHeader: FC<DefaultHeaderProps> = ({ sorts, filters, onAddColumn, on
   return (
     <div className="flex items-center gap-4">
       <div className="flex items-center gap-2">
+        <RefreshButton filters={filters} sorts={sorts} />
         <FilterDropdown />
         <SortPopover />
       </div>
diff --git a/studio/components/interfaces/Auth/AutoSchemaForm.tsx b/studio/components/interfaces/Auth/AutoSchemaForm.tsx
index d553fcf588d..75daad1fdfc 100644
--- a/studio/components/interfaces/Auth/AutoSchemaForm.tsx
+++ b/studio/components/interfaces/Auth/AutoSchemaForm.tsx
@@ -4,7 +4,7 @@ import { boolean, number, object, string } from 'yup'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
 import { Button, Form, Input, IconEye, IconEyeOff, InputNumber, Toggle } from 'ui'
 
-import { useStore, checkPermissions, useFlag } from 'hooks'
+import { useStore, checkPermissions } from 'hooks'
 import {
   FormActions,
   FormHeader,
@@ -20,8 +20,6 @@ const AutoSchemaForm = observer(() => {
 
   const formId = 'auth-config-general-form'
   const [hidden, setHidden] = useState(true)
-
-  const showMfaSso = useFlag('mfaSso')
   const canUpdateConfig = checkPermissions(PermissionAction.UPDATE, 'custom_config_gotrue')
 
   const INITIAL_VALUES = {
@@ -188,20 +186,18 @@ const AutoSchemaForm = observer(() => {
                   )}
                 </FormSectionContent>
               </FormSection>
-              {showMfaSso && (
-                <FormSection
-                  header={<FormSectionLabel>Multi Factor Authentication (MFA)</FormSectionLabel>}
-                >
-                  <FormSectionContent loading={!isLoaded}>
-                    <InputNumber
-                      id="MAX_ENROLLED_FACTORS"
-                      size="small"
-                      label="Maximum number of enrolled factors"
-                      disabled={!canUpdateConfig}
-                    />
-                  </FormSectionContent>
-                </FormSection>
-              )}
+              <FormSection
+                header={<FormSectionLabel>Multi Factor Authentication (MFA)</FormSectionLabel>}
+              >
+                <FormSectionContent loading={!isLoaded}>
+                  <InputNumber
+                    id="MAX_ENROLLED_FACTORS"
+                    size="small"
+                    label="Maximum number of enrolled factors"
+                    disabled={!canUpdateConfig}
+                  />
+                </FormSectionContent>
+              </FormSection>
             </FormPanel>
           </>
         )
diff --git a/studio/components/interfaces/Auth/EmailTemplates/EmailTemplates.tsx b/studio/components/interfaces/Auth/EmailTemplates/EmailTemplates.tsx
index 0e86b1247a5..a982880a845 100644
--- a/studio/components/interfaces/Auth/EmailTemplates/EmailTemplates.tsx
+++ b/studio/components/interfaces/Auth/EmailTemplates/EmailTemplates.tsx
@@ -1,4 +1,4 @@
-import { Tabs } from 'ui'
+import { Button, IconExternalLink, Tabs } from 'ui'
 import { observer } from 'mobx-react-lite'
 
 import { TEMPLATES_SCHEMAS } from 'stores/authConfig/schema'
@@ -8,10 +8,20 @@ import TemplateEditor from './TemplateEditor'
 const EmailTemplates = observer(() => {
   return (
     <div>
-      <FormHeader
-        title="Email Templates"
-        description="Customize the emails that will be sent out to your users."
-      />
+      <div className='flex justify-between items-center'>
+        <FormHeader
+          title="Email Templates"
+          description="Customize the emails that will be sent out to your users."
+        />
+        <Button type="link" icon={<IconExternalLink size={14} strokeWidth={1.5} />}>
+          <a
+            target="_blank"
+            href="https://supabase.com/docs/guides/auth/auth-email-templates"
+          >
+            Email Templates Documentation
+          </a>
+        </Button>
+      </div>
       <FormPanel>
         <Tabs
           scrollable
diff --git a/studio/components/interfaces/Auth/Policies/Policies.tsx b/studio/components/interfaces/Auth/Policies/Policies.tsx
new file mode 100644
index 00000000000..e587a5c5a77
--- /dev/null
+++ b/studio/components/interfaces/Auth/Policies/Policies.tsx
@@ -0,0 +1,212 @@
+import { useState, FC } from 'react'
+import { isEmpty } from 'lodash'
+import { IconHelpCircle } from 'ui'
+import { useRouter } from 'next/router'
+import { observer } from 'mobx-react-lite'
+import { useParams, useStore } from 'hooks'
+import { PolicyEditorModal, PolicyTableRow } from 'components/interfaces/Auth/Policies'
+import type { PostgresRole, PostgresTable } from '@supabase/postgres-meta'
+
+import ConfirmModal from 'components/ui/Dialogs/ConfirmDialog'
+import NoSearchResults from 'components/to-be-cleaned/NoSearchResults'
+import ProductEmptyState from 'components/to-be-cleaned/ProductEmptyState'
+import InformationBox from 'components/ui/InformationBox'
+
+interface Props {
+  tables: PostgresTable[]
+  hasTables: boolean
+  isLocked: boolean
+}
+
+const Policies: FC<Props> = ({ tables, hasTables, isLocked }) => {
+  const router = useRouter()
+  const { ref } = useParams()
+
+  const { ui, meta } = useStore()
+  const roles = meta.roles.list((role: PostgresRole) => !meta.roles.systemRoles.includes(role.name))
+
+  const [selectedSchemaAndTable, setSelectedSchemaAndTable] = useState<any>({})
+  const [selectedTableToToggleRLS, setSelectedTableToToggleRLS] = useState<any>({})
+  const [selectedPolicyToEdit, setSelectedPolicyToEdit] = useState<any>({})
+  const [selectedPolicyToDelete, setSelectedPolicyToDelete] = useState<any>({})
+
+  const closePolicyEditorModal = () => {
+    setSelectedPolicyToEdit({})
+    setSelectedSchemaAndTable({})
+  }
+
+  const closeConfirmModal = () => {
+    setSelectedPolicyToDelete({})
+    setSelectedTableToToggleRLS({})
+  }
+
+  const onSelectToggleRLS = (table: any) => {
+    setSelectedTableToToggleRLS(table)
+  }
+
+  const onSelectCreatePolicy = (table: any) => {
+    setSelectedSchemaAndTable({ schema: table.schema, table: table.name })
+  }
+
+  const onSelectEditPolicy = (policy: any) => {
+    setSelectedPolicyToEdit(policy)
+    setSelectedSchemaAndTable({ schema: policy.schema, table: policy.table })
+  }
+
+  const onSelectDeletePolicy = (policy: any) => {
+    setSelectedPolicyToDelete(policy)
+  }
+
+  const onSavePolicySuccess = async () => {
+    ui.setNotification({ category: 'success', message: 'Policy successfully saved!' })
+    closePolicyEditorModal()
+  }
+
+  // Methods that involve some API
+  const onToggleRLS = async () => {
+    const payload = {
+      id: selectedTableToToggleRLS.id,
+      rls_enabled: !selectedTableToToggleRLS.rls_enabled,
+    }
+
+    const res: any = await meta.tables.update(payload.id, payload)
+    if (res.error) {
+      ui.setNotification({
+        category: 'error',
+        message: `Failed to toggle RLS: ${res.error.message}`,
+      })
+    }
+    closeConfirmModal()
+  }
+
+  const onCreatePolicy = async (payload: any) => {
+    const res = await meta.policies.create(payload)
+    if (res.error) {
+      ui.setNotification({
+        category: 'error',
+        message: `Error adding policy: ${res.error.message}`,
+      })
+      return true
+    }
+    return false
+  }
+
+  const onUpdatePolicy = async (payload: any) => {
+    const res = await meta.policies.update(payload.id, payload)
+    if (res.error) {
+      ui.setNotification({
+        category: 'error',
+        message: `Error updating policy: ${res.error.message}`,
+      })
+      return true
+    }
+    return false
+  }
+
+  const onDeletePolicy = async () => {
+    const res = await meta.policies.del(selectedPolicyToDelete.id)
+    if (typeof res !== 'boolean' && res.error) {
+      ui.setNotification({
+        category: 'error',
+        message: `Error deleting policy: ${res.error.message}`,
+      })
+    } else {
+      ui.setNotification({ category: 'success', message: 'Successfully deleted policy!' })
+    }
+    closeConfirmModal()
+  }
+
+  return (
+    <>
+      {tables.length > 0 ? (
+        tables.map((table: any) => (
+          <section key={table.id}>
+            <PolicyTableRow
+              table={table}
+              isLocked={isLocked}
+              onSelectToggleRLS={onSelectToggleRLS}
+              onSelectCreatePolicy={onSelectCreatePolicy}
+              onSelectEditPolicy={onSelectEditPolicy}
+              onSelectDeletePolicy={onSelectDeletePolicy}
+            />
+          </section>
+        ))
+      ) : hasTables ? (
+        <NoSearchResults />
+      ) : (
+        <div className="flex-grow">
+          <ProductEmptyState
+            size="large"
+            title="Row-Level Security (RLS) Policies"
+            ctaButtonLabel="Create a table"
+            infoButtonLabel="What is RLS?"
+            infoButtonUrl="https://supabase.com/docs/guides/auth/row-level-security"
+            onClickCta={() => router.push(`/project/${ref}/editor`)}
+          >
+            <div className="space-y-4">
+              <InformationBox
+                title="What are policies?"
+                icon={<IconHelpCircle strokeWidth={2} />}
+                description={
+                  <div className="space-y-2">
+                    <p className="text-sm">
+                      Policies restrict, on a per-user basis, which rows can be returned by normal
+                      queries, or inserted, updated, or deleted by data modification commands.
+                    </p>
+                    <p className="text-sm">
+                      This is also known as Row-Level Security (RLS). Each policy is attached to a
+                      table, and the policy is executed each time its accessed.
+                    </p>
+                  </div>
+                }
+              />
+              <p className="text-sm text-scale-1100">
+                Create a table in this schema first before creating a policy.
+              </p>
+            </div>
+          </ProductEmptyState>
+        </div>
+      )}
+
+      <PolicyEditorModal
+        visible={!isEmpty(selectedSchemaAndTable)}
+        roles={roles}
+        schema={selectedSchemaAndTable.schema}
+        table={selectedSchemaAndTable.table}
+        selectedPolicyToEdit={selectedPolicyToEdit}
+        onSelectCancel={closePolicyEditorModal}
+        // @ts-ignore
+        onCreatePolicy={onCreatePolicy}
+        // @ts-ignore
+        onUpdatePolicy={onUpdatePolicy}
+        onSaveSuccess={onSavePolicySuccess}
+      />
+
+      <ConfirmModal
+        danger
+        visible={!isEmpty(selectedPolicyToDelete)}
+        title="Confirm to delete policy"
+        description={`This is permanent! Are you sure you want to delete the policy "${selectedPolicyToDelete.name}"`}
+        buttonLabel="Delete"
+        buttonLoadingLabel="Deleting"
+        onSelectCancel={closeConfirmModal}
+        onSelectConfirm={onDeletePolicy}
+      />
+
+      <ConfirmModal
+        danger={selectedTableToToggleRLS.rls_enabled}
+        visible={!isEmpty(selectedTableToToggleRLS)}
+        title={`Confirm to ${selectedTableToToggleRLS.rls_enabled ? 'disable' : 'enable'} RLS`}
+        description={`Are you sure you want to ${
+          selectedTableToToggleRLS.rls_enabled ? 'disable' : 'enable'
+        } row level security for the table "${selectedTableToToggleRLS.name}"?`}
+        buttonLabel="Confirm"
+        buttonLoadingLabel="Saving"
+        onSelectCancel={closeConfirmModal}
+        onSelectConfirm={onToggleRLS}
+      />
+    </>
+  )
+}
+
+export default observer(Policies)
diff --git a/studio/components/interfaces/Auth/Policies/Policies.utils.ts b/studio/components/interfaces/Auth/Policies/Policies.utils.ts
index ec00c22466d..046c4fb16bf 100644
--- a/studio/components/interfaces/Auth/Policies/Policies.utils.ts
+++ b/studio/components/interfaces/Auth/Policies/Policies.utils.ts
@@ -1,4 +1,4 @@
-import { PostgresPolicy } from '@supabase/postgres-meta'
+import type { PostgresPolicy } from '@supabase/postgres-meta'
 import { has, isEmpty, isEqual } from 'lodash'
 import {
   PolicyFormField,
diff --git a/studio/components/interfaces/Auth/Policies/PolicyEditor/PolicyRoles.tsx b/studio/components/interfaces/Auth/Policies/PolicyEditor/PolicyRoles.tsx
index 64398eb56af..27ab7ffc122 100644
--- a/studio/components/interfaces/Auth/Policies/PolicyEditor/PolicyRoles.tsx
+++ b/studio/components/interfaces/Auth/Policies/PolicyEditor/PolicyRoles.tsx
@@ -1,5 +1,5 @@
 import { FC } from 'react'
-import { PostgresRole } from '@supabase/postgres-meta'
+import type { PostgresRole } from '@supabase/postgres-meta'
 
 import MultiSelect from 'components/ui/MultiSelect'
 
diff --git a/studio/components/interfaces/Auth/Policies/PolicyEditor/index.tsx b/studio/components/interfaces/Auth/Policies/PolicyEditor/index.tsx
index a5e39deebad..5b249d11b2d 100644
--- a/studio/components/interfaces/Auth/Policies/PolicyEditor/index.tsx
+++ b/studio/components/interfaces/Auth/Policies/PolicyEditor/index.tsx
@@ -6,7 +6,7 @@ import PolicyDefinition from './PolicyDefinition'
 import PolicyAllowedOperation from './PolicyAllowedOperation'
 import PolicyRoles from './PolicyRoles'
 import PolicyEditorFooter from './PolicyEditorFooter'
-import { PostgresRole } from '@supabase/postgres-meta'
+import type { PostgresRole } from '@supabase/postgres-meta'
 
 // Exposed for StoragePoliciesEditor.js
 export { PolicyName, PolicyRoles }
diff --git a/studio/components/interfaces/Auth/Policies/PolicyEditorModal/PolicyEditorModal.constants.ts b/studio/components/interfaces/Auth/Policies/PolicyEditorModal/PolicyEditorModal.constants.ts
index e6487f59eec..a24711e35e9 100644
--- a/studio/components/interfaces/Auth/Policies/PolicyEditorModal/PolicyEditorModal.constants.ts
+++ b/studio/components/interfaces/Auth/Policies/PolicyEditorModal/PolicyEditorModal.constants.ts
@@ -57,13 +57,13 @@ WITH CHECK (true);`.trim(),
 CREATE POLICY "policy_name"
 ON ${schema}.${table}
 FOR UPDATE USING (
-  auth.email() = email
+  auth.jwt() ->> 'email' = email
 ) WITH CHECK (
-  auth.email() = email
+  auth.jwt() ->> 'email' = email
 );`.trim(),
     name: 'Enable update for users based on email',
-    definition: 'auth.email() = email',
-    check: 'auth.email() = email',
+    definition: `auth.jwt() ->> 'email' = email`,
+    check: `auth.jwt() ->> 'email' = email`,
     command: 'UPDATE',
     roles: [],
   },
diff --git a/studio/components/interfaces/Auth/Policies/PolicyEditorModal/index.tsx b/studio/components/interfaces/Auth/Policies/PolicyEditorModal/index.tsx
index 4ad6f97b6f4..7e77f5285a0 100644
--- a/studio/components/interfaces/Auth/Policies/PolicyEditorModal/index.tsx
+++ b/studio/components/interfaces/Auth/Policies/PolicyEditorModal/index.tsx
@@ -1,7 +1,7 @@
 import { Modal } from 'ui'
 import { FC, useState, useEffect } from 'react'
 import { isEmpty } from 'lodash'
-import { PostgresRole } from '@supabase/postgres-meta'
+import type { PostgresRole } from '@supabase/postgres-meta'
 
 import { useStore } from 'hooks'
 import PolicyEditorModalTitle from './PolicyEditorModalTitle'
diff --git a/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyRow.tsx b/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyRow.tsx
index 0dff2d0a4d9..b3a00e0d638 100644
--- a/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyRow.tsx
+++ b/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyRow.tsx
@@ -1,7 +1,7 @@
 import { FC } from 'react'
 import * as Tooltip from '@radix-ui/react-tooltip'
 import { Button, Dropdown, IconEdit, IconTrash, IconMoreVertical } from 'ui'
-import { PostgresPolicy } from '@supabase/postgres-meta'
+import type { PostgresPolicy } from '@supabase/postgres-meta'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
 
 import { checkPermissions } from 'hooks'
diff --git a/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRowHeader.tsx b/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRowHeader.tsx
index e985b6af5db..82cfd727e02 100644
--- a/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRowHeader.tsx
+++ b/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRowHeader.tsx
@@ -3,18 +3,20 @@ import { FC } from 'react'
 import { useRouter } from 'next/router'
 import * as Tooltip from '@radix-ui/react-tooltip'
 import { Badge, Button } from 'ui'
-import { PostgresTable } from '@supabase/postgres-meta'
+import type { PostgresTable } from '@supabase/postgres-meta'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
 import { checkPermissions } from 'hooks'
 
 interface Props {
   table: PostgresTable
+  isLocked: boolean
   onSelectToggleRLS: (table: PostgresTable) => void
   onSelectCreatePolicy: (table: PostgresTable) => void
 }
 
 const PolicyTableRowHeader: FC<Props> = ({
   table,
+  isLocked,
   onSelectToggleRLS = () => {},
   onSelectCreatePolicy = () => {},
 }) => {
@@ -35,63 +37,65 @@ const PolicyTableRowHeader: FC<Props> = ({
           {table.rls_enabled ? 'RLS enabled' : 'RLS disabled'}
         </Badge>
       </div>
-      <div className="flex-1">
-        <div className="flex flex-row-reverse">
-          <Tooltip.Root delayDuration={0}>
-            <Tooltip.Trigger>
-              <Button
-                type="outline"
-                disabled={!canCreatePolicies}
-                className="ml-2"
-                onClick={() => onSelectCreatePolicy(table)}
-              >
-                New Policy
-              </Button>
-            </Tooltip.Trigger>
-            {!canCreatePolicies && (
-              <Tooltip.Content side="bottom">
-                <Tooltip.Arrow className="radix-tooltip-arrow" />
-                <div
-                  className={[
-                    'rounded bg-scale-100 py-1 px-2 leading-none shadow',
-                    'border border-scale-200',
-                  ].join(' ')}
+      {!isLocked && (
+        <div className="flex-1">
+          <div className="flex flex-row-reverse">
+            <Tooltip.Root delayDuration={0}>
+              <Tooltip.Trigger>
+                <Button
+                  type="outline"
+                  disabled={!canCreatePolicies}
+                  className="ml-2"
+                  onClick={() => onSelectCreatePolicy(table)}
                 >
-                  <span className="text-xs text-scale-1200">
-                    You need additional permissions to create RLS policies
-                  </span>
-                </div>
-              </Tooltip.Content>
-            )}
-          </Tooltip.Root>
-          <Tooltip.Root delayDuration={0}>
-            <Tooltip.Trigger>
-              <Button
-                type="default"
-                disabled={!canToggleRLS}
-                onClick={() => onSelectToggleRLS(table)}
-              >
-                {table.rls_enabled ? 'Disable RLS' : 'Enable RLS'}
-              </Button>
-            </Tooltip.Trigger>
-            {!canToggleRLS && (
-              <Tooltip.Content side="bottom">
-                <Tooltip.Arrow className="radix-tooltip-arrow" />
-                <div
-                  className={[
-                    'rounded bg-scale-100 py-1 px-2 leading-none shadow',
-                    'border border-scale-200',
-                  ].join(' ')}
+                  New Policy
+                </Button>
+              </Tooltip.Trigger>
+              {!canCreatePolicies && (
+                <Tooltip.Content side="bottom">
+                  <Tooltip.Arrow className="radix-tooltip-arrow" />
+                  <div
+                    className={[
+                      'rounded bg-scale-100 py-1 px-2 leading-none shadow',
+                      'border border-scale-200',
+                    ].join(' ')}
+                  >
+                    <span className="text-xs text-scale-1200">
+                      You need additional permissions to create RLS policies
+                    </span>
+                  </div>
+                </Tooltip.Content>
+              )}
+            </Tooltip.Root>
+            <Tooltip.Root delayDuration={0}>
+              <Tooltip.Trigger>
+                <Button
+                  type="default"
+                  disabled={!canToggleRLS}
+                  onClick={() => onSelectToggleRLS(table)}
                 >
-                  <span className="text-xs text-scale-1200">
-                    You need additional permissions to toggle RLS
-                  </span>
-                </div>
-              </Tooltip.Content>
-            )}
-          </Tooltip.Root>
+                  {table.rls_enabled ? 'Disable RLS' : 'Enable RLS'}
+                </Button>
+              </Tooltip.Trigger>
+              {!canToggleRLS && (
+                <Tooltip.Content side="bottom">
+                  <Tooltip.Arrow className="radix-tooltip-arrow" />
+                  <div
+                    className={[
+                      'rounded bg-scale-100 py-1 px-2 leading-none shadow',
+                      'border border-scale-200',
+                    ].join(' ')}
+                  >
+                    <span className="text-xs text-scale-1200">
+                      You need additional permissions to toggle RLS
+                    </span>
+                  </div>
+                </Tooltip.Content>
+              )}
+            </Tooltip.Root>
+          </div>
         </div>
-      </div>
+      )}
     </div>
   )
 }
diff --git a/studio/components/interfaces/Auth/Policies/PolicyTableRow/index.tsx b/studio/components/interfaces/Auth/Policies/PolicyTableRow/index.tsx
index d181c0d6463..487027580b9 100644
--- a/studio/components/interfaces/Auth/Policies/PolicyTableRow/index.tsx
+++ b/studio/components/interfaces/Auth/Policies/PolicyTableRow/index.tsx
@@ -1,5 +1,5 @@
 import { FC } from 'react'
-import { PostgresTable, PostgresPolicy } from '@supabase/postgres-meta'
+import type { PostgresTable, PostgresPolicy } from '@supabase/postgres-meta'
 import { observer } from 'mobx-react-lite'
 import { useStore } from 'hooks'
 
@@ -9,50 +9,61 @@ import Panel from 'components/ui/Panel'
 
 interface Props {
   table: PostgresTable
+  isLocked: boolean
   onSelectToggleRLS: (table: PostgresTable) => void
   onSelectCreatePolicy: (table: PostgresTable) => void
   onSelectEditPolicy: (policy: PostgresPolicy) => void
   onSelectDeletePolicy: (policy: PostgresPolicy) => void
 }
 
-const PolicyTableRow: FC<Props> = observer(
-  ({
-    table,
-    onSelectToggleRLS = () => {},
-    onSelectCreatePolicy = () => {},
-    onSelectEditPolicy = () => {},
-    onSelectDeletePolicy = () => {},
-  }) => {
-    const { meta } = useStore()
-    const policies = meta.policies.list((x: PostgresPolicy) => x.table === table.name)
-    return (
-      <Panel
-        title={
-          <PolicyTableRowHeader
-            table={table}
-            onSelectToggleRLS={onSelectToggleRLS}
-            onSelectCreatePolicy={onSelectCreatePolicy}
-          />
-        }
-      >
-        {policies.length === 0 && (
-          <div className="p-4 px-6">
-            <p className="text-scale-900 text-sm">No policies created yet</p>
-          </div>
-        )}
+const PolicyTableRow: FC<Props> = ({
+  table,
+  isLocked,
+  onSelectToggleRLS = () => {},
+  onSelectCreatePolicy = () => {},
+  onSelectEditPolicy = () => {},
+  onSelectDeletePolicy = () => {},
+}) => {
+  const { meta } = useStore()
+  const policies = meta.policies.list((x: PostgresPolicy) => x.table === table.name)
 
-        {/* @ts-ignore */}
-        {policies.map((policy) => (
-          <PolicyRow
-            key={policy.id}
-            policy={policy}
-            onSelectEditPolicy={onSelectEditPolicy}
-            onSelectDeletePolicy={onSelectDeletePolicy}
-          />
-        ))}
-      </Panel>
-    )
-  }
-)
+  return (
+    <Panel
+      title={
+        <PolicyTableRowHeader
+          table={table}
+          isLocked={isLocked}
+          onSelectToggleRLS={onSelectToggleRLS}
+          onSelectCreatePolicy={onSelectCreatePolicy}
+        />
+      }
+    >
+      {policies.length === 0 && (
+        <div className="p-4 px-6 space-y-1">
+          <p className="text-scale-1100 text-sm">No policies created yet</p>
+          {table.rls_enabled ? (
+            <p className="text-scale-1000 text-sm">
+              RLS is enabled - create a policy to allow access to this table.
+            </p>
+          ) : (
+            <p className="text-amber-900 text-sm opacity-50">
+              Warning: RLS is disabled - anonymous access is allowed to this table
+            </p>
+          )}
+        </div>
+      )}
 
-export default PolicyTableRow
+      {/* @ts-ignore */}
+      {policies.map((policy) => (
+        <PolicyRow
+          key={policy.id}
+          policy={policy}
+          onSelectEditPolicy={onSelectEditPolicy}
+          onSelectDeletePolicy={onSelectDeletePolicy}
+        />
+      ))}
+    </Panel>
+  )
+}
+
+export default observer(PolicyTableRow)
diff --git a/studio/components/interfaces/Auth/Policies/index.tsx b/studio/components/interfaces/Auth/Policies/index.tsx
index f1cd35fac60..129075d7344 100644
--- a/studio/components/interfaces/Auth/Policies/index.tsx
+++ b/studio/components/interfaces/Auth/Policies/index.tsx
@@ -1,7 +1,8 @@
+import Policies from './Policies'
 import PolicyEditorModal from './PolicyEditorModal'
 import PolicyTableRow from './PolicyTableRow'
 import PolicySelection from './PolicySelection'
 import PolicyTemplates from './PolicyTemplates'
 
 export * from './Policies.constants'
-export { PolicyEditorModal, PolicyTableRow, PolicySelection, PolicyTemplates }
+export { Policies, PolicyEditorModal, PolicyTableRow, PolicySelection, PolicyTemplates }
diff --git a/studio/components/interfaces/Auth/Users/UserDropdown.tsx b/studio/components/interfaces/Auth/Users/UserDropdown.tsx
index 42dd95b7444..016f4e20dc2 100644
--- a/studio/components/interfaces/Auth/Users/UserDropdown.tsx
+++ b/studio/components/interfaces/Auth/Users/UserDropdown.tsx
@@ -3,7 +3,7 @@ import { observer } from 'mobx-react-lite'
 import * as Tooltip from '@radix-ui/react-tooltip'
 import { Button, Dropdown, IconTrash, IconMail, IconMoreHorizontal, IconShieldOff } from 'ui'
 
-import { useFlag, useStore } from 'hooks'
+import { useStore } from 'hooks'
 import { timeout } from 'lib/helpers'
 import { post, delete_ } from 'lib/common/fetch'
 import { API_URL } from 'lib/constants'
@@ -18,7 +18,6 @@ interface Props {
 }
 
 const UserDropdown: FC<Props> = ({ user, canRemoveUser, canRemoveMFAFactors }) => {
-  const showDeleteFactorsDropdown = useFlag('mfaSso')
   const PageState: any = useContext(PageContext)
   const { ui } = useStore()
   const [loading, setLoading] = useState<boolean>(false)
@@ -170,38 +169,36 @@ const UserDropdown: FC<Props> = ({ user, canRemoveUser, canRemoveMFAFactors }) =
             </Dropdown.Item>
           ) : null}
           <Dropdown.Separator />
-          {showDeleteFactorsDropdown && (
-            <Tooltip.Root delayDuration={0}>
-              <Tooltip.Trigger className="w-full">
-                <Dropdown.Item
-                  onClick={handleDeleteFactors}
-                  icon={<IconShieldOff size="tiny" />}
-                  disabled={!canRemoveMFAFactors}
-                >
-                  Remove MFA factors
-                </Dropdown.Item>
-              </Tooltip.Trigger>
-              {/* 
+          <Tooltip.Root delayDuration={0}>
+            <Tooltip.Trigger className="w-full">
+              <Dropdown.Item
+                onClick={handleDeleteFactors}
+                icon={<IconShieldOff size="tiny" />}
+                disabled={!canRemoveMFAFactors}
+              >
+                Remove MFA factors
+              </Dropdown.Item>
+            </Tooltip.Trigger>
+            {/* 
                 [Joshen] Deleting MFA factors should be different ABAC perms i think
                  need to double check with KM / anyone familiar with ABAC 
               */}
-              {!canRemoveMFAFactors && (
-                <Tooltip.Content side="bottom">
-                  <Tooltip.Arrow className="radix-tooltip-arrow" />
-                  <div
-                    className={[
-                      'rounded bg-scale-100 py-1 px-2 leading-none shadow',
-                      'border border-scale-200',
-                    ].join(' ')}
-                  >
-                    <span className="text-xs text-scale-1200">
-                      You need additional permissions to remove a user's authentication factors.
-                    </span>
-                  </div>
-                </Tooltip.Content>
-              )}
-            </Tooltip.Root>
-          )}
+            {!canRemoveMFAFactors && (
+              <Tooltip.Content side="bottom">
+                <Tooltip.Arrow className="radix-tooltip-arrow" />
+                <div
+                  className={[
+                    'rounded bg-scale-100 py-1 px-2 leading-none shadow',
+                    'border border-scale-200',
+                  ].join(' ')}
+                >
+                  <span className="text-xs text-scale-1200">
+                    You need additional permissions to remove a user's authentication factors.
+                  </span>
+                </div>
+              </Tooltip.Content>
+            )}
+          </Tooltip.Root>
           <Tooltip.Root delayDuration={0}>
             <Tooltip.Trigger className="w-full">
               <Dropdown.Item
diff --git a/studio/components/interfaces/Billing/AddOns/ComputeSizeSelection.tsx b/studio/components/interfaces/Billing/AddOns/ComputeSizeSelection.tsx
index 080b518db15..3354fc5be98 100644
--- a/studio/components/interfaces/Billing/AddOns/ComputeSizeSelection.tsx
+++ b/studio/components/interfaces/Billing/AddOns/ComputeSizeSelection.tsx
@@ -89,13 +89,13 @@ const ComputeSizeSelection: FC<Props> = ({
                   </div>
                 }
                 // @ts-ignore
-                description={
-                  <div>
-                    <p>{option.metadata.features}</p>
+                description={option.metadata.features}
+                value={option.id}
+                optionalLabel={
+                  <div className="w-[6rem] flex items-center justify-end">
+                    ${defaultPrice.unit_amount / 100} / month
                   </div>
                 }
-                value={option.id}
-                optionalLabel={<div>${defaultPrice.unit_amount / 100} / month</div>}
                 checked={selectedComputeSize?.id === option.id}
                 onChange={() => onSelectOption(option)}
               />
diff --git a/studio/components/interfaces/Billing/Billing.constants.tsx b/studio/components/interfaces/Billing/Billing.constants.tsx
index 49782d9f644..509d0d554d7 100644
--- a/studio/components/interfaces/Billing/Billing.constants.tsx
+++ b/studio/components/interfaces/Billing/Billing.constants.tsx
@@ -28,6 +28,12 @@ export const USAGE_BASED_PRODUCTS = [
         title: 'Database space',
         units: 'bytes',
         costPerUnit: 0.125,
+        tooltip: (
+          <span>
+            We continuously monitor the total size of your database. Billing is based on the average
+            database size in GB throughout the billing period.
+          </span>
+        ),
       },
       {
         key: 'db_egress',
@@ -35,6 +41,12 @@ export const USAGE_BASED_PRODUCTS = [
         title: 'Database egress',
         units: 'bytes',
         costPerUnit: 0.09,
+        tooltip: (
+          <span>
+            Database egress contains any outgoing traffic (egress) from your database. Billing is
+            based on the total sum of egress in GB throughout your billing period.
+          </span>
+        ),
       },
     ],
   },
@@ -48,6 +60,12 @@ export const USAGE_BASED_PRODUCTS = [
         title: 'Monthly Active Users',
         units: 'absolute',
         costPerUnit: 0.00325,
+        tooltip: (
+          <span>
+            The amount of distinct users requesting your API throughout the billing period. Resets
+            at the beginning of every billing period.
+          </span>
+        ),
       },
     ],
   },
@@ -61,6 +79,12 @@ export const USAGE_BASED_PRODUCTS = [
         title: 'Storage space',
         units: 'bytes',
         costPerUnit: 0.021,
+        tooltip: (
+          <span>
+            The storage size is the sum of all objects in your storage buckets. Billing is based on
+            the average size in GB throughout your billing period.
+          </span>
+        ),
       },
       {
         key: 'storage_egress',
@@ -68,6 +92,14 @@ export const USAGE_BASED_PRODUCTS = [
         title: 'Storage egress',
         units: 'bytes',
         costPerUnit: 0.09,
+        tooltip: (
+          <span>
+            Storage egress contains any outgoing traffic (egress) from your storage buckets, only
+            download operations are counted. We currently do not differentiate between no-cache and
+            cache hits. Billing is based on the total amount of egress in GB throughout your billing
+            period.
+          </span>
+        ),
       },
       {
         key: 'storage_image_render_count',
@@ -75,6 +107,14 @@ export const USAGE_BASED_PRODUCTS = [
         title: 'Storage Images Transformed',
         units: 'absolute',
         costPerUnit: 0.005,
+        tooltip: (
+          <span>
+            We distinctly count all images that were transformed in the billing period, ignoring any
+            transformations. If you transform one image with different transformations (i.e. once
+            with height=50 and once with height=150), it only counts as one. We only count the
+            unique (origin) images being transformed.
+          </span>
+        ),
       },
     ],
   },
@@ -88,6 +128,12 @@ export const USAGE_BASED_PRODUCTS = [
         title: 'Function Count',
         units: 'absolute',
         costPerUnit: 0.1,
+        tooltip: (
+          <span>
+            Every single serverless function invocation independent of response status is counted.
+            Billing is based on the sum of all invocations throughout your billing period.
+          </span>
+        ),
       },
 
       {
@@ -96,6 +142,13 @@ export const USAGE_BASED_PRODUCTS = [
         title: 'Function Invocations',
         units: 'absolute',
         costPerUnit: 0.000002,
+        tooltip: (
+          <span>
+            We continuously monitor the amount of serverless functions in your project. Billing is
+            based on the maximum amount of functions at any point in time throughout your billing
+            period.
+          </span>
+        ),
       },
     ],
   },
diff --git a/studio/components/interfaces/Billing/EnterpriseUpdate.tsx b/studio/components/interfaces/Billing/EnterpriseUpdate.tsx
index 969b5d58993..3e3ec309bfd 100644
--- a/studio/components/interfaces/Billing/EnterpriseUpdate.tsx
+++ b/studio/components/interfaces/Billing/EnterpriseUpdate.tsx
@@ -2,7 +2,7 @@ import { FC, useState, useEffect, useRef } from 'react'
 import { useRouter } from 'next/router'
 import { Transition } from '@headlessui/react'
 
-import { useStore, useFlag } from 'hooks'
+import { useStore } from 'hooks'
 import { getURL } from 'lib/helpers'
 import { post, patch } from 'lib/common/fetch'
 import { API_URL, PROJECT_STATUS } from 'lib/constants'
@@ -43,8 +43,6 @@ const EnterpriseUpdate: FC<Props> = ({
 }) => {
   const { app, ui } = useStore()
   const router = useRouter()
-  const isCustomDomainsEnabled = useFlag('customDomains')
-  const isPITRSelfServeEnabled = useFlag('pitrSelfServe')
 
   const [captchaToken, setCaptchaToken] = useState<string | null>(null)
   const captchaRef = useRef<HCaptcha>(null)
@@ -158,18 +156,6 @@ const EnterpriseUpdate: FC<Props> = ({
   // Last todo to support enterprise billing on dashboard + E2E test
   const onConfirmPayment = async () => {
     setIsSubmitting(true)
-    let token = captchaToken
-
-    try {
-      if (!token) {
-        const captchaResponse = await captchaRef.current?.execute({ async: true })
-        token = captchaResponse?.response ?? null
-      }
-    } catch (error) {
-      setIsSubmitting(false)
-      return
-    }
-
     const payload = {
       ...formSubscriptionUpdatePayload(
         currentSubscription,
@@ -228,12 +214,12 @@ const EnterpriseUpdate: FC<Props> = ({
         <div className="flex-grow mt-10">
           <div className="relative space-y-4">
             <div className="space-y-8">
-              <div className="space-y-4 2xl:min-w-5xl mx-auto px-32">
+              <div className="space-y-4 2xl:max-w-5xl mx-auto px-32">
                 <h4 className="text-lg text-scale-900 !mb-8">Change your project's subscription</h4>
               </div>
 
               <div
-                className="space-y-8 overflow-y-auto pb-8 2xl:min-w-5xl mx-auto px-32"
+                className="space-y-8 overflow-y-auto pb-8 2xl:max-w-5xl mx-auto px-32"
                 style={{ height: 'calc(100vh - 6.4rem - 57px)' }}
               >
                 <h3 className="text-xl">
@@ -259,28 +245,20 @@ const EnterpriseUpdate: FC<Props> = ({
                         <SupportPlan currentOption={currentAddons.supportPlan} />
                       </>
                     )}
-                    {isCustomDomainsEnabled && customDomainOptions.length > 0 && (
-                      <>
-                        <Divider light />
-                        <CustomDomainSelection
-                          options={customDomainOptions}
-                          currentOption={currentAddons.customDomains}
-                          selectedOption={selectedAddons.customDomains}
-                          onSelectOption={setSelectedCustomDomainOption}
-                        />
-                      </>
-                    )}
-                    {isPITRSelfServeEnabled && pitrDurationOptions.length > 0 && (
-                      <>
-                        <Divider light />
-                        <PITRDurationSelection
-                          pitrDurationOptions={pitrDurationOptions}
-                          currentPitrDuration={currentAddons.pitrDuration}
-                          selectedPitrDuration={selectedAddons.pitrDuration}
-                          onSelectOption={setSelectedPITRDuration}
-                        />
-                      </>
-                    )}
+                    <Divider light />
+                    <CustomDomainSelection
+                      options={customDomainOptions}
+                      currentOption={currentAddons.customDomains}
+                      selectedOption={selectedAddons.customDomains}
+                      onSelectOption={setSelectedCustomDomainOption}
+                    />
+                    <Divider light />
+                    <PITRDurationSelection
+                      pitrDurationOptions={pitrDurationOptions}
+                      currentPitrDuration={currentAddons.pitrDuration}
+                      selectedPitrDuration={selectedAddons.pitrDuration}
+                      onSelectOption={setSelectedPITRDuration}
+                    />
                     <Divider light />
                     <ComputeSizeSelection
                       computeSizes={computeSizes || []}
diff --git a/studio/components/interfaces/Billing/ExitSurvey/ExitSurvey.tsx b/studio/components/interfaces/Billing/ExitSurvey/ExitSurvey.tsx
index 9cda2b5aa30..e8caaf6111f 100644
--- a/studio/components/interfaces/Billing/ExitSurvey/ExitSurvey.tsx
+++ b/studio/components/interfaces/Billing/ExitSurvey/ExitSurvey.tsx
@@ -37,6 +37,8 @@ const ExitSurvey: FC<Props> = ({ freeTier, subscription, onSelectBack }) => {
   // Tracking submitting state separately outside of form component cause of
   // the additional dynamic confirmation modal that we're doing
   const [isSubmitting, setIsSubmitting] = useState(false)
+  const [isSubmittingDowngradeModal, setIsSubmittingDowngradeModal] = useState(false)
+
   const [isSuccessful, setIsSuccessful] = useState(false)
   const [showConfirmModal, setShowConfirmModal] = useState(false)
   const [subscriptionPreview, setSubscriptionPreview] = useState<SubscriptionPreview>()
@@ -123,6 +125,7 @@ const ExitSurvey: FC<Props> = ({ freeTier, subscription, onSelectBack }) => {
 
     try {
       setIsSubmitting(true)
+      setIsSubmittingDowngradeModal(true)
 
       // Trigger subscription downgrade
       const tier = freeTier.prices[0].id
@@ -175,6 +178,7 @@ const ExitSurvey: FC<Props> = ({ freeTier, subscription, onSelectBack }) => {
       })
     } finally {
       setIsSubmitting(false)
+      setIsSubmittingDowngradeModal(false)
     }
   }
 
@@ -293,7 +297,10 @@ const ExitSurvey: FC<Props> = ({ freeTier, subscription, onSelectBack }) => {
         visible={showConfirmModal}
         size="large"
         header="Downgrading project to free"
-        onCancel={() => setShowConfirmModal(false)}
+        onCancel={() => {
+          setShowConfirmModal(false)
+          setIsSubmitting(false)
+        }}
       >
         <div className="space-y-4 py-4">
           <Modal.Content>
@@ -314,14 +321,21 @@ const ExitSurvey: FC<Props> = ({ freeTier, subscription, onSelectBack }) => {
           <Modal.Separator />
           <Modal.Content>
             <div className="flex items-center gap-2">
-              <Button block type="default" onClick={() => setShowConfirmModal(false)}>
+              <Button
+                block
+                type="default"
+                onClick={() => {
+                  setShowConfirmModal(false)
+                  setIsSubmitting(false)
+                }}
+              >
                 Cancel
               </Button>
               <Button
                 block
                 htmlType="submit"
-                loading={isSubmitting}
-                disabled={isSubmitting}
+                loading={isSubmittingDowngradeModal}
+                disabled={isSubmittingDowngradeModal}
                 onClick={() => downgradeProject()}
               >
                 Confirm
diff --git a/studio/components/interfaces/Billing/PlanSelection/PlanSelection.tsx b/studio/components/interfaces/Billing/PlanSelection/PlanSelection.tsx
index c2c52459e0e..3c54921b215 100644
--- a/studio/components/interfaces/Billing/PlanSelection/PlanSelection.tsx
+++ b/studio/components/interfaces/Billing/PlanSelection/PlanSelection.tsx
@@ -2,8 +2,9 @@ import Link from 'next/link'
 import { FC } from 'react'
 import { Transition } from '@headlessui/react'
 
-import Plans from './Plans/Plans'
+import PlanCard from './Plans/PlanCard'
 import { formatTierOptions } from './PlanSelection.utils'
+import { Button, IconExternalLink } from 'ui'
 
 interface Props {
   visible: boolean
@@ -16,7 +17,10 @@ const PlanSelection: FC<Props> = ({ visible, tiers, currentPlan, onSelectPlan })
   const formattedTiers = formatTierOptions(tiers)
 
   // [Kevin] TODO Remove after team plan is generally available
-  const gridCols = formattedTiers.length === 3 ? 'gap-8 xl:grid-cols-3' : 'gap-4 xl:grid-cols-4'
+  const gridCols =
+    formattedTiers.length === 3
+      ? 'gap-8 lg:grid-cols-3'
+      : 'gap-4 lg:grid-cols-3 xl:grid-cols-billingWithTeam'
 
   return (
     <Transition
@@ -28,15 +32,27 @@ const PlanSelection: FC<Props> = ({ visible, tiers, currentPlan, onSelectPlan })
       <div>
         <h4 className="text-lg mb-8">Change your project's subscription</h4>
         <div className={`grid py-8 grid-cols-2 ${gridCols}`}>
-          <Plans plans={formattedTiers} currentPlan={currentPlan} onSelectPlan={onSelectPlan} />
+          {formattedTiers.map((plan) => {
+            return (
+              <PlanCard
+                key={plan.id}
+                plan={plan}
+                currentPlan={currentPlan}
+                onSelectPlan={() => onSelectPlan(plan)}
+              />
+            )
+          })}
         </div>
         <div className="flex justify-center items-center mt-4">
           <Link href="https://supabase.com/pricing">
-            <a
-              target="_blank"
-              className="text-sm underline text-scale-1100 hover:text-scale-1200 transition"
-            >
-              See detailed comparisons across plans
+            <a target="_blank">
+              <Button
+                type="link"
+                icon={<IconExternalLink size={14} strokeWidth={1.5} />}
+                className="text-sm text-scale-1000 hover:text-scale-1100 hover:bg-scale-400"
+              >
+                See detailed comparisons across plans
+              </Button>
             </a>
           </Link>
         </div>
diff --git a/studio/components/interfaces/Billing/PlanSelection/Plans/PlanCTAButton.tsx b/studio/components/interfaces/Billing/PlanSelection/Plans/PlanCTAButton.tsx
index 05dbf005a53..ca1595eaf6c 100644
--- a/studio/components/interfaces/Billing/PlanSelection/Plans/PlanCTAButton.tsx
+++ b/studio/components/interfaces/Billing/PlanSelection/Plans/PlanCTAButton.tsx
@@ -17,8 +17,8 @@ const PlanCTAButton: FC<Props> = ({ plan, currentPlan, onSelectPlan }) => {
   const projectUpdateDisabled = useFlag('disableProjectCreationAndUpdate')
 
   const getButtonType = (plan: any, currentPlan: any) => {
-    if (['Enterprise', 'Free tier'].includes(plan.name)) {
-      // Enterprise/Free are always default
+    if (['Free tier'].includes(plan.name)) {
+      // Free is always default
       return 'default'
     } else if (currentPlan.prod_id === STRIPE_PRODUCT_IDS.FREE) {
       // If the current plan is free, other plans are primary
@@ -90,7 +90,7 @@ const PlanCTAButton: FC<Props> = ({ plan, currentPlan, onSelectPlan }) => {
     return (
       <Link href="https://supabase.com/contact/enterprise">
         <a>
-          <Button disabled={disabled} type={type} block size="medium">
+          <Button disabled={disabled} type={type} block>
             {ctaText}
           </Button>
         </a>
@@ -100,20 +100,33 @@ const PlanCTAButton: FC<Props> = ({ plan, currentPlan, onSelectPlan }) => {
 
   return (
     <div className="flex flex-col items-center justify-center space-y-2">
-      <Button
-        disabled={disabled || projectUpdateDisabled}
-        type={type}
-        onClick={() => onSelectPlan(plan)}
-        block
-        size="medium"
-      >
-        {ctaText}
-      </Button>
-      {!disabled && projectUpdateDisabled && (
-        <p className="text-sm text-scale-1100">
-          Subscription changes are currently disabled, our engineers are working on a fix
-        </p>
-      )}
+      <Tooltip.Root delayDuration={0}>
+        <Tooltip.Trigger className="w-full">
+          <Button
+            block
+            type={type}
+            disabled={disabled || projectUpdateDisabled}
+            onClick={() => onSelectPlan(plan)}
+          >
+            {ctaText}
+          </Button>
+        </Tooltip.Trigger>
+        {!disabled && projectUpdateDisabled && (
+          <Tooltip.Content side="bottom">
+            <Tooltip.Arrow className="radix-tooltip-arrow" />
+            <div
+              className={[
+                'rounded bg-scale-100 py-1 px-2 leading-none shadow',
+                'border border-scale-200 w-[260px] flex items-center justify-center',
+              ].join(' ')}
+            >
+              <span className="text-xs text-scale-1200 text-center">
+                Subscription changes are currently disabled, our engineers are working on a fix
+              </span>
+            </div>
+          </Tooltip.Content>
+        )}
+      </Tooltip.Root>
     </div>
   )
 }
diff --git a/studio/components/interfaces/Billing/PlanSelection/Plans/PlanCard.tsx b/studio/components/interfaces/Billing/PlanSelection/Plans/PlanCard.tsx
new file mode 100644
index 00000000000..2745c65dbcc
--- /dev/null
+++ b/studio/components/interfaces/Billing/PlanSelection/Plans/PlanCard.tsx
@@ -0,0 +1,132 @@
+import { PRICING_TIER_PRODUCT_IDS, STRIPE_PRODUCT_IDS } from 'lib/constants'
+import { FC } from 'react'
+import { IconCheck } from 'ui'
+
+import { useFlag } from 'hooks'
+import PlanCTAButton from './PlanCTAButton'
+import { PRICING_META } from './Plans.Constants'
+
+interface Props {
+  plan: any
+  currentPlan: any
+  onSelectPlan: () => void
+}
+
+const PlanCard: FC<Props> = ({ plan, currentPlan, onSelectPlan }) => {
+  // Team tier is enabled when the flag is turned on OR the user is already on the team tier (manually assigned by us)
+  const teamTierEnabled = currentPlan?.supabase_prod_id === PRICING_TIER_PRODUCT_IDS.TEAM || useFlag('teamTier')
+
+  const planMeta = PRICING_META[plan.id]
+  const isEnterprise = plan.id === 'Enterprise'
+  const isCurrentPlan =
+    plan.id === currentPlan?.prod_id ||
+    (plan.id === STRIPE_PRODUCT_IDS.PRO && currentPlan?.prod_id === STRIPE_PRODUCT_IDS.PRO) ||
+    (plan.id === STRIPE_PRODUCT_IDS.PRO && currentPlan?.prod_id === STRIPE_PRODUCT_IDS.PAYG)
+
+  return (
+    <div
+      className={[
+        'px-6 py-6 border rounded flex flex-col justify-between',
+        `${isEnterprise ? 'bg-scale-200' : 'bg-scale-300'}`,
+        `${isEnterprise && teamTierEnabled ? 'lg:col-span-3 xl:col-auto' : ''}`,
+      ].join(' ')}
+    >
+      <div
+        className={[
+          'space-y-8',
+          `${isEnterprise ? 'flex flex-col xl:space-x-0 xl:flex-col' : ''}`,
+          `${isEnterprise && teamTierEnabled ? 'lg:flex-row lg:space-x-24' : ''}`,
+        ].join(' ')}
+      >
+        <div
+          className={[
+            'space-y-4',
+            `${isEnterprise ? 'xl:w-auto' : ''}`,
+            `${isEnterprise && teamTierEnabled ? 'xl:w-auto' : ''}`,
+          ].join(' ')}
+        >
+          <div className="flex items-center space-x-2">
+            <p
+              className={[
+                'text-brand-900 text-sm',
+                `${isEnterprise ? 'lg:text-base xl:text-sm font-bold font-mono uppercase' : ''}`,
+              ].join(' ')}
+            >
+              {planMeta.name}
+            </p>
+            {isCurrentPlan ? (
+              <div className="text-xs bg-scale-500 text-scale-1000 rounded px-2 py-0.5">
+                Current plan
+              </div>
+            ) : planMeta.new ? (
+              <div className="text-xs bg-brand-400 text-brand-900 rounded px-2 py-0.5">New</div>
+            ) : (
+              <></>
+            )}
+          </div>
+          <p className="text-sm text-scale-1100">{planMeta.description}</p>
+          <div
+            className={[
+              'space-y-2',
+              `${
+                isEnterprise
+                  ? 'pb-6 border-b lg:pt-6 lg:border-b-0 lg:border-t xl:pt-0 xl:pb-6 xl:border-t-0 xl:border-b'
+                  : 'border-b border-t py-8'
+              }`,
+            ].join(' ')}
+          >
+            {planMeta.priceMonthly !== undefined ? (
+              <>
+                <p className="text-sm text-scale-1000">Starting from</p>
+                <div className="space-y-1">
+                  <p className="text-[3.4rem] leading-none">${planMeta.priceMonthly}</p>
+                  <p className="text-sm text-scale-1000">{planMeta.priceUnit}</p>
+                </div>
+                <div className="text-xs bg-brand-400 text-brand-900 rounded px-2 py-0.5 w-fit">
+                  {planMeta.warning}
+                </div>
+              </>
+            ) : (
+              <PlanCTAButton plan={plan} currentPlan={currentPlan} onSelectPlan={onSelectPlan} />
+            )}
+          </div>
+        </div>
+        <div className={`${isEnterprise ? 'lg:space-y-0 lg:!mt-0 xl:space-y-4' : 'space-y-4'}`}>
+          <p className="text-xs text-scale-1000">{planMeta.preface}</p>
+          <ul
+            role="list"
+            className={[
+              `${isEnterprise ? 'xl:gap-0 xl:columns-1' : ''}`,
+              `${isEnterprise && teamTierEnabled ? 'lg:gap-16 lg:columns-2' : ''}`,
+            ].join(' ')}
+          >
+            {planMeta.features.map((feature) => (
+              <li key={feature} className="flex py-2">
+                <div className="w-[12px]">
+                  <IconCheck
+                    className="h-3 w-3 text-brand-900 translate-y-[2.5px]"
+                    aria-hidden="true"
+                    strokeWidth={3}
+                  />
+                </div>
+                <p className="ml-3 text-xs text-scale-1100">{feature}</p>
+              </li>
+            ))}
+          </ul>
+        </div>
+      </div>
+      {!isEnterprise && (
+        <div className="space-y-4 !mt-20">
+          <div className="space-y-2">
+            <p className="text-sm text-scale-1100">{planMeta.additional}</p>
+            <p className="text-xs text-scale-1000">{planMeta.scale}</p>
+          </div>
+
+          <PlanCTAButton plan={plan} currentPlan={currentPlan} onSelectPlan={onSelectPlan} />
+        </div>
+      )}
+    </div>
+  )
+}
+
+export default PlanCard
diff --git a/studio/components/interfaces/Billing/PlanSelection/Plans/Plans.Constants.ts b/studio/components/interfaces/Billing/PlanSelection/Plans/Plans.Constants.ts
index 1e8b6f8e918..025e54ea8a7 100644
--- a/studio/components/interfaces/Billing/PlanSelection/Plans/Plans.Constants.ts
+++ b/studio/components/interfaces/Billing/PlanSelection/Plans/Plans.Constants.ts
@@ -9,10 +9,11 @@ import { STRIPE_PRODUCT_IDS } from 'lib/constants'
 export const PRICING_META = {
   [STRIPE_PRODUCT_IDS.FREE]: {
     name: 'Free',
-    href: '#',
-    priceMonthly: 0,
-    warning: 'Limit of 2 free projects',
     description: 'Perfect for passion projects & simple websites.',
+    priceMonthly: 0,
+    priceUnit: 'per month per project',
+    warning: 'Limit of 2 free projects',
+    preface: 'Get started with:',
     features: [
       'Up to 500MB database & 1GB file storage',
       'Up to 2GB bandwidth',
@@ -25,17 +26,15 @@ export const PRICING_META = {
       '2 million Realtime messages',
       'Community support',
     ],
-    additional: 'Free projects are paused after 1 week of inactivity.',
-
-    cta: 'Get Started',
+    scale: 'Free projects are paused after 1 week of inactivity.',
   },
   [STRIPE_PRODUCT_IDS.PRO]: {
     name: 'Pro',
-    href: '#',
-    from: true,
-    priceMonthly: 25,
-    warning: '+ any additional usage',
     description: 'For production applications with the option to scale.',
+    priceMonthly: 25,
+    priceUnit: 'per month per project',
+    warning: '+ any additional usage',
+    preface: 'Everything in the Free plan, plus:',
     features: [
       '8GB database & 100GB file storage',
       '50GB bandwidth',
@@ -50,19 +49,17 @@ export const PRICING_META = {
       'No project pausing',
       'Email support',
     ],
-    scale: 'Additional fees apply for usage and storage beyond the limits above.',
-    shutdown: '',
-    preface: 'Everything in the base plan, plus',
     additional: 'Need more? Turn off your spend cap to Pay As You Grow ',
-    cta: 'Get Started',
+    scale: 'Additional fees apply for usage and storage beyond the limits above.',
   },
   [STRIPE_PRODUCT_IDS.TEAM]: {
+    new: true,
     name: 'Team',
-    href: '#',
-    from: true,
+    description: 'Collaborate with different permissions and access patterns.',
     priceMonthly: 599,
+    priceUnit: 'per month per organization',
     warning: '+ usage',
-    description: 'For collaborative teams with different permissions and access.',
+    preface: 'The following features will apply to all projects within the organization:',
     features: [
       'Usage-based pricing',
       '100,000 monthly active users included',
@@ -75,10 +72,6 @@ export const PRICING_META = {
       '14 day backups',
       '28 day log retention',
     ],
-    scale: '',
-    shutdown: '',
-    additional: '',
-    cta: 'Get Started',
   },
   Enterprise: {
     name: 'Enterprise',
@@ -94,8 +87,5 @@ export const PRICING_META = {
       `On-premise support`,
       `24×7×365 premium enterprise support`,
     ],
-    scale: '',
-    shutdown: '',
-    cta: 'Contact Us',
   },
 }
diff --git a/studio/components/interfaces/Billing/PlanSelection/Plans/Plans.tsx b/studio/components/interfaces/Billing/PlanSelection/Plans/Plans.tsx
deleted file mode 100644
index a08e0b5b14c..00000000000
--- a/studio/components/interfaces/Billing/PlanSelection/Plans/Plans.tsx
+++ /dev/null
@@ -1,154 +0,0 @@
-import { FC } from 'react'
-import { IconCheck } from 'ui'
-
-import { STRIPE_PRODUCT_IDS } from 'lib/constants'
-import { StripeProduct } from 'components/interfaces/Billing'
-import PlanCTAButton from './PlanCTAButton'
-import { PRICING_META } from './Plans.Constants'
-
-const AnimatedGradientBackground = () => (
-  <div
-    className={[
-      'absolute top-0 left-0 h-full w-full animate-sway',
-      'bg-gradient-to-b from-transparent via-transparent to-green-900',
-    ].join(' ')}
-  />
-)
-
-const CurrentSubscriptionBanner = () => (
-  <div
-    className={[
-      'absolute -top-7 left-0 h-8 w-full',
-      'flex items-center justify-center',
-      'bg-brand-400 text-brand-900',
-      'rounded-t-md border border-t border-l border-r border-b-0',
-    ].join(' ')}
-  >
-    <p className="text-xs">Current plan</p>
-  </div>
-)
-
-interface Props {
-  plans: any[]
-  currentPlan?: StripeProduct
-  onSelectPlan: (plan: any) => void
-}
-
-/**
- * JSX below for the mapped plans is also very similar to www/pages/pricing
- * TO DO: move to use shared components for these
- *
- * https://github.com/supabase/supabase/blob/master/www/pages/pricing/index.tsx
- */
-
-const Plans: FC<Props> = ({ plans, currentPlan, onSelectPlan }) => {
-  return (
-    <>
-      {/* Existing available plans */}
-      {plans.map((plan) => {
-        const isCurrentPlan =
-          plan.id === currentPlan?.prod_id ||
-          (plan.id === STRIPE_PRODUCT_IDS.PRO && currentPlan?.prod_id === STRIPE_PRODUCT_IDS.PRO) ||
-          (plan.id === STRIPE_PRODUCT_IDS.PRO && currentPlan?.prod_id === STRIPE_PRODUCT_IDS.PAYG)
-
-        return (
-          <div key={PRICING_META[plan.id].name} className="relative h-full">
-            {plan.id === STRIPE_PRODUCT_IDS.PRO && (
-              <div className="absolute left-0 bottom-0 h-full w-full overflow-hidden opacity-50">
-                <AnimatedGradientBackground />
-              </div>
-            )}
-            <div className="flex h-full flex-col overflow-hidden rounded border">
-              {isCurrentPlan && <CurrentSubscriptionBanner />}
-              <div className="bg-white px-6 py-6 dark:bg-scale-300">
-                <span
-                  className="text-cd inline-flex rounded-full text-base font-normal tracking-wide text-scale-1200"
-                  id="tier-standard"
-                >
-                  {PRICING_META[plan.id].name}
-                </span>
-                <div className="mt-2 flex items-baseline">
-                  <div className="flex space-x-2">
-                    {PRICING_META[plan.id].priceMonthly !== undefined ? (
-                      <>
-                        <div>
-                          {PRICING_META[plan.id].from && (
-                            <span className="text-sm font-medium text-scale-1200 mr-1">From</span>
-                          )}
-                          <span className="text-2xl">${PRICING_META[plan.id].priceMonthly}</span>
-                          <span className="text-xl font-medium text-scale-900">/mo</span>
-                        </div>
-                      </>
-                    ) : (
-                      <span className="text-2xl">Contact Us</span>
-                    )}
-                    <div className="flex h-8 -mt-[2px]">
-                      {PRICING_META[plan.id].warning && (
-                        <div className="mt-2 rounded-md bg-brand-300 bg-opacity-30 px-2 py-1 text-xs text-brand-1000">
-                          {PRICING_META[plan.id].warning}
-                        </div>
-                      )}
-                    </div>
-                  </div>
-                </div>
-                <div className="py-4">
-                  <PlanCTAButton
-                    plan={plan}
-                    currentPlan={currentPlan}
-                    onSelectPlan={onSelectPlan}
-                  />
-                </div>
-                <p className="text-sm text-scale-1100">{PRICING_META[plan.id].description}</p>
-              </div>
-              <div
-                className={[
-                  'flex-1 flex-col justify-between',
-                  'space-y-6 border-t dark:border-scale-400',
-                  'bg-scale-100 dark:bg-scale-300',
-                  'hidden h-full px-6 py-6 lg:flex',
-                ].join(' ')}
-              >
-                <div className="space-y-6">
-                  {PRICING_META[plan.id].preface && (
-                    <p className="text-sm text-scale-1200">{PRICING_META[plan.id].preface}</p>
-                  )}
-                  <ul role="list" className="divide-y dark:divide-scale-400">
-                    {PRICING_META[plan.id].features.map((feature) => (
-                      <li key={feature} className="flex py-2">
-                        <div className="w-[12px]">
-                          <IconCheck
-                            className="h-3 w-3 text-brand-900 translate-y-[2.5px]"
-                            aria-hidden="true"
-                            strokeWidth={3}
-                          />
-                        </div>
-                        <p className="mb-0 ml-3 text-xs text-scale-1100 dark:text-scale-1200">
-                          {feature}
-                        </p>
-                      </li>
-                    ))}
-                  </ul>
-                </div>
-                <div className="flex flex-col gap-6">
-                  <div className="space-y-2">
-                    {PRICING_META[plan.id].additional && (
-                      <p className="text-sm text-scale-1200">{PRICING_META[plan.id].additional}</p>
-                    )}
-                    {PRICING_META[plan.id].scale && (
-                      <p className="text-xs text-scale-900">{PRICING_META[plan.id].scale}</p>
-                    )}
-                    {PRICING_META[plan.id].shutdown && (
-                      <p className="text-xs text-scale-900">{PRICING_META[plan.id].shutdown}</p>
-                    )}
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        )
-      })}
-    </>
-  )
-}
-
-export default Plans
diff --git a/studio/components/interfaces/Billing/ProUpgrade.tsx b/studio/components/interfaces/Billing/ProUpgrade.tsx
index b4cf2635051..3789bccec3a 100644
--- a/studio/components/interfaces/Billing/ProUpgrade.tsx
+++ b/studio/components/interfaces/Billing/ProUpgrade.tsx
@@ -4,7 +4,7 @@ import { useRouter } from 'next/router'
 import * as Tooltip from '@radix-ui/react-tooltip'
 import { Button, IconHelpCircle, Toggle, Modal } from 'ui'
 
-import { useStore, useFlag } from 'hooks'
+import { useStore } from 'hooks'
 import { post, patch } from 'lib/common/fetch'
 import { API_URL, PROJECT_STATUS } from 'lib/constants'
 import { getURL } from 'lib/helpers'
@@ -50,8 +50,6 @@ const ProUpgrade: FC<Props> = ({
 }) => {
   const { app, ui } = useStore()
   const router = useRouter()
-  const isCustomDomainsEnabled = useFlag('customDomains')
-  const isPITRSelfServeEnabled = useFlag('pitrSelfServe')
 
   const [captchaToken, setCaptchaToken] = useState<string | null>(null)
   const captchaRef = useRef<HCaptcha>(null)
@@ -177,6 +175,7 @@ const ProUpgrade: FC<Props> = ({
   }
 
   const onConfirmPayment = async () => {
+    setIsSubmitting(true)
     const payload = formSubscriptionUpdatePayload(
       currentSubscription,
       selectedTier,
@@ -231,13 +230,13 @@ const ProUpgrade: FC<Props> = ({
       >
         <div className="flex-grow mt-10">
           <div className="relative space-y-4">
-            <div className="px-32 mx-auto space-y-4 2xl:min-w-5xl">
+            <div className="relative px-32 mx-auto space-y-4 2xl:max-w-5xl">
               <BackButton onClick={() => onSelectBack()} />
               <h4 className="text-lg text-scale-900 !mb-8">Change your project's subscription</h4>
             </div>
 
             <div
-              className="px-32 pb-8 mx-auto space-y-8 overflow-y-auto 2xl:min-w-5xl"
+              className="px-32 pb-8 mx-auto space-y-8 overflow-y-auto 2xl:max-w-5xl"
               style={{ height: 'calc(100vh - 9rem - 57px)' }}
             >
               <div className="space-y-2">
@@ -289,32 +288,24 @@ const ProUpgrade: FC<Props> = ({
                       <SupportPlan currentOption={currentAddons.supportPlan} />
                     </>
                   )}
-                  {isCustomDomainsEnabled && customDomainOptions.length > 0 && (
-                    <>
-                      <Divider light />
-                      <CustomDomainSelection
-                        options={customDomainOptions}
-                        currentOption={
-                          isManagingProSubscription ? currentAddons.customDomains : undefined
-                        }
-                        selectedOption={selectedAddons.customDomains}
-                        onSelectOption={setSelectedCustomDomainOption}
-                      />
-                    </>
-                  )}
-                  {isPITRSelfServeEnabled && pitrDurationOptions.length > 0 && (
-                    <>
-                      <Divider light />
-                      <PITRDurationSelection
-                        pitrDurationOptions={pitrDurationOptions}
-                        currentPitrDuration={
-                          isManagingProSubscription ? currentAddons.pitrDuration : undefined
-                        }
-                        selectedPitrDuration={selectedAddons.pitrDuration}
-                        onSelectOption={setSelectedPITRDuration}
-                      />
-                    </>
-                  )}
+                  <Divider light />
+                  <CustomDomainSelection
+                    options={customDomainOptions}
+                    currentOption={
+                      isManagingProSubscription ? currentAddons.customDomains : undefined
+                    }
+                    selectedOption={selectedAddons.customDomains}
+                    onSelectOption={setSelectedCustomDomainOption}
+                  />
+                  <Divider light />
+                  <PITRDurationSelection
+                    pitrDurationOptions={pitrDurationOptions}
+                    currentPitrDuration={
+                      isManagingProSubscription ? currentAddons.pitrDuration : undefined
+                    }
+                    selectedPitrDuration={selectedAddons.pitrDuration}
+                    onSelectOption={setSelectedPITRDuration}
+                  />
                   <Divider light />
                   <ComputeSizeSelection
                     computeSizes={computeSizes || []}
diff --git a/studio/components/interfaces/Billing/TeamUpgrade.tsx b/studio/components/interfaces/Billing/TeamUpgrade.tsx
index 7cc18e7847a..e067a403a06 100644
--- a/studio/components/interfaces/Billing/TeamUpgrade.tsx
+++ b/studio/components/interfaces/Billing/TeamUpgrade.tsx
@@ -4,7 +4,7 @@ import { useRouter } from 'next/router'
 
 import { useStore, useFlag } from 'hooks'
 import { post, patch } from 'lib/common/fetch'
-import { API_URL, PROJECT_STATUS } from 'lib/constants'
+import { API_URL, PRICING_TIER_PRODUCT_IDS, PROJECT_STATUS } from 'lib/constants'
 import { getURL } from 'lib/helpers'
 import Divider from 'components/ui/Divider'
 import {
@@ -48,8 +48,11 @@ const TeamUpgrade: FC<Props> = ({
 }) => {
   const { app, ui } = useStore()
   const router = useRouter()
-  const isCustomDomainsEnabled = useFlag('customDomains')
-  const isPITRSelfServeEnabled = useFlag('pitrSelfServe')
+
+  // Team tier is enabled when the flag is turned on OR the user is already on the team tier (manually assigned by us)
+  const userIsOnTeamTier =
+    currentSubscription?.tier?.supabase_prod_id === PRICING_TIER_PRODUCT_IDS.TEAM
+  const teamTierEnabled = userIsOnTeamTier || useFlag('teamTier')
 
   const [captchaToken, setCaptchaToken] = useState<string | null>(null)
   const captchaRef = useRef<HCaptcha>(null)
@@ -160,8 +163,6 @@ const TeamUpgrade: FC<Props> = ({
     return true
   }
 
-  const teamTierEnabled = useFlag('teamTier')
-
   const onConfirmPayment = async () => {
     if (!teamTierEnabled) {
       return ui.setNotification({
@@ -169,6 +170,7 @@ const TeamUpgrade: FC<Props> = ({
         message: 'Team Plan is not enabled yet.',
       })
     }
+    setIsSubmitting(true)
     const payload = formSubscriptionUpdatePayload(
       currentSubscription,
       selectedTier,
@@ -223,13 +225,13 @@ const TeamUpgrade: FC<Props> = ({
       >
         <div className="flex-grow mt-10">
           <div className="relative space-y-4">
-            <div className="px-32 mx-auto space-y-4 2xl:min-w-5xl">
+            <div className="px-32 mx-auto space-y-4 2xl:max-w-5xl">
               <BackButton onClick={() => onSelectBack()} />
               <h4 className="text-lg text-scale-900 !mb-8">Change your project's subscription</h4>
             </div>
 
             <div
-              className="px-32 pb-8 mx-auto space-y-8 overflow-y-auto 2xl:min-w-5xl"
+              className="px-32 pb-8 mx-auto space-y-8 overflow-y-auto 2xl:max-w-5xl"
               style={{ height: 'calc(100vh - 9rem - 57px)' }}
             >
               <div className="space-y-2">
@@ -259,32 +261,24 @@ const TeamUpgrade: FC<Props> = ({
                       <SupportPlan currentOption={currentAddons.supportPlan} />
                     </>
                   )}
-                  {isCustomDomainsEnabled && customDomainOptions.length > 0 && (
-                    <>
-                      <Divider light />
-                      <CustomDomainSelection
-                        options={customDomainOptions}
-                        currentOption={
-                          isManagingTeamSubscription ? currentAddons.customDomains : undefined
-                        }
-                        selectedOption={selectedAddons.customDomains}
-                        onSelectOption={setSelectedCustomDomainOption}
-                      />
-                    </>
-                  )}
-                  {isPITRSelfServeEnabled && pitrDurationOptions.length > 0 && (
-                    <>
-                      <Divider light />
-                      <PITRDurationSelection
-                        pitrDurationOptions={pitrDurationOptions}
-                        currentPitrDuration={
-                          isManagingTeamSubscription ? currentAddons.pitrDuration : undefined
-                        }
-                        selectedPitrDuration={selectedAddons.pitrDuration}
-                        onSelectOption={setSelectedPITRDuration}
-                      />
-                    </>
-                  )}
+                  <Divider light />
+                  <CustomDomainSelection
+                    options={customDomainOptions}
+                    currentOption={
+                      isManagingTeamSubscription ? currentAddons.customDomains : undefined
+                    }
+                    selectedOption={selectedAddons.customDomains}
+                    onSelectOption={setSelectedCustomDomainOption}
+                  />
+                  <Divider light />
+                  <PITRDurationSelection
+                    pitrDurationOptions={pitrDurationOptions}
+                    currentPitrDuration={
+                      isManagingTeamSubscription ? currentAddons.pitrDuration : undefined
+                    }
+                    selectedPitrDuration={selectedAddons.pitrDuration}
+                    onSelectOption={setSelectedPITRDuration}
+                  />
                   <Divider light />
                   <ComputeSizeSelection
                     computeSizes={computeSizes || []}
diff --git a/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx b/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx
index f8fde4ddfdb..9f569536579 100644
--- a/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx
+++ b/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx
@@ -1,6 +1,6 @@
 import { FC, useEffect, useState } from 'react'
 import { Button, Input, Form, Modal, Listbox, IconPlus, IconDatabase } from 'ui'
-import { PostgresExtension, PostgresSchema } from '@supabase/postgres-meta'
+import type { PostgresExtension, PostgresSchema } from '@supabase/postgres-meta'
 
 import { useStore } from 'hooks'
 import ShimmeringLoader from 'components/ui/ShimmeringLoader'
diff --git a/studio/components/interfaces/Database/Publications/PublicationsTableItem.tsx b/studio/components/interfaces/Database/Publications/PublicationsTableItem.tsx
index b0b60b67cf0..5c30d1f31cc 100644
--- a/studio/components/interfaces/Database/Publications/PublicationsTableItem.tsx
+++ b/studio/components/interfaces/Database/Publications/PublicationsTableItem.tsx
@@ -1,7 +1,7 @@
 import { FC, useState } from 'react'
 import { observer } from 'mobx-react-lite'
 import { Badge, Toggle } from 'ui'
-import { PostgresPublication, PostgresTable } from '@supabase/postgres-meta'
+import type { PostgresPublication, PostgresTable } from '@supabase/postgres-meta'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
 
 import { checkPermissions, useStore } from 'hooks'
diff --git a/studio/components/interfaces/Database/Publications/PublicationsTables.tsx b/studio/components/interfaces/Database/Publications/PublicationsTables.tsx
index 07ea3672d02..73d2f67bbd5 100644
--- a/studio/components/interfaces/Database/Publications/PublicationsTables.tsx
+++ b/studio/components/interfaces/Database/Publications/PublicationsTables.tsx
@@ -1,7 +1,7 @@
 import { FC, useState } from 'react'
 import { observer } from 'mobx-react-lite'
 import { Button, Input, IconChevronLeft, IconSearch, IconAlertCircle } from 'ui'
-import { PostgresPublication } from '@supabase/postgres-meta'
+import type { PostgresPublication } from '@supabase/postgres-meta'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
 
 import { checkPermissions, useStore } from 'hooks'
diff --git a/studio/components/interfaces/Database/Tables/ColumnList.tsx b/studio/components/interfaces/Database/Tables/ColumnList.tsx
index add64c1ac20..c5b668777fc 100644
--- a/studio/components/interfaces/Database/Tables/ColumnList.tsx
+++ b/studio/components/interfaces/Database/Tables/ColumnList.tsx
@@ -5,7 +5,7 @@ import { Input, Button, IconSearch, IconPlus, IconChevronLeft, IconEdit3, IconTr
 import { useStore } from 'hooks'
 import Table from 'components/to-be-cleaned/Table'
 import NoSearchResults from 'components/to-be-cleaned/NoSearchResults'
-import { PostgresTable } from '@supabase/postgres-meta'
+import type { PostgresTable } from '@supabase/postgres-meta'
 
 interface Props {
   selectedTable: PostgresTable
@@ -25,11 +25,11 @@ const ColumnList: FC<Props> = ({
   const { meta } = useStore()
   const [filterString, setFilterString] = useState<string>('')
   const columns =
-    filterString.length === 0
+    (filterString.length === 0
       ? selectedTable.columns
-      : selectedTable.columns.filter((column: any) => column.name.includes(filterString))
+      : selectedTable.columns?.filter((column: any) => column.name.includes(filterString))) ?? []
 
-  const isLocked = meta.excludedSchemas.includes(selectedTable?.schema ?? '')
+  const isLocked = meta.excludedSchemas.includes(selectedTable.schema ?? '')
 
   return (
     <>
diff --git a/studio/components/interfaces/Database/Tables/TableList.tsx b/studio/components/interfaces/Database/Tables/TableList.tsx
index 2c4b60c1acb..72efc7adee9 100644
--- a/studio/components/interfaces/Database/Tables/TableList.tsx
+++ b/studio/components/interfaces/Database/Tables/TableList.tsx
@@ -10,6 +10,7 @@ import {
   IconColumns,
   Listbox,
   IconLock,
+  IconCheck,
 } from 'ui'
 
 import { partition } from 'lodash'
@@ -17,7 +18,7 @@ import { partition } from 'lodash'
 import { useStore } from 'hooks'
 import Table from 'components/to-be-cleaned/Table'
 import NoSearchResults from 'components/to-be-cleaned/NoSearchResults'
-import { PostgresTable, PostgresSchema } from '@supabase/postgres-meta'
+import type { PostgresTable, PostgresSchema } from '@supabase/postgres-meta'
 
 interface Props {
   selectedSchema: string
@@ -54,6 +55,10 @@ const TableList: FC<Props> = ({
       : // @ts-ignore
         allTables.filter((table: PostgresTable) => table.name.includes(filterString))
 
+  const publications = meta.publications.list()
+  const realtimePublication = publications.find(
+    (publication) => publication.name === 'supabase_realtime'
+  )
   // @ts-ignore
   const schema = schemas.find((schema) => schema.name === selectedSchema)
   const isLocked = protectedSchemas.some((s) => s.id === schema?.id)
@@ -67,7 +72,7 @@ const TableList: FC<Props> = ({
               size="small"
               value={selectedSchema}
               onChange={onSelectSchema}
-              icon={isLocked && <IconLock size={16} strokeWidth={2} />}
+              icon={isLocked && <IconLock size={14} strokeWidth={2} />}
             >
               <Listbox.Option disabled key="normal-schemas" value="normal-schemas" label="Schemas">
                 <p className="text-sm">Schemas</p>
@@ -137,6 +142,9 @@ const TableList: FC<Props> = ({
               <Table.th key="size" className="hidden xl:table-cell">
                 Size (Estimated)
               </Table.th>,
+              <Table.th key="realtime" className="hidden xl:table-cell text-center">
+                Realtime Enabled
+              </Table.th>,
               <Table.th key="buttons"></Table.th>,
             ]}
             body={tables.map((x: any, i: any) => (
@@ -157,6 +165,13 @@ const TableList: FC<Props> = ({
                 <Table.td className="hidden xl:table-cell">
                   <code className="text-sm">{x.size}</code>
                 </Table.td>
+                <Table.td className="hidden xl:table-cell text-center">
+                  {realtimePublication.tables.find((table: any) => table.id === x.id) && (
+                    <div className="flex justify-center">
+                      <IconCheck strokeWidth={2} />
+                    </div>
+                  )}
+                </Table.td>
                 <Table.td>
                   <div className="flex justify-end gap-2">
                     <Button
diff --git a/studio/components/interfaces/Docs/RpcContent.tsx b/studio/components/interfaces/Docs/RpcContent.tsx
index 9711e34c2ed..dc0c1b85466 100644
--- a/studio/components/interfaces/Docs/RpcContent.tsx
+++ b/studio/components/interfaces/Docs/RpcContent.tsx
@@ -42,6 +42,7 @@ const RpcContent = ({
 
       <div className="doc-section">
         <article className="text ">
+          <label className="font-mono text-xs uppercase text-scale-900">Description</label>
           <Description content={summary} metadata={{ rpc: rpcId }} onChange={refreshDocs} />
         </article>
         <article className="code">
diff --git a/studio/components/interfaces/Functions/TerminalInstructions.tsx b/studio/components/interfaces/Functions/TerminalInstructions.tsx
index 00449fa46a8..dbb81db4061 100644
--- a/studio/components/interfaces/Functions/TerminalInstructions.tsx
+++ b/studio/components/interfaces/Functions/TerminalInstructions.tsx
@@ -1,6 +1,6 @@
 import { useRouter } from 'next/router'
 import { Button, IconTerminal, IconMaximize2, IconMinimize2, IconBookOpen, IconCode } from 'ui'
-import { useProjectSettings } from 'hooks'
+import { useProjectSettingsQuery } from 'data/config/project-settings-query'
 import { useAccessTokens } from 'hooks/queries/useAccessTokens'
 import { Commands } from './Functions.types'
 import CommandRender from 'components/interfaces/Functions/CommandRender'
@@ -18,17 +18,17 @@ const TerminalInstructions: FC<Props> = ({ closable = false }) => {
   const { ui } = useStore()
 
   const { tokens } = useAccessTokens()
-  const { services } = useProjectSettings(ref as string | undefined)
+  const { data: settings } = useProjectSettingsQuery({ projectRef: ref as string })
 
   const [showInstructions, setShowInstructions] = useState(!closable)
 
   // Get the API service
-  const API_SERVICE_ID = 1
-  const apiService = (services ?? []).find((x: any) => x.app.id == API_SERVICE_ID)
-  const apiKeys = apiService?.service_api_keys ?? []
-  const anonKey = apiKeys.find((x: any) => x.name === 'anon key')?.api_key
+  const apiService = settings?.autoApiService
+  const anonKey = apiService?.service_api_keys.find((x: any) => x.name === 'anon key')
+    ? apiService.defaultApiKey
+    : undefined
 
-  const endpoint = apiService?.app_config.endpoint ?? ''
+  const endpoint = apiService?.endpoint ?? ''
   const endpointSections = endpoint.split('.')
   const functionsEndpoint = [
     ...endpointSections.slice(0, 1),
diff --git a/studio/components/interfaces/Home/NewProjectPanel/APIKeys.tsx b/studio/components/interfaces/Home/NewProjectPanel/APIKeys.tsx
index ac11e16bd6f..20b89d4cce5 100644
--- a/studio/components/interfaces/Home/NewProjectPanel/APIKeys.tsx
+++ b/studio/components/interfaces/Home/NewProjectPanel/APIKeys.tsx
@@ -5,9 +5,8 @@ import { Input, IconLoader, IconAlertCircle } from 'ui'
 import { JwtSecretUpdateStatus } from '@supabase/shared-types/out/events'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
 
-import { checkPermissions, useJwtSecretUpdateStatus, useProjectSettings } from 'hooks'
-import { DEFAULT_PROJECT_API_SERVICE_ID, IS_PLATFORM } from 'lib/constants'
-import { PROJECT_ENDPOINT_PROTOCOL } from 'pages/api/constants'
+import { useProjectSettingsQuery } from 'data/config/project-settings-query'
+import { checkPermissions, useJwtSecretUpdateStatus } from 'hooks'
 import Snippets from 'components/to-be-cleaned/Docs/Snippets'
 import Panel from 'components/ui/Panel'
 import SimpleCodeBlock from 'components/to-be-cleaned/SimpleCodeBlock'
@@ -23,10 +22,10 @@ const APIKeys = () => {
   const [selectedLanguage, setSelectedLanguage] = useState(availableLanguages[0])
 
   const {
-    services,
+    data: settings,
     isError: isProjectSettingsError,
     isLoading: isProjectSettingsLoading,
-  } = useProjectSettings(ref as string | undefined)
+  } = useProjectSettingsQuery({ projectRef: ref as string })
 
   const {
     jwtSecretUpdateStatus,
@@ -37,8 +36,7 @@ const APIKeys = () => {
   const canReadAPIKeys = checkPermissions(PermissionAction.READ, 'service_api_keys')
 
   // Get the API service
-  const apiService = (services ?? []).find((x: any) => x.app.id == DEFAULT_PROJECT_API_SERVICE_ID)
-  const apiConfig = apiService?.app_config ?? {}
+  const apiService = settings?.autoApiService
   const apiKeys = apiService?.service_api_keys ?? []
 
   // API keys should not be empty. However it can be populated with a delay on project creation
@@ -46,7 +44,7 @@ const APIKeys = () => {
   const isNotUpdatingJwtSecret =
     jwtSecretUpdateStatus === undefined || jwtSecretUpdateStatus === JwtSecretUpdateStatus.Updated
 
-  const apiUrl = `${IS_PLATFORM ? 'https' : PROJECT_ENDPOINT_PROTOCOL}://${apiConfig.endpoint}`
+  const apiUrl = `${apiService?.protocol ?? 'https'}://${apiService?.endpoint ?? '-'}`
   const anonKey = apiKeys.find((key: any) => key.tags === 'anon')
 
   const clientInitSnippet: any = Snippets.init(apiUrl)
@@ -111,7 +109,7 @@ const APIKeys = () => {
                 <div className="space-y-2">
                   <p className="text-sm">API Key</p>
                   <div className="flex items-center space-x-1 -ml-1">
-                    {anonKey.tags?.split(',').map((x: any, i: number) => (
+                    {anonKey?.tags?.split(',').map((x: any, i: number) => (
                       <code key={`${x}${i}`} className="text-xs">
                         {x}
                       </code>
@@ -121,7 +119,7 @@ const APIKeys = () => {
                 </div>
               }
               copy={canReadAPIKeys && isNotUpdatingJwtSecret}
-              reveal={anonKey.tags !== 'anon' && canReadAPIKeys && isNotUpdatingJwtSecret}
+              reveal={anonKey?.tags !== 'anon' && canReadAPIKeys && isNotUpdatingJwtSecret}
               value={
                 !canReadAPIKeys
                   ? 'You need additional permissions to view API keys'
@@ -129,7 +127,7 @@ const APIKeys = () => {
                   ? 'JWT secret update failed, new API key may have issues'
                   : jwtSecretUpdateStatus === JwtSecretUpdateStatus.Updating
                   ? 'Updating JWT secret...'
-                  : anonKey.api_key
+                  : apiService?.defaultApiKey
               }
               onChange={() => {}}
               descriptionText={
diff --git a/studio/components/interfaces/Home/ProjectList/ProjectList.tsx b/studio/components/interfaces/Home/ProjectList/ProjectList.tsx
index 32472e694b4..1199e598a24 100644
--- a/studio/components/interfaces/Home/ProjectList/ProjectList.tsx
+++ b/studio/components/interfaces/Home/ProjectList/ProjectList.tsx
@@ -1,6 +1,6 @@
+import Link from 'next/link'
 import { FC } from 'react'
 import { Button, IconPlus } from 'ui'
-import { useRouter } from 'next/router'
 import { observer } from 'mobx-react-lite'
 
 import { IS_PLATFORM } from 'lib/constants'
@@ -16,7 +16,6 @@ interface Props {
 }
 
 const ProjectList: FC<Props> = ({ rewriteHref }) => {
-  const router = useRouter()
   const { app, ui } = useStore()
   const { organizations, projects } = app
   const { isLoading: isLoadingProjects } = projects
@@ -44,7 +43,7 @@ const ProjectList: FC<Props> = ({ rewriteHref }) => {
             ) : (
               <ul className="mx-auto grid grid-cols-1 gap-4 sm:grid-cols-1 md:grid-cols-1 lg:grid-cols-2 xl:grid-cols-3">
                 {!canReadProjects ? (
-                  <div className="col-span-4 max-w-4xl space-y-4 rounded-lg border-2 border-dashed border-gray-300 py-8 px-6 text-center">
+                  <div className="col-span-4 space-y-4 rounded-lg border-2 border-dashed border-gray-300 py-8 px-6 text-center">
                     <div className="space-y-1">
                       <p>You need additional permissions to view projects from this organization</p>
                       <p className="text-sm text-scale-1100">
@@ -53,7 +52,7 @@ const ProjectList: FC<Props> = ({ rewriteHref }) => {
                     </div>
                   </div>
                 ) : isEmpty ? (
-                  <div className="col-span-4 max-w-4xl space-y-4 rounded-lg border-2 border-dashed border-gray-300 p-6 text-center">
+                  <div className="col-span-4 space-y-4 rounded-lg border-2 border-dashed border-gray-300 p-6 text-center">
                     <div className="space-y-1">
                       <p>No projects</p>
                       <p className="text-sm text-scale-1100">
@@ -61,9 +60,11 @@ const ProjectList: FC<Props> = ({ rewriteHref }) => {
                       </p>
                     </div>
                     <div>
-                      <Button onClick={() => router.push(`/new/${slug}`)} icon={<IconPlus />}>
-                        New Project
-                      </Button>
+                      <Link href={`/new/${slug}`}>
+                        <a>
+                          <Button icon={<IconPlus />}>New Project</Button>
+                        </a>
+                      </Link>
                     </div>
                   </div>
                 ) : (
diff --git a/studio/components/interfaces/SQLEditor/SQLEditor.constants.ts b/studio/components/interfaces/SQLEditor/SQLEditor.constants.ts
index de1990ca96b..2483efe39da 100644
--- a/studio/components/interfaces/SQLEditor/SQLEditor.constants.ts
+++ b/studio/components/interfaces/SQLEditor/SQLEditor.constants.ts
@@ -613,10 +613,8 @@ values
     sql: `
 --
 -- For use with:
--- https://github.com/supabase/supabase/tree/master/examples/todo-list/nextjs-todo-list or
--- https://github.com/supabase/supabase/tree/master/examples/todo-list/react-todo-list or
 -- https://github.com/supabase/supabase/tree/master/examples/todo-list/sveltejs-todo-list or
--- https://github.com/supabase/supabase/tree/master/examples/todo-list/vue3-ts-todo-list
+-- https://github.com/supabase/examples-archive/tree/main/supabase-js-v1/todo-list
 --
 
 create table todos (
diff --git a/studio/components/interfaces/Settings/API/ServiceList.tsx b/studio/components/interfaces/Settings/API/ServiceList.tsx
index ce2097d0b03..3edef681a27 100644
--- a/studio/components/interfaces/Settings/API/ServiceList.tsx
+++ b/studio/components/interfaces/Settings/API/ServiceList.tsx
@@ -3,18 +3,15 @@ import { useRouter } from 'next/router'
 import { JwtSecretUpdateError, JwtSecretUpdateStatus } from '@supabase/shared-types/out/events'
 import { IconAlertCircle, Input } from 'ui'
 
-import {
-  useStore,
-  useProjectSettings,
-  useProjectPostgrestConfig,
-  useJwtSecretUpdateStatus,
-} from 'hooks'
+import { configKeys } from 'data/config/keys'
+import { useQueryClient } from '@tanstack/react-query'
+import { useProjectSettingsQuery } from 'data/config/project-settings-query'
+import { useStore, useProjectPostgrestConfig, useJwtSecretUpdateStatus } from 'hooks'
 
 import Panel from 'components/ui/Panel'
 import PostgrestConfig from './PostgrestConfig'
 import { DisplayApiSettings } from 'components/ui/ProjectSettings'
 import { JWT_SECRET_UPDATE_ERROR_MESSAGES } from './API.constants'
-import { PROJECT_ENDPOINT_PROTOCOL } from 'pages/api/constants'
 import { IS_PLATFORM } from 'lib/constants'
 import JWTSettings from './JWTSettings'
 
@@ -26,8 +23,9 @@ const ServiceList: FC<Props> = ({ projectRef }) => {
   const { ui } = useStore()
   const router = useRouter()
   const { ref } = router.query
+  const queryClient = useQueryClient()
 
-  const { services, isError, mutateSettings } = useProjectSettings(ref as string | undefined)
+  const { data: settings, isError } = useProjectSettingsQuery({ projectRef: ref as string })
   const { mutateConfig } = useProjectPostgrestConfig(ref as string | undefined)
   const { jwtSecretUpdateError, jwtSecretUpdateStatus }: any = useJwtSecretUpdateStatus(ref)
 
@@ -41,7 +39,7 @@ const ServiceList: FC<Props> = ({ projectRef }) => {
       switch (jwtSecretUpdateStatus) {
         case Updated:
           mutateConfig()
-          mutateSettings()
+          queryClient.invalidateQueries({ queryKey: configKeys.settings(projectRef) })
           ui.setNotification({ category: 'success', message: 'Successfully updated JWT secret' })
           break
         case Failed:
@@ -57,9 +55,8 @@ const ServiceList: FC<Props> = ({ projectRef }) => {
   }, [jwtSecretUpdateStatus])
 
   // Get the API service
-  const API_SERVICE_ID = 1
-  const apiService = services ? services.find((x: any) => x.app.id == API_SERVICE_ID) : {}
-  const apiConfig = apiService?.app_config
+  const apiService = settings?.autoApiService
+  const apiUrl = `${apiService?.protocol ?? 'https'}://${apiService?.endpoint ?? '-'}`
 
   return (
     <div>
@@ -79,9 +76,7 @@ const ServiceList: FC<Props> = ({ projectRef }) => {
                 readOnly
                 disabled
                 className="input-mono"
-                value={`${IS_PLATFORM ? 'https' : PROJECT_ENDPOINT_PROTOCOL}://${
-                  apiConfig?.endpoint ?? '-'
-                }`}
+                value={apiUrl}
                 descriptionText="A RESTful endpoint for querying and managing your database."
                 layout="horizontal"
               />
diff --git a/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainActivate.tsx b/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainActivate.tsx
index ddac4535323..24aeba26cf4 100644
--- a/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainActivate.tsx
+++ b/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainActivate.tsx
@@ -89,6 +89,7 @@ const CustomDomainActivate = ({ projectRef, customDomain }: CustomDomainActivate
                 type="default"
                 onClick={onCancelCustomDomain}
                 loading={isDeleting}
+                disabled={isDeleting}
                 className="self-end"
               >
                 Cancel
@@ -110,6 +111,7 @@ const CustomDomainActivate = ({ projectRef, customDomain }: CustomDomainActivate
                     />
                   </svg>
                 }
+                disabled={isDeleting}
                 onClick={() => setIsActivateConfirmModalVisible(true)}
                 className="self-end"
               >
diff --git a/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainConfig.tsx b/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainConfig.tsx
index be80c2ac9d8..c011709dceb 100644
--- a/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainConfig.tsx
+++ b/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainConfig.tsx
@@ -37,7 +37,7 @@ const CustomDomainConfig = () => {
     <section>
       <FormHeader title="Custom Domains" description="Present a branded experience to your users" />
       {data?.status === '0_no_hostname_configured' ? (
-        <CustomDomainsConfigureHostname projectRef={ref} />
+        <CustomDomainsConfigureHostname />
       ) : (
         <Panel>
           {isLoading && (
diff --git a/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainVerify.tsx b/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainVerify.tsx
index ab3a0664e3d..1314aaa2e03 100644
--- a/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainVerify.tsx
+++ b/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainVerify.tsx
@@ -56,11 +56,11 @@ const CustomDomainVerify = ({ projectRef, customDomain, settings }: CustomDomain
       <Panel.Content className="space-y-6">
         <div>
           <h4 className="text-scale-1200 mb-2">
-            Successfully added your custom domain{' '}
+            Configure TXT verification for your custom domain{' '}
             <code className="text-sm">{customDomain.hostname}</code>
           </h4>
           <p className="text-sm text-scale-1100">
-            Set the following record(s) in your DNS provider, then click verify to confirm your
+            Set the following TXT record(s) in your DNS provider, then click verify to confirm your
             control over the domain
           </p>
           <p className="text-sm text-scale-1100">
@@ -134,7 +134,7 @@ const CustomDomainVerify = ({ projectRef, customDomain, settings }: CustomDomain
             <DNSRecord
               type="CNAME"
               name={customDomain.hostname}
-              value={settings?.autoApiService.app_config.endpoint ?? 'Loading...'}
+              value={settings?.autoApiService.endpoint ?? 'Loading...'}
             />
           )}
 
@@ -163,6 +163,16 @@ const CustomDomainVerify = ({ projectRef, customDomain, settings }: CustomDomain
             </div>
           )}
         </div>
+        <div className="!mt-4">
+          <p className="text-sm text-scale-1000">
+            One of the records requires you to replace the CNAME record set up in the first step
+            with a TXT record.
+          </p>
+          <p className="text-sm text-scale-1000">
+            You'll be able to restore it back to the CNAME after the verification process has been
+            completed.
+          </p>
+        </div>
       </Panel.Content>
 
       <div className="border-t border-scale-400" />
@@ -181,6 +191,7 @@ const CustomDomainVerify = ({ projectRef, customDomain, settings }: CustomDomain
               type="default"
               onClick={onCancelCustomDomain}
               loading={isDeleting}
+              disabled={isDeleting || isReverifyLoading}
               className="self-end"
             >
               Cancel
@@ -189,6 +200,7 @@ const CustomDomainVerify = ({ projectRef, customDomain, settings }: CustomDomain
               icon={<IconRefreshCw />}
               onClick={onReverifyCustomDomain}
               loading={isReverifyLoading}
+              disabled={isDeleting || isReverifyLoading}
               className="self-end"
             >
               Verify
diff --git a/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainsConfigureHostname.tsx b/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainsConfigureHostname.tsx
index 5fa62056d20..1bf16aaff92 100644
--- a/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainsConfigureHostname.tsx
+++ b/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainsConfigureHostname.tsx
@@ -1,10 +1,10 @@
 import Link from 'next/link'
 import * as yup from 'yup'
-import { Button, Form, IconExternalLink, Input } from 'ui'
 import { observer } from 'mobx-react-lite'
+import { Button, Form, IconExternalLink, Input } from 'ui'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
 
-import { checkPermissions, useStore } from 'hooks'
+import { checkPermissions, useParams, useStore } from 'hooks'
 import {
   FormActions,
   FormPanel,
@@ -12,32 +12,46 @@ import {
   FormSectionContent,
   FormSectionLabel,
 } from 'components/ui/Forms'
+import { useProjectSettingsQuery } from 'data/config/project-settings-query'
 import { useCustomDomainCreateMutation } from 'data/custom-domains/custom-domains-create-mutation'
 
-const FORM_ID = 'custom-domains-form'
-
 const schema = yup.object({
   domain: yup.string().required('A value for your custom domain is required'),
 })
 
-export type CustomDomainsConfigureHostnameProps = {
-  projectRef?: string
-}
-
-const CustomDomainsConfigureHostname = ({ projectRef }: CustomDomainsConfigureHostnameProps) => {
+const CustomDomainsConfigureHostname = () => {
   const { ui } = useStore()
-
-  const canConfigureCustomDomain = checkPermissions(PermissionAction.UPDATE, 'projects')
+  const { ref } = useParams()
   const { mutateAsync: createCustomDomain } = useCustomDomainCreateMutation()
+  const { data: settings } = useProjectSettingsQuery({ projectRef: ref })
+
+  const FORM_ID = 'custom-domains-form'
+  const endpoint = settings?.autoApiService.endpoint
+  const canConfigureCustomDomain = checkPermissions(PermissionAction.UPDATE, 'projects')
+
+  const verifyCNAME = async (domain: string): Promise<boolean> => {
+    const res = await fetch(`https://1.1.1.1/dns-query?name=${domain}`, {
+      method: 'GET',
+      headers: { accept: 'application/dns-json' },
+    })
+    const verification = await res.json()
+    return verification.Status === 0
+  }
 
   const onCreateCustomDomain = async (values: yup.InferType<typeof schema>) => {
-    if (!projectRef) {
-      throw new Error('Project ref is required')
+    if (!ref) throw new Error('Project ref is required')
+
+    const cnameVerified = await verifyCNAME(values.domain)
+    if (!cnameVerified) {
+      return ui.setNotification({
+        category: 'error',
+        message: `Your CNAME record for ${values.domain} cannot be found - if you've just added the CNAME record, do check back in a bit.`,
+      })
     }
 
     try {
       await createCustomDomain({
-        projectRef,
+        projectRef: ref,
         customDomain: values.domain,
       })
     } catch (error: any) {
@@ -100,6 +114,23 @@ const CustomDomainsConfigureHostname = ({ projectRef }: CustomDomainsConfigureHo
                   />
                 </FormSectionContent>
               </FormSection>
+              <FormSection header={<FormSectionLabel>Configure a CNAME record</FormSectionLabel>}>
+                <p className="col-span-12 text-sm lg:col-span-7 leading-6">
+                  Set up a CNAME record for{' '}
+                  {values.domain ? (
+                    <code className="text-xs">{values.domain}</code>
+                  ) : (
+                    'your custom domain'
+                  )}
+                  , resolving to{' '}
+                  {endpoint ? (
+                    <code className="text-xs">{endpoint}</code>
+                  ) : (
+                    "your project's API URL"
+                  )}
+                  , with as low a TTL as possible.
+                </p>
+              </FormSection>
             </FormPanel>
           </>
         )
diff --git a/studio/components/interfaces/Settings/General/Infrastructure/PauseProjectButton.tsx b/studio/components/interfaces/Settings/General/Infrastructure/PauseProjectButton.tsx
index 4923bfcb441..9c198671b9e 100644
--- a/studio/components/interfaces/Settings/General/Infrastructure/PauseProjectButton.tsx
+++ b/studio/components/interfaces/Settings/General/Infrastructure/PauseProjectButton.tsx
@@ -24,6 +24,7 @@ const PauseProjectButton: FC<Props> = observer(({ projectRef, projectId }) => {
   const openModal = () => setIsModalOpen(true)
   const closeModal = () => setIsModalOpen(false)
 
+  const isPaused = ui?.selectedProject?.status === PROJECT_STATUS.INACTIVE
   const canPauseProject = checkPermissions(
     PermissionAction.INFRA_EXECUTE,
     'queue_jobs.projects.pause'
@@ -66,12 +67,24 @@ const PauseProjectButton: FC<Props> = observer(({ projectRef, projectId }) => {
             icon={<IconPause />}
             onClick={openModal}
             loading={loading}
-            disabled={!canPauseProject}
+            disabled={isPaused || !canPauseProject}
           >
             Pause Project
           </Button>
         </Tooltip.Trigger>
-        {!canPauseProject && (
+        {isPaused ? (
+          <Tooltip.Content side="bottom">
+            <Tooltip.Arrow className="radix-tooltip-arrow" />
+            <div
+              className={[
+                'rounded bg-scale-100 py-1 px-2 leading-none shadow', // background
+                'border border-scale-200 ', //border
+              ].join(' ')}
+            >
+              <span className="text-xs text-scale-1200">Your project is already paused</span>
+            </div>
+          </Tooltip.Content>
+        ) : !canPauseProject ? (
           <Tooltip.Content side="bottom">
             <Tooltip.Arrow className="radix-tooltip-arrow" />
             <div
@@ -85,6 +98,8 @@ const PauseProjectButton: FC<Props> = observer(({ projectRef, projectId }) => {
               </span>
             </div>
           </Tooltip.Content>
+        ) : (
+          <></>
         )}
       </Tooltip.Root>
       <ConfirmModal
diff --git a/studio/components/interfaces/Settings/Logs/Logs.constants.ts b/studio/components/interfaces/Settings/Logs/Logs.constants.ts
index 1ca035dd57f..97a3ab2dead 100644
--- a/studio/components/interfaces/Settings/Logs/Logs.constants.ts
+++ b/studio/components/interfaces/Settings/Logs/Logs.constants.ts
@@ -250,6 +250,7 @@ export const SQL_FILTER_TEMPLATES: any = {
     'severity.log': `metadata.level = 'log'`,
     'severity.info': `metadata.level = 'info'`,
     'severity.debug': `metadata.level = 'debug'`,
+    'severity.warn': `metadata.level = 'warn'`,
   },
   auth_logs: {
     ..._SQL_FILTER_COMMON,
@@ -473,22 +474,27 @@ export const FILTER_OPTIONS: FilterTableSet = {
         {
           key: 'error',
           label: 'Error',
-          description: 'Show all events that have error severity',
+          description: 'Show all events that are "error" severity',
+        },
+        {
+          key: 'warn',
+          label: 'Warning',
+          description: 'Show all events that are "warn" severity',
         },
         {
           key: 'info',
           label: 'Info',
-          description: 'Show all events that have error severity',
+          description: 'Show all events that are "info" severity',
         },
         {
           key: 'debug',
           label: 'Debug',
-          description: 'Show all events that have error severity',
+          description: 'Show all events that are "debug" severity',
         },
         {
           key: 'log',
           label: 'Log',
-          description: 'Show all events that are log severity',
+          description: 'Show all events that are "log" severity',
         },
       ],
     },
diff --git a/studio/components/interfaces/Settings/ProjectUsageBars/ProjectUsageBars.tsx b/studio/components/interfaces/Settings/ProjectUsageBars/ProjectUsageBars.tsx
index a282bae88e9..bd1a306c5f9 100644
--- a/studio/components/interfaces/Settings/ProjectUsageBars/ProjectUsageBars.tsx
+++ b/studio/components/interfaces/Settings/ProjectUsageBars/ProjectUsageBars.tsx
@@ -1,5 +1,5 @@
 import { FC, useEffect } from 'react'
-import { Badge, Button, IconAlertCircle, Loading } from 'ui'
+import { Badge, Button, IconAlertCircle, IconInfo, Loading } from 'ui'
 
 import { useStore, useProjectUsage } from 'hooks'
 import { formatBytes } from 'lib/helpers'
@@ -9,6 +9,7 @@ import ShimmeringLoader from 'components/ui/ShimmeringLoader'
 import InformationBox from 'components/ui/InformationBox'
 import { USAGE_BASED_PRODUCTS } from 'components/interfaces/Billing/Billing.constants'
 import { useRouter } from 'next/router'
+import * as Tooltip from '@radix-ui/react-tooltip'
 
 interface Props {
   projectRef?: string
@@ -176,6 +177,28 @@ const ProjectUsage: FC<Props> = ({ projectRef }) => {
                           >
                             <td className="whitespace-nowrap px-6 py-3 text-sm text-scale-1200">
                               {feature.title}
+                              {feature.tooltip && (
+                                <Tooltip.Root delayDuration={0}>
+                                  <Tooltip.Trigger>
+                                    <IconInfo className="ml-2" size={14} strokeWidth={2} />
+                                  </Tooltip.Trigger>
+                                  <Tooltip.Content side="bottom">
+                                    <Tooltip.Arrow className="radix-tooltip-arrow" />
+                                    <div
+                                      className={[
+                                        'max-w-md', // size
+                                        'flex items-center justify-center',
+                                        'rounded bg-scale-100 py-1 px-2 leading-none shadow', // background
+                                        'border border-scale-200', //border
+                                      ].join(' ')}
+                                    >
+                                      <span className="text-xs text-center text-scale-1200">
+                                        {feature.tooltip}
+                                      </span>
+                                    </div>
+                                  </Tooltip.Content>
+                                </Tooltip.Root>
+                              )}
                             </td>
                             {ui.selectedProject?.subscription_tier !== undefined && (
                               <>
diff --git a/studio/components/interfaces/SignIn/SignInSSOForm.tsx b/studio/components/interfaces/SignIn/SignInSSOForm.tsx
index dbf67ccb353..cd70112b6b6 100644
--- a/studio/components/interfaces/SignIn/SignInSSOForm.tsx
+++ b/studio/components/interfaces/SignIn/SignInSSOForm.tsx
@@ -1,6 +1,6 @@
 import HCaptcha from '@hcaptcha/react-hcaptcha'
 import { useStore } from 'hooks'
-import { auth } from 'lib/gotrue'
+import { auth, getReturnToPath } from 'lib/gotrue'
 import { useRef, useState } from 'react'
 import { useSWRConfig } from 'swr'
 import { Button, Form, Input } from 'ui'
@@ -31,7 +31,14 @@ const SignInSSOForm = () => {
 
     const { data, error } = await auth.signInWithSSO({
       domain: email.split('@')[1],
-      options: { captchaToken: token ?? undefined },
+      options: {
+        captchaToken: token ?? undefined,
+        redirectTo: `${
+          process.env.NEXT_PUBLIC_VERCEL_ENV === 'preview'
+            ? process.env.NEXT_PUBLIC_VERCEL_URL
+            : process.env.NEXT_PUBLIC_SITE_URL
+        }${getReturnToPath()}`,
+      },
     })
 
     if (!error) {
diff --git a/studio/components/interfaces/Support/BestPracticesGuidance.tsx b/studio/components/interfaces/Support/BestPracticesGuidance.tsx
deleted file mode 100644
index 01a665cf862..00000000000
--- a/studio/components/interfaces/Support/BestPracticesGuidance.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import { FC } from 'react'
-import Image from 'next/image'
-import SVG from 'react-inlinesvg'
-import { Button, IconMessageCircle } from 'ui'
-
-interface Props {}
-
-const BestPracticesGuidance: FC<Props> = ({}) => {
-  return (
-    <div className="px-6 space-y-4">
-      <div className="space-y-2">
-        <p>Tap into the community</p>
-        <p className="text-sm text-scale-1100">
-          Find the answers you need with fellow developers building with Supabase by joining our
-          GitHub discussions or on Discord - build the next best thing together.
-        </p>
-      </div>
-      <div className="flex items-center space-x-4">
-        <div
-          className="relative space-y-2 overflow-hidden rounded px-5 py-4 w-1/2 pb-20 shadow-md"
-          style={{ background: '#404EED' }}
-        >
-          <a
-            href="https://discord.supabase.com"
-            target="_blank"
-            className="dark block cursor-pointer"
-          >
-            <Image
-              className="absolute left-0 top-0 opacity-50"
-              src={'/img/support/discord-bg-small.jpg'}
-              layout="fill"
-              objectFit="cover"
-              alt="discord illustration header"
-            />
-            <Button
-              type="secondary"
-              icon={<SVG src={`/img/discord-icon.svg`} className="h-4 w-4" />}
-            >
-              <span style={{ color: '#404EED' }}>Join Discord server</span>
-            </Button>
-          </a>
-        </div>
-
-        <div className="relative space-y-2 overflow-hidden rounded px-5 py-4 w-1/2 pb-20 shadow-md">
-          <a
-            href="https://github.com/supabase/supabase/discussions"
-            target="_blank"
-            className="block cursor-pointer"
-          >
-            <Image
-              className="absolute left-0 top-0 opacity-50"
-              src={'/img/support/github-bg.jpg?v-1'}
-              layout="fill"
-              objectFit="cover"
-              alt="discord illustration header"
-            />
-            <Button type="secondary" icon={<IconMessageCircle />}>
-              GitHub Discussions
-            </Button>
-          </a>
-        </div>
-      </div>
-    </div>
-  )
-}
-
-export default BestPracticesGuidance
diff --git a/studio/components/interfaces/Support/Success.tsx b/studio/components/interfaces/Support/Success.tsx
index 32401ffe5f4..0293f7283a0 100644
--- a/studio/components/interfaces/Support/Success.tsx
+++ b/studio/components/interfaces/Support/Success.tsx
@@ -9,13 +9,8 @@ interface Props {
   sentCategory?: string
 }
 
-const Success: FC<Props> = ({ sentCategory = 'Best_practices' }) => {
-  const categoriesToShowAdditionalResources = [
-    'Problem',
-    'Unresponsive',
-    'Best_practices',
-    'Performance',
-  ]
+const Success: FC<Props> = ({ sentCategory = '' }) => {
+  const categoriesToShowAdditionalResources = ['Problem', 'Unresponsive', 'Performance']
 
   const selectedCategory = CATEGORY_OPTIONS.find((option) => option.value === sentCategory)
   const [searchValue, setSearchValue] = useState<string>(selectedCategory?.query ?? '')
diff --git a/studio/components/interfaces/Support/Support.constants.ts b/studio/components/interfaces/Support/Support.constants.ts
index 60e60efcfa2..7eae68facef 100644
--- a/studio/components/interfaces/Support/Support.constants.ts
+++ b/studio/components/interfaces/Support/Support.constants.ts
@@ -11,12 +11,6 @@ export const CATEGORY_OPTIONS = [
     description: 'Issues with connecting to your database',
     query: 'Unable to connect',
   },
-  {
-    value: 'Best_practices',
-    label: 'Questions on best practices',
-    description: 'Enquire on how best practices developing with Supabase',
-    query: 'Best practices',
-  },
   {
     value: 'Performance',
     label: 'Performance issues',
diff --git a/studio/components/interfaces/Support/SupportForm.tsx b/studio/components/interfaces/Support/SupportForm.tsx
index 5b910242968..c6b69ba3084 100644
--- a/studio/components/interfaces/Support/SupportForm.tsx
+++ b/studio/components/interfaces/Support/SupportForm.tsx
@@ -26,7 +26,6 @@ import MultiSelect from 'components/ui/MultiSelect'
 import { formatMessage, uploadAttachments } from './SupportForm.utils'
 import { CATEGORY_OPTIONS, SEVERITY_OPTIONS, SERVICE_OPTIONS } from './Support.constants'
 import DisabledStateForFreeTier from './DisabledStateForFreeTier'
-import BestPracticesGuidance from './BestPracticesGuidance'
 import InformationBox from 'components/ui/InformationBox'
 import Link from 'next/link'
 
@@ -198,7 +197,7 @@ const SupportForm: FC<Props> = ({ setSentCategory }) => {
         const isDisabled =
           !enableFreeSupport &&
           isFreeProject &&
-          ['Performance', 'Problem', 'Best-practice'].includes(values.category)
+          ['Performance', 'Problem'].includes(values.category)
 
         useEffect(() => {
           if (selectedProject && !selectedProject.subscription_tier) {
@@ -327,13 +326,6 @@ const SupportForm: FC<Props> = ({ setSentCategory }) => {
               </>
             )} */}
 
-            {values.category === 'Best_practices' && (
-              <>
-                <BestPracticesGuidance />
-                <Divider light />
-              </>
-            )}
-
             {!isDisabled ? (
               <>
                 <div className="px-6">
@@ -526,7 +518,7 @@ const SupportForm: FC<Props> = ({ setSentCategory }) => {
                   </div>
                 </div>
               </>
-            ) : ['Problem', 'Best_practices', 'Performance'].includes(values.category) ? (
+            ) : ['Problem', 'Performance'].includes(values.category) ? (
               <DisabledStateForFreeTier
                 category={selectedCategory?.label ?? ''}
                 projectRef={values.projectRef}
diff --git a/studio/components/interfaces/TableGridEditor/EmptyState.tsx b/studio/components/interfaces/TableGridEditor/EmptyState.tsx
index 8c9a1486b09..5b2b3b1d644 100644
--- a/studio/components/interfaces/TableGridEditor/EmptyState.tsx
+++ b/studio/components/interfaces/TableGridEditor/EmptyState.tsx
@@ -1,6 +1,6 @@
 import { FC } from 'react'
 import { observer } from 'mobx-react-lite'
-import { PostgresTable } from '@supabase/postgres-meta'
+import type { PostgresTable } from '@supabase/postgres-meta'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
 import { checkPermissions, useStore } from 'hooks'
 import ProductEmptyState from 'components/to-be-cleaned/ProductEmptyState'
diff --git a/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx b/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx
index 829ea337b80..198e9a2a964 100644
--- a/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx
+++ b/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx
@@ -1,7 +1,7 @@
 import { FC } from 'react'
 import Link from 'next/link'
 import { Button, IconAlertCircle, IconLock } from 'ui'
-import { PostgresPolicy, PostgresTable } from '@supabase/postgres-meta'
+import type { PostgresPolicy, PostgresTable } from '@supabase/postgres-meta'
 
 import { useStore } from 'hooks'
 
diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnDefaultValue.tsx b/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnDefaultValue.tsx
index ca2f6095a86..60bd565fb0b 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnDefaultValue.tsx
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnDefaultValue.tsx
@@ -1,7 +1,7 @@
 import React, { FC } from 'react'
 import { isNil } from 'lodash'
 import { Select } from 'ui'
-import { PostgresType } from '@supabase/postgres-meta'
+import type { PostgresType } from '@supabase/postgres-meta'
 
 import InputWithSuggestions from './InputWithSuggestions'
 import { POSTGRES_DATA_TYPES } from '../SidePanelEditor.constants'
diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.tsx b/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.tsx
index f2d8aab8204..519141c7087 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.tsx
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.tsx
@@ -3,7 +3,7 @@ import { FC, useEffect, useState } from 'react'
 import { isUndefined, isEmpty } from 'lodash'
 import { Dictionary } from 'components/grid'
 import { Checkbox, SidePanel, Input, Button, IconExternalLink, Toggle } from 'ui'
-import {
+import type {
   PostgresColumn,
   PostgresExtension,
   PostgresRelationship,
diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.utils.ts b/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.utils.ts
index 63a8436cae5..2467d36a736 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.utils.ts
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.utils.ts
@@ -1,6 +1,6 @@
 import { find, isUndefined, isEqual, isNull } from 'lodash'
 import { Dictionary } from 'components/grid'
-import {
+import type {
   PostgresColumn,
   PostgresRelationship,
   PostgresTable,
diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnForeignKey.tsx b/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnForeignKey.tsx
index 45a09d5a3cd..50d0778c246 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnForeignKey.tsx
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnForeignKey.tsx
@@ -5,7 +5,7 @@ import { Button, IconArrowRight } from 'ui'
 import { ColumnField } from '../SidePanelEditor.types'
 import InformationBox from 'components/ui/InformationBox'
 import { getForeignKeyUIState } from './ColumnEditor.utils'
-import { PostgresRelationship } from '@supabase/postgres-meta'
+import type { PostgresRelationship } from '@supabase/postgres-meta'
 
 interface Props {
   column: ColumnField
diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnType.tsx b/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnType.tsx
index 3cfdb838a50..7265c2976d1 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnType.tsx
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnType.tsx
@@ -1,6 +1,6 @@
 import React, { FC, ReactNode } from 'react'
 import { IconCalendar, IconType, IconHash, Listbox, IconToggleRight, Input } from 'ui'
-import { PostgresType } from '@supabase/postgres-meta'
+import type { PostgresType } from '@supabase/postgres-meta'
 import { POSTGRES_DATA_TYPES, POSTGRES_DATA_TYPE_OPTIONS } from '../SidePanelEditor.constants'
 import { PostgresDataTypeOption } from '../SidePanelEditor.types'
 
diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/HeaderTitle.tsx b/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/HeaderTitle.tsx
index d416f54bba7..fdde8877ddd 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/HeaderTitle.tsx
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/HeaderTitle.tsx
@@ -1,4 +1,4 @@
-import { PostgresTable, PostgresColumn } from '@supabase/postgres-meta'
+import type { PostgresTable, PostgresColumn } from '@supabase/postgres-meta'
 
 interface Props {
   table: PostgresTable
diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/ForeignKeySelector/ForeignKeySelector.tsx b/studio/components/interfaces/TableGridEditor/SidePanelEditor/ForeignKeySelector/ForeignKeySelector.tsx
index 5def89a726c..e8146e33c43 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/ForeignKeySelector/ForeignKeySelector.tsx
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/ForeignKeySelector/ForeignKeySelector.tsx
@@ -1,8 +1,8 @@
 import React, { FC, useEffect, useState } from 'react'
 import { get, find, isEmpty, sortBy } from 'lodash'
 import { Dictionary } from 'components/grid'
-import { SidePanel, Listbox, IconHelpCircle } from 'ui'
-import { PostgresTable, PostgresColumn } from '@supabase/postgres-meta'
+import { SidePanel, Input, Listbox, IconHelpCircle } from 'ui'
+import type { PostgresTable, PostgresColumn } from '@supabase/postgres-meta'
 
 import ActionBar from '../ActionBar'
 import { ForeignKey } from './ForeignKeySelector.types'
@@ -71,7 +71,7 @@ const ForeignKeySelector: FC<Props> = ({
       setSelectedForeignKey({
         schema: table.schema,
         table: table.name,
-        column: table.columns.length > 0 ? table.columns[0].name : undefined,
+        column: table.columns?.length ? table.columns[0].name : undefined,
       })
     }
   }
@@ -165,26 +165,41 @@ const ForeignKeySelector: FC<Props> = ({
           </Listbox>
 
           {selectedForeignKey?.table && (
-            <Listbox
-              value={selectedColumn?.id}
-              // @ts-ignore
-              label={
-                <div>
-                  Select a column from <code>{selectedForeignKey?.table}</code> to reference to
-                </div>
-              }
-              error={errors.column}
-              onChange={(value: string) => updateSelectedColumn(value)}
-            >
-              {(selectedTable?.columns ?? []).map((column: PostgresColumn) => (
-                <Listbox.Option key={column.id} value={column.id} label={column.name}>
-                  <div className="flex items-center gap-2">
-                    <span className="text-scale-1200">{column.name}</span>
-                    <span className="text-scale-900">{column.format}</span>
-                  </div>
-                </Listbox.Option>
-              ))}
-            </Listbox>
+            <>
+              {(selectedTable?.columns ?? []).length === 0 ? (
+                <Input
+                  disabled
+                  label={
+                    <div>
+                      Select a column from <code>{selectedForeignKey?.table}</code> to reference to
+                    </div>
+                  }
+                  error={errors.column}
+                  placeholder="This table has no columns available"
+                />
+              ) : (
+                <Listbox
+                  value={selectedColumn?.id}
+                  // @ts-ignore
+                  label={
+                    <div>
+                      Select a column from <code>{selectedForeignKey?.table}</code> to reference to
+                    </div>
+                  }
+                  error={errors.column}
+                  onChange={(value: string) => updateSelectedColumn(value)}
+                >
+                  {(selectedTable?.columns ?? []).map((column: PostgresColumn) => (
+                    <Listbox.Option key={column.id} value={column.id} label={column.name}>
+                      <div className="flex items-center gap-2">
+                        <span className="text-scale-1200">{column.name}</span>
+                        <span className="text-scale-900">{column.format}</span>
+                      </div>
+                    </Listbox.Option>
+                  ))}
+                </Listbox>
+              )}
+            </>
           )}
         </div>
       </SidePanel.Content>
diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/ReferenceRowViewer.tsx b/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/ReferenceRowViewer.tsx
index 8f32cec127c..8760f7b0385 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/ReferenceRowViewer.tsx
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/ReferenceRowViewer.tsx
@@ -1,6 +1,6 @@
 import React, { FC, useEffect, useState } from 'react'
 import { SidePanel, IconLoader, IconXCircle } from 'ui'
-import { PostgresRelationship } from '@supabase/postgres-meta'
+import type { PostgresRelationship } from '@supabase/postgres-meta'
 
 import ActionBar from '../ActionBar'
 import InputField from './InputField'
diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.tsx b/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.tsx
index 69bebb52dfc..4ebd6a4f6bc 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.tsx
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.tsx
@@ -3,7 +3,7 @@ import { isUndefined, partition, isEmpty } from 'lodash'
 import { SidePanel } from 'ui'
 import { Dictionary } from 'components/grid'
 import { Query } from 'components/grid/query/Query'
-import { PostgresTable } from '@supabase/postgres-meta'
+import type { PostgresTable } from '@supabase/postgres-meta'
 
 import { useStore } from 'hooks'
 import ActionBar from '../ActionBar'
diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.types.ts b/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.types.ts
index 495ea21e5d1..6af2e718b44 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.types.ts
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.types.ts
@@ -1,4 +1,4 @@
-import { PostgresRelationship } from '@supabase/postgres-meta'
+import type { PostgresRelationship } from '@supabase/postgres-meta'
 
 export interface JsonEditValue {
   column: string
diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.utils.ts b/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.utils.ts
index 62b0128756c..7bbe183f5f7 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.utils.ts
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.utils.ts
@@ -1,7 +1,7 @@
 import dayjs from 'dayjs'
 import { find, isUndefined, compact, isEqual, omitBy, isNull, isString } from 'lodash'
 import { Dictionary } from 'components/grid'
-import { PostgresTable } from '@supabase/postgres-meta'
+import type { PostgresTable } from '@supabase/postgres-meta'
 
 import { uuidv4, minifyJSON, tryParseJson } from 'lib/helpers'
 import { RowField } from './RowEditor.types'
@@ -15,7 +15,7 @@ export const generateRowFields = (
   // @ts-ignore
   const primaryKeyColumns = primary_keys.map((key) => key.name)
 
-  return table.columns.map((column) => {
+  return table.columns!.map((column) => {
     const value = isUndefined(row)
       ? ''
       : DATETIME_TYPES.includes(column.format)
diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.constants.ts b/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.constants.ts
index 41dbe8d9217..93d1de22237 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.constants.ts
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.constants.ts
@@ -47,11 +47,6 @@ export const POSTGRES_DATA_TYPE_OPTIONS: PostgresDataTypeOption[] = [
     description: 'Exact numeric of selectable precision',
     type: 'number',
   },
-  {
-    name: 'json',
-    description: 'Textual JSON data',
-    type: 'json',
-  },
   {
     name: 'jsonb',
     description: 'Binary JSON data, decomposed',
@@ -62,11 +57,6 @@ export const POSTGRES_DATA_TYPE_OPTIONS: PostgresDataTypeOption[] = [
     description: 'Variable-length character string',
     type: 'text',
   },
-  {
-    name: 'varchar',
-    description: 'Variable-length character string',
-    type: 'text',
-  },
   {
     name: 'uuid',
     description: 'Universally unique identifier',
@@ -82,16 +72,6 @@ export const POSTGRES_DATA_TYPE_OPTIONS: PostgresDataTypeOption[] = [
     description: 'Time of day (no time zone)',
     type: 'time',
   },
-  {
-    name: 'timetz',
-    description: 'Time of day, including time zone',
-    type: 'time',
-  },
-  {
-    name: 'timestamp',
-    description: 'Date and time (no time zone)',
-    type: 'time',
-  },
   {
     name: 'timestamptz',
     description: 'Date and time, including time zone',
diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.tsx b/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.tsx
index 7e410f7d2ab..7d8c40bd8d0 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.tsx
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.tsx
@@ -2,7 +2,7 @@ import { FC, useState } from 'react'
 import { find, isEmpty, isUndefined } from 'lodash'
 import { Query, Dictionary } from 'components/grid'
 import { Modal } from 'ui'
-import { PostgresRelationship, PostgresTable, PostgresColumn } from '@supabase/postgres-meta'
+import type { PostgresRelationship, PostgresTable, PostgresColumn } from '@supabase/postgres-meta'
 
 import { useStore } from 'hooks'
 import { RowEditor, ColumnEditor, TableEditor } from '.'
@@ -144,8 +144,8 @@ const SidePanelEditor: FC<Props> = ({
       closePanel()
     }
 
-    if (configuration.isEncrypted) {
-      await meta.schemas.loadViews(selectedTable?.schema ?? '')
+    if (configuration.isEncrypted && selectedTable?.schema) {
+      await meta.views.loadBySchema(selectedTable.schema)
     }
 
     resolve()
diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.types.ts b/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.types.ts
index 3fc105799d3..59d260113c0 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.types.ts
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.types.ts
@@ -1,4 +1,4 @@
-import { PostgresRelationship } from '@supabase/postgres-meta'
+import type { PostgresRelationship } from '@supabase/postgres-meta'
 
 export interface CreateColumnPayload {
   tableId: number
diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/Column.tsx b/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/Column.tsx
index 4939942cfa7..5970f19f8d8 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/Column.tsx
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/Column.tsx
@@ -1,7 +1,7 @@
 import { FC } from 'react'
 import { isUndefined } from 'lodash'
 import { Checkbox, Input, IconX, IconMenu, Popover, IconLink, IconSettings, Button } from 'ui'
-import { PostgresType } from '@supabase/postgres-meta'
+import type { PostgresType } from '@supabase/postgres-meta'
 
 import { ColumnField } from '../SidePanelEditor.types'
 import ColumnType from '../ColumnEditor/ColumnType'
diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/ColumnManagement.tsx b/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/ColumnManagement.tsx
index 61f8e127f80..f601b5962bc 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/ColumnManagement.tsx
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/ColumnManagement.tsx
@@ -3,7 +3,7 @@ import React, { FC, useState } from 'react'
 import { partition, isEmpty, isUndefined } from 'lodash'
 import { Alert, Button, IconEdit, IconHelpCircle, IconKey, IconTrash, IconExternalLink } from 'ui'
 
-import {
+import type {
   PostgresTable,
   PostgresColumn,
   PostgresRelationship,
diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/HeaderTitle.tsx b/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/HeaderTitle.tsx
index 45e0fd37775..1517ffb30b5 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/HeaderTitle.tsx
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/HeaderTitle.tsx
@@ -1,5 +1,5 @@
 import { FC } from 'react'
-import { PostgresTable } from '@supabase/postgres-meta'
+import type { PostgresTable } from '@supabase/postgres-meta'
 
 interface Props {
   schema: string
diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/TableEditor.tsx b/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/TableEditor.tsx
index 09928532ab9..0d20cee9e41 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/TableEditor.tsx
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/TableEditor.tsx
@@ -1,7 +1,7 @@
 import { FC, useEffect, useState } from 'react'
 import { isUndefined, isEmpty } from 'lodash'
 import { Badge, Checkbox, SidePanel, Input, Alert } from 'ui'
-import { PostgresTable, PostgresType } from '@supabase/postgres-meta'
+import type { PostgresTable, PostgresType } from '@supabase/postgres-meta'
 
 import { useStore } from 'hooks'
 import ActionBar from '../ActionBar'
@@ -17,6 +17,7 @@ import {
   generateTableFieldFromPostgresTable,
   formatImportedContentToColumnFields,
 } from './TableEditor.utils'
+import InformationBox from 'components/ui/InformationBox'
 
 interface Props {
   table?: PostgresTable
@@ -215,22 +216,19 @@ const TableEditor: FC<Props> = ({
                   <p>
                     Restrict access to your table by enabling RLS and writing Postgres policies.
                   </p>
-
                   <p>
-                    If RLS is not enabled, anyone with the anon key can modify and delete your data.
+                    RLS is secure by default - all normal access to this table must be allowed by a
+                    policy.
                   </p>
                   {!tableFields.isRLSEnabled && (
                     <Alert
                       withIcon
                       variant="warning"
                       className="!px-4 !py-3 mt-3"
-                      // @ts-ignore
-                      title={
-                        <span className="text-amber-1100 text-sm">
-                          Turning off RLS means that you are allowing anonymous access to your table
-                        </span>
-                      }
-                    />
+                      title="Turning off RLS means that you are allowing anonymous access to your table"
+                    >
+                      As such, anyone with the anonymous key can modify or delete your data.
+                    </Alert>
                   )}
                 </>
               }
diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/TableEditor.utils.ts b/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/TableEditor.utils.ts
index 6c148727289..2f0d60f983a 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/TableEditor.utils.ts
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/TableEditor.utils.ts
@@ -1,5 +1,5 @@
 import { some } from 'lodash'
-import { PostgresColumn, PostgresTable } from '@supabase/postgres-meta'
+import type { PostgresColumn, PostgresTable } from '@supabase/postgres-meta'
 
 import { ImportContent, TableField } from './TableEditor.types'
 import { DEFAULT_COLUMNS } from './TableEditor.constants'
diff --git a/studio/components/interfaces/TableGridEditor/TableGridEditor.tsx b/studio/components/interfaces/TableGridEditor/TableGridEditor.tsx
index 58e2adba72d..e62bfe19e34 100644
--- a/studio/components/interfaces/TableGridEditor/TableGridEditor.tsx
+++ b/studio/components/interfaces/TableGridEditor/TableGridEditor.tsx
@@ -2,14 +2,14 @@ import { FC, useRef, useEffect, useState } from 'react'
 import { observer } from 'mobx-react-lite'
 import { useRouter } from 'next/router'
 import { find, isUndefined } from 'lodash'
-import { PostgresColumn, PostgresTable } from '@supabase/postgres-meta'
+import type { PostgresColumn, PostgresTable } from '@supabase/postgres-meta'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
 
+import { SchemaView } from 'types'
 import { checkPermissions, useFlag, useStore } from 'hooks'
 import GridHeaderActions from './GridHeaderActions'
 import NotFoundState from './NotFoundState'
 import SidePanelEditor from './SidePanelEditor'
-import { SchemaView } from 'components/layouts/TableEditorLayout/TableEditorLayout.types'
 import { Dictionary, parseSupaTable, SupabaseGrid, SupabaseGridRef } from 'components/grid'
 
 interface Props {
@@ -81,7 +81,7 @@ const TableGridEditor: FC<Props> = ({
 
   // @ts-ignore
   const schema = meta.schemas.list().find((schema) => schema.name === selectedSchema)
-  const isViewSelected = Object.keys(selectedTable).length === 2
+  const isViewSelected = !Object.keys(selectedTable).includes('rls_enabled')
   const isForeignTableSelected = meta.foreignTables.byId(selectedTable.id) !== undefined
   const isLocked = meta.excludedSchemas.includes(schema?.name ?? '')
   const canUpdateTables = checkPermissions(PermissionAction.TENANT_SQL_ADMIN_WRITE, 'tables')
@@ -92,7 +92,7 @@ const TableGridEditor: FC<Props> = ({
       ? parseSupaTable(
           {
             table: selectedTable as PostgresTable,
-            columns: (selectedTable as PostgresTable).columns,
+            columns: (selectedTable as PostgresTable).columns ?? [],
             primaryKeys: (selectedTable as PostgresTable).primary_keys,
             relationships: (selectedTable as PostgresTable).relationships,
           },
diff --git a/studio/components/layouts/AuthLayout/AuthLayout.tsx b/studio/components/layouts/AuthLayout/AuthLayout.tsx
index 8fa69472d88..f747c9adf22 100644
--- a/studio/components/layouts/AuthLayout/AuthLayout.tsx
+++ b/studio/components/layouts/AuthLayout/AuthLayout.tsx
@@ -28,6 +28,7 @@ const AuthLayout: FC<Props> = ({ title, children }) => {
       meta.policies.load()
       meta.tables.load()
       meta.roles.load()
+      meta.schemas.load()
     }
   }, [ui.selectedProject?.ref])
 
diff --git a/studio/components/layouts/DatabaseLayout/DatabaseMenu.utils.ts b/studio/components/layouts/DatabaseLayout/DatabaseMenu.utils.ts
index b40ef67dba4..8ea9c65ca30 100644
--- a/studio/components/layouts/DatabaseLayout/DatabaseMenu.utils.ts
+++ b/studio/components/layouts/DatabaseLayout/DatabaseMenu.utils.ts
@@ -1,6 +1,7 @@
 import { Project } from 'types'
 import { ProductMenuGroup } from 'components/ui/ProductMenu/ProductMenu.types'
 import { useFlag } from 'hooks'
+import { IS_PLATFORM } from 'lib/constants'
 
 export const generateDatabaseMenu = (project?: Project): ProductMenuGroup[] => {
   const ref = project?.ref ?? 'default'
@@ -62,12 +63,16 @@ export const generateDatabaseMenu = (project?: Project): ProductMenuGroup[] => {
               },
             ]
           : []),
-        {
-          name: 'Backups',
-          key: 'backups',
-          url: `/project/${ref}/database/backups/scheduled`,
-          items: [],
-        },
+        ...(IS_PLATFORM
+          ? [
+              {
+                name: 'Backups',
+                key: 'backups',
+                url: `/project/${ref}/database/backups/scheduled`,
+                items: [],
+              },
+            ]
+          : []),
       ],
     },
   ]
diff --git a/studio/components/layouts/LogsLayout/LogsMenu.utils.ts b/studio/components/layouts/LogsLayout/LogsMenu.utils.ts
index cb1b4d1d7bc..26a7eaf0748 100644
--- a/studio/components/layouts/LogsLayout/LogsMenu.utils.ts
+++ b/studio/components/layouts/LogsLayout/LogsMenu.utils.ts
@@ -1,14 +1,10 @@
 import { Project } from 'types'
 import { ProductMenuGroup } from 'components/ui/ProductMenu/ProductMenu.types'
 import { IS_PLATFORM } from 'lib/constants'
-import { useFlag } from 'hooks'
 
 export const generateLogsMenu = (project?: Project): ProductMenuGroup[] => {
   const ref = project?.ref ?? 'default'
 
-  const logsPostgrest = useFlag('logsPostgrest')
-  const logsPgbouncer = useFlag('logsPgbouncer')
-
   return [
     ...(IS_PLATFORM
       ? [
@@ -40,26 +36,18 @@ export const generateLogsMenu = (project?: Project): ProductMenuGroup[] => {
                 url: `/project/${ref}/logs/postgres-logs`,
                 items: [],
               },
-              ...(logsPostgrest
-                ? [
-                    {
-                      name: 'PostgREST',
-                      key: 'postgrest-logs',
-                      url: `/project/${ref}/logs/postgrest-logs`,
-                      items: [],
-                    },
-                  ]
-                : []),
-              ...(logsPgbouncer
-                ? [
-                    {
-                      name: 'PgBouncer',
-                      key: 'pgbouncer-logs',
-                      url: `/project/${ref}/logs/pgbouncer-logs`,
-                      items: [],
-                    },
-                  ]
-                : []),
+              {
+                name: 'PostgREST',
+                key: 'postgrest-logs',
+                url: `/project/${ref}/logs/postgrest-logs`,
+                items: [],
+              },
+              {
+                name: 'PgBouncer',
+                key: 'pgbouncer-logs',
+                url: `/project/${ref}/logs/pgbouncer-logs`,
+                items: [],
+              },
               {
                 name: 'Auth',
                 key: 'auth-logs',
diff --git a/studio/components/layouts/ProjectLayout/LayoutHeader/FeedbackDropdown/FeedbackDropdown.tsx b/studio/components/layouts/ProjectLayout/LayoutHeader/FeedbackDropdown/FeedbackDropdown.tsx
index 0f4944909fc..f083736a6cb 100644
--- a/studio/components/layouts/ProjectLayout/LayoutHeader/FeedbackDropdown/FeedbackDropdown.tsx
+++ b/studio/components/layouts/ProjectLayout/LayoutHeader/FeedbackDropdown/FeedbackDropdown.tsx
@@ -20,7 +20,10 @@ const FeedbackDropdown = () => {
   return (
     <Popover
       open={isOpen}
-      onOpenChange={(e) => setIsOpen(e)}
+      onOpenChange={(e) => {
+        setIsOpen(e)
+        if (!e) setScreenshot(undefined)
+      }}
       size="content"
       side="bottom"
       align="end"
diff --git a/studio/components/layouts/ProjectLayout/LayoutHeader/FeedbackDropdown/FeedbackWidget.tsx b/studio/components/layouts/ProjectLayout/LayoutHeader/FeedbackDropdown/FeedbackWidget.tsx
index a8defc57682..a8b8ec910f7 100644
--- a/studio/components/layouts/ProjectLayout/LayoutHeader/FeedbackDropdown/FeedbackWidget.tsx
+++ b/studio/components/layouts/ProjectLayout/LayoutHeader/FeedbackDropdown/FeedbackWidget.tsx
@@ -1,14 +1,14 @@
 import Link from 'next/link'
-import { useState, useEffect, useRef, FC } from 'react'
+import { useState, useEffect, useRef, FC, ChangeEvent } from 'react'
 import { useRouter } from 'next/router'
-import * as Tooltip from '@radix-ui/react-tooltip'
 import { toPng } from 'html-to-image'
-import { Button, Input, Popover, IconCamera, IconX } from 'ui'
+import { Button, Input, Popover, IconCamera, IconX, IconImage, Dropdown, IconUpload } from 'ui'
 
 import { useStore } from 'hooks'
 import { post } from 'lib/common/fetch'
 import { API_URL } from 'lib/constants'
 import { convertB64toBlob, uploadAttachment } from './FeedbackDropdown.utils'
+import { timeout } from 'lib/helpers'
 
 interface Props {
   onClose: () => void
@@ -30,6 +30,7 @@ const FeedbackWidget: FC<Props> = ({
 
   const { ui } = useStore()
   const inputRef = useRef<any>(null)
+  const uploadButtonRef = useRef()
 
   const [isSending, setSending] = useState(false)
   const [isSavingScreenshot, setIsSavingScreenshot] = useState(false)
@@ -42,7 +43,7 @@ const FeedbackWidget: FC<Props> = ({
     setFeedback(e.target.value)
   }
 
-  const captureScreenshot = () => {
+  const captureScreenshot = async () => {
     setIsSavingScreenshot(true)
 
     function filter(node: HTMLElement) {
@@ -52,6 +53,8 @@ const FeedbackWidget: FC<Props> = ({
       return true
     }
 
+    // Give time for dropdown to close
+    await timeout(100)
     toPng(document.body, { filter })
       .then((dataUrl: any) => setScreenshot(dataUrl))
       .catch((error: any) => {
@@ -67,6 +70,18 @@ const FeedbackWidget: FC<Props> = ({
       })
   }
 
+  const onFilesUpload = async (event: ChangeEvent<HTMLInputElement>) => {
+    event.persist()
+    const [file] = event.target.files || (event as any).dataTransfer.items
+
+    const reader = new FileReader()
+    reader.onload = function (event) {
+      setScreenshot(event.target?.result as string)
+    }
+    reader.readAsDataURL(file)
+    event.target.value = ''
+  }
+
   const sendFeedback = async () => {
     if (feedback.length === 0 && screenshot !== undefined) {
       return ui.setNotification({
@@ -97,7 +112,7 @@ const FeedbackWidget: FC<Props> = ({
   }
 
   return (
-    <div id="feedback-widget">
+    <div id="feedback-widget" className="text-area-text-sm">
       <Input.TextArea
         className="w-80 p-3"
         size="small"
@@ -138,33 +153,44 @@ const FeedbackWidget: FC<Props> = ({
                 </div>
               </div>
             ) : (
-              <Tooltip.Root delayDuration={0}>
-                <Tooltip.Trigger>
-                  <Button
-                    as="span"
-                    type="default"
-                    disabled={isSavingScreenshot}
-                    loading={isSavingScreenshot}
-                    className="px-2 py-1.5"
+              <Dropdown
+                className="feedback-dropdown"
+                size="small"
+                overlay={[
+                  <Dropdown.Item
+                    icon={<IconUpload size={14} />}
+                    onClick={() => {
+                      if (uploadButtonRef.current) (uploadButtonRef.current as any).click()
+                    }}
+                  >
+                    Upload screenshot
+                  </Dropdown.Item>,
+                  <Dropdown.Item
                     icon={<IconCamera size={14} />}
                     onClick={() => captureScreenshot()}
-                  />
-                </Tooltip.Trigger>
-                <Tooltip.Content side="bottom">
-                  <Tooltip.Arrow className="radix-tooltip-arrow" />
-                  <div
-                    className={[
-                      'bg-scale-100 rounded py-1 px-2 leading-none shadow', // background
-                      'w-[130px] text-center border-scale-200 border', //border
-                    ].join(' ')}
                   >
-                    <span className="text-scale-1200 text-xs">
-                      Capture screenshot of current view
-                    </span>
-                  </div>
-                </Tooltip.Content>
-              </Tooltip.Root>
+                    Capture screenshot
+                  </Dropdown.Item>,
+                ]}
+              >
+                <Button
+                  as="span"
+                  type="default"
+                  disabled={isSavingScreenshot}
+                  loading={isSavingScreenshot}
+                  className="px-2 py-1.5"
+                  icon={<IconImage size={14} />}
+                />
+              </Dropdown>
             )}
+            <input
+              type="file"
+              // @ts-ignore
+              ref={uploadButtonRef}
+              className="hidden"
+              accept="image/png"
+              onChange={onFilesUpload}
+            />
             <Button disabled={isSending} loading={isSending} onClick={sendFeedback}>
               Send feedback
             </Button>
diff --git a/studio/components/layouts/StorageLayout/BucketRow.tsx b/studio/components/layouts/StorageLayout/BucketRow.tsx
new file mode 100644
index 00000000000..f96a5d96b4c
--- /dev/null
+++ b/studio/components/layouts/StorageLayout/BucketRow.tsx
@@ -0,0 +1,73 @@
+import { FC } from 'react'
+import { Badge, Dropdown, IconLoader, IconMoreVertical, IconTrash } from 'ui'
+
+import ProductMenuItem from 'components/ui/ProductMenu/ProductMenuItem'
+import { STORAGE_ROW_STATUS } from 'components/to-be-cleaned/Storage/Storage.constants'
+
+interface Props {
+  bucket: any
+  projectRef?: string
+  isSelected: boolean
+  onSelectDeleteBucket: (bucket: any) => void
+  onSelectToggleBucketPublic: (bucket: any) => void
+}
+
+const BucketRow: FC<Props> = ({
+  bucket = {},
+  projectRef = '',
+  isSelected = false,
+  onSelectDeleteBucket = () => {},
+  onSelectToggleBucketPublic = () => {},
+}) => {
+  return (
+    <ProductMenuItem
+      key={bucket.id}
+      name={
+        <div className="flex items-center justify-between space-x-2 truncate w-full">
+          <p className="truncate" title={bucket.name}>
+            {bucket.name}
+          </p>
+          {bucket.public && <Badge color="yellow">Public</Badge>}
+        </div>
+      }
+      url={`/project/${projectRef}/storage/buckets/${bucket.id}`}
+      isActive={isSelected}
+      action={
+        bucket.status === STORAGE_ROW_STATUS.LOADING ? (
+          <IconLoader className="animate-spin" size={16} strokeWidth={2} />
+        ) : bucket.status === STORAGE_ROW_STATUS.READY ? (
+          <Dropdown
+            side="bottom"
+            align="start"
+            overlay={[
+              <Dropdown.Item
+                key="toggle-private"
+                onClick={() => onSelectToggleBucketPublic(bucket)}
+              >
+                {bucket.public ? 'Make private' : 'Make public'}
+              </Dropdown.Item>,
+              <Dropdown.Separator key="bucket-separator" />,
+              <Dropdown.Item
+                icon={<IconTrash size="tiny" />}
+                key="delete-bucket"
+                onClick={() => onSelectDeleteBucket(bucket)}
+              >
+                Delete bucket
+              </Dropdown.Item>,
+            ]}
+          >
+            <IconMoreVertical
+              className="opacity-0 group-hover:opacity-100"
+              size="tiny"
+              strokeWidth={2}
+            />
+          </Dropdown>
+        ) : (
+          <div />
+        )
+      }
+    />
+  )
+}
+
+export default BucketRow
diff --git a/studio/components/layouts/StorageLayout/StorageLayout.tsx b/studio/components/layouts/StorageLayout/StorageLayout.tsx
index 031a5935c33..e6b7c0ad180 100644
--- a/studio/components/layouts/StorageLayout/StorageLayout.tsx
+++ b/studio/components/layouts/StorageLayout/StorageLayout.tsx
@@ -3,7 +3,8 @@ import { useRouter } from 'next/router'
 import { find, filter, get as _get } from 'lodash'
 import { observer } from 'mobx-react-lite'
 
-import { useProjectSettings, useStore, withAuth } from 'hooks'
+import { AutoApiService, useProjectSettingsQuery } from 'data/config/project-settings-query'
+import { useStore, withAuth } from 'hooks'
 import BaseLayout from 'components/layouts'
 import ProjectLayout from '../ProjectLayout/ProjectLayout'
 import StorageMenu from './StorageMenu'
@@ -39,20 +40,24 @@ const StorageLayout: FC<Props> = ({ title, children }) => {
     buckets,
   } = storageExplorerStore || {}
 
-  const { services, isLoading } = useProjectSettings(ref as string | undefined)
-  const apiService = find(services ?? [], (service) => service.app.id === 1)
-  const projectUrl = apiService?.app_config?.endpoint ?? ''
+  const { data: settings, isLoading } = useProjectSettingsQuery({ projectRef: ref as string })
+  const apiService = settings?.autoApiService
   const serviceKey = find(apiService?.service_api_keys ?? [], (key) => key.tags === 'service_role')
-  const canAccessStorage = !isLoading && services && serviceKey
+  const canAccessStorage = !isLoading && apiService && serviceKey
 
   useEffect(() => {
-    if (!isLoading && services) initializeStorageStore()
+    if (!isLoading && apiService) initializeStorageStore(apiService)
   }, [isLoading])
 
-  const initializeStorageStore = async () => {
-    if (projectUrl) {
+  const initializeStorageStore = async (apiService: AutoApiService) => {
+    if (apiService.endpoint) {
       if (serviceKey) {
-        storageExplorerStore.initStore(ref, projectUrl, serviceKey.api_key)
+        storageExplorerStore.initStore(
+          ref,
+          apiService.endpoint,
+          apiService.serviceApiKey,
+          apiService.protocol
+        )
         await storageExplorerStore.fetchBuckets()
       }
     } else {
diff --git a/studio/components/layouts/StorageLayout/StorageMenu.tsx b/studio/components/layouts/StorageLayout/StorageMenu.tsx
index 2889292f42f..441e07c40a9 100644
--- a/studio/components/layouts/StorageLayout/StorageMenu.tsx
+++ b/studio/components/layouts/StorageLayout/StorageMenu.tsx
@@ -2,28 +2,18 @@ import { FC } from 'react'
 import Link from 'next/link'
 import { useRouter } from 'next/router'
 import { observer } from 'mobx-react-lite'
-import { useStore } from 'hooks'
-import {
-  Badge,
-  Button,
-  Dropdown,
-  Menu,
-  IconLoader,
-  IconMoreVertical,
-  Alert,
-  IconEdit,
-  IconTrash,
-} from 'ui'
+import { useParams } from 'hooks'
+import { Button, Menu, IconLoader, Alert, IconEdit } from 'ui'
 
-import ProductMenuItem from 'components/ui/ProductMenu/ProductMenuItem'
-import { STORAGE_ROW_STATUS } from 'components/to-be-cleaned/Storage/Storage.constants'
+import BucketRow from './BucketRow'
 import { useStorageStore } from 'localStores/storageExplorer/StorageExplorerStore'
 
 interface Props {}
 
 const StorageMenu: FC<Props> = () => {
   const router = useRouter()
-  const { ref, bucketId } = router.query
+  const { ref, bucketId } = useParams()
+
   const page = router.pathname.split('/')[4] as
     | undefined
     | 'policies'
@@ -31,9 +21,6 @@ const StorageMenu: FC<Props> = () => {
     | 'usage'
     | 'logs'
 
-  const { ui } = useStore()
-  const projectRef = ui.selectedProject?.ref
-
   const storageExplorerStore = useStorageStore()
   const {
     loaded,
@@ -98,7 +85,7 @@ const StorageMenu: FC<Props> = () => {
         <div className="h-px w-full bg-scale-500"></div>
         <div className="">
           <Menu.Group title="Configuration" />
-          <Link href={`/project/${projectRef}/storage/policies`}>
+          <Link href={`/project/${ref}/storage/policies`}>
             <Menu.Item rounded active={page === 'policies'}>
               <p className="truncate">Policies</p>
             </Menu.Item>
@@ -110,61 +97,3 @@ const StorageMenu: FC<Props> = () => {
 }
 
 export default observer(StorageMenu)
-
-const BucketRow = ({
-  bucket = {},
-  projectRef = '',
-  isSelected = false,
-  onSelectDeleteBucket = () => {},
-  onSelectToggleBucketPublic = () => {},
-}: any) => {
-  return (
-    <ProductMenuItem
-      key={bucket.id}
-      name={
-        <div className="flex items-center justify-between space-x-2 truncate w-full">
-          <p className="truncate" title={bucket.name}>
-            {bucket.name}
-          </p>
-          {bucket.public && <Badge color="yellow">Public</Badge>}
-        </div>
-      }
-      url={`/project/${projectRef}/storage/buckets/${bucket.id}`}
-      isActive={isSelected}
-      action={
-        bucket.status === STORAGE_ROW_STATUS.LOADING ? (
-          <IconLoader className="animate-spin" size={16} strokeWidth={2} />
-        ) : bucket.status === STORAGE_ROW_STATUS.READY ? (
-          <Dropdown
-            side="bottom"
-            align="start"
-            overlay={[
-              <Dropdown.Item
-                key="toggle-private"
-                onClick={() => onSelectToggleBucketPublic(bucket)}
-              >
-                {bucket.public ? 'Make private' : 'Make public'}
-              </Dropdown.Item>,
-              <Dropdown.Separator key="bucket-separator" />,
-              <Dropdown.Item
-                icon={<IconTrash size="tiny" />}
-                key="delete-bucket"
-                onClick={() => onSelectDeleteBucket(bucket)}
-              >
-                Delete bucket
-              </Dropdown.Item>,
-            ]}
-          >
-            <IconMoreVertical
-              className="opacity-0 group-hover:opacity-100"
-              size="tiny"
-              strokeWidth={2}
-            />
-          </Dropdown>
-        ) : (
-          <div />
-        )
-      }
-    />
-  )
-}
diff --git a/studio/components/layouts/TableEditorLayout/TableEditorLayout.tsx b/studio/components/layouts/TableEditorLayout/TableEditorLayout.tsx
index af9ac5edeec..570efed3ae9 100644
--- a/studio/components/layouts/TableEditorLayout/TableEditorLayout.tsx
+++ b/studio/components/layouts/TableEditorLayout/TableEditorLayout.tsx
@@ -1,10 +1,10 @@
 import { FC, ReactNode, useState, useEffect } from 'react'
 import { isUndefined } from 'lodash'
 import { observer } from 'mobx-react-lite'
-import { PostgresTable } from '@supabase/postgres-meta'
+import type { PostgresTable } from '@supabase/postgres-meta'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
 
-import { checkPermissions, useStore } from 'hooks'
+import { checkPermissions, useParams, useStore } from 'hooks'
 import Error from 'components/ui/Error'
 import ProjectLayout from '../ProjectLayout/ProjectLayout'
 import TableEditorMenu from './TableEditorMenu'
@@ -30,31 +30,54 @@ const TableEditorLayout: FC<Props> = ({
   children,
 }) => {
   const { vault, meta, ui } = useStore()
+  const { id, type } = useParams()
   const { isInitialized, isLoading, error } = meta.tables
 
   const [loaded, setLoaded] = useState<boolean>(isInitialized)
   const canReadTables = checkPermissions(PermissionAction.TENANT_SQL_ADMIN_READ, 'tables')
 
   const vaultExtension = meta.extensions.byId('supabase_vault')
-  const isEnabled = vaultExtension !== undefined && vaultExtension?.installed_version !== null
+  const isVaultEnabled = vaultExtension !== undefined && vaultExtension?.installed_version !== null
 
   useEffect(() => {
     if (ui.selectedProject?.ref) {
       meta.schemas.load()
-      meta.tables.load()
       meta.types.load()
       meta.policies.load()
       meta.publications.load()
       meta.extensions.load()
+
+      // [Joshen] pg-meta doesn't support loading views nor foreign tables by a specific ID yet
+      // Separately, Alaister and I chatted that perhaps we leverage on pg-catalog's pg-class
+      // table directly, so we can fetch the schema of tables/views/foreign-tables in one call
+      // rather than trying to discern if the ID is a view, or foreign table (refer to below)
+      meta.views.load()
       meta.foreignTables.load()
     }
   }, [ui.selectedProject?.ref])
 
   useEffect(() => {
-    if (isEnabled) {
+    if (selectedSchema && ui.selectedProject?.ref) {
+      meta.tables.loadBySchema(selectedSchema)
+      meta.views.loadBySchema(selectedSchema)
+    }
+  }, [ui.selectedProject?.ref, selectedSchema])
+
+  useEffect(() => {
+    if (ui.selectedProject?.ref && id) {
+      // [Joshen] This is a little silly, but because fetching tables/views/foreign-tables
+      // are all through different endpoints, we need to discern them
+      if (type !== 'view' && type !== 'foreign') {
+        meta.tables.loadById(Number(id))
+      }
+    }
+  }, [ui.selectedProject?.ref, id])
+
+  useEffect(() => {
+    if (isVaultEnabled) {
       vault.load()
     }
-  }, [ui.selectedProject?.ref, isEnabled])
+  }, [ui.selectedProject?.ref, isVaultEnabled])
 
   useEffect(() => {
     let cancel = false
diff --git a/studio/components/layouts/TableEditorLayout/TableEditorLayout.types.ts b/studio/components/layouts/TableEditorLayout/TableEditorLayout.types.ts
deleted file mode 100644
index 636a06056a8..00000000000
--- a/studio/components/layouts/TableEditorLayout/TableEditorLayout.types.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface SchemaView {
-  schema: string
-  name: string
-}
diff --git a/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx b/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx
index 1bc51c408ae..72d18037fa5 100644
--- a/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx
+++ b/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx
@@ -1,5 +1,4 @@
 import { FC, useEffect, useState } from 'react'
-import { useRouter } from 'next/router'
 import Link from 'next/link'
 import { partition } from 'lodash'
 import { observer } from 'mobx-react-lite'
@@ -10,6 +9,7 @@ import {
   IconCopy,
   IconEdit,
   IconLoader,
+  IconLock,
   IconRefreshCw,
   IconSearch,
   IconTrash,
@@ -20,11 +20,10 @@ import {
 } from 'ui'
 import * as Tooltip from '@radix-ui/react-tooltip'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { PostgresSchema, PostgresTable } from '@supabase/postgres-meta'
+import type { PostgresSchema, PostgresTable } from '@supabase/postgres-meta'
 
-import Base64 from 'lib/base64'
-import { checkPermissions, useStore } from 'hooks'
-import { SchemaView } from './TableEditorLayout.types'
+import { SchemaView } from 'types'
+import { checkPermissions, useStore, useParams } from 'hooks'
 import ProductMenuItem from 'components/ui/ProductMenu/ProductMenuItem'
 
 interface Props {
@@ -45,44 +44,34 @@ const TableEditorMenu: FC<Props> = ({
   onDuplicateTable = () => {},
 }) => {
   const { meta, ui } = useStore()
-  const router = useRouter()
-  const { id } = router.query
+  const { id, ref } = useParams()
 
-  const projectRef = ui.selectedProject?.ref
   const schemas: PostgresSchema[] = meta.schemas.list()
   const tables: PostgresTable[] = meta.tables.list(
     (table: PostgresTable) => table.schema === selectedSchema
   )
+  const views: SchemaView[] = meta.views.list((view: SchemaView) => view.schema === selectedSchema)
   const foreignTables: Partial<PostgresTable>[] = meta.foreignTables.list(
-    (table: PostgresTable) => table.schema === selectedSchema
+    (table: Partial<PostgresTable>) => table.schema === selectedSchema
   )
 
-  // @ts-ignore
+  const isFetchingTables =
+    // @ts-ignore
+    tables.filter((t) => t.schema === selectedSchema).length === 0 && meta.tables.isLoading
+
   const schema = schemas.find((schema) => schema.name === selectedSchema)
   const canCreateTables = checkPermissions(PermissionAction.TENANT_SQL_ADMIN_WRITE, 'tables')
 
   const [searchText, setSearchText] = useState<string>('')
   const [isRefreshing, setIsRefreshing] = useState<boolean>(false)
 
-  // We may need to shift this to the schema store and do something like meta.schema.loadViews()
-  // I don't need we need a separate store for views
-  useEffect(() => {
-    let cancel = false
-    const fetchViews = async (selectedSchema: string) => {
-      await meta.schemas.loadViews(selectedSchema)
-    }
-    if (selectedSchema) fetchViews(selectedSchema)
-
-    return () => {
-      cancel = true
-    }
-  }, [selectedSchema])
-
   const refreshTables = async () => {
-    setIsRefreshing(true)
-    await meta.tables.load()
-    if (selectedSchema) await meta.schemas.loadViews(selectedSchema)
-    setIsRefreshing(false)
+    if (selectedSchema) {
+      setIsRefreshing(true)
+      await meta.tables.loadBySchema(selectedSchema)
+      await meta.views.loadBySchema(selectedSchema)
+      setIsRefreshing(false)
+    }
   }
 
   const filteredTables =
@@ -93,9 +82,9 @@ const TableEditorMenu: FC<Props> = ({
 
   const filteredViews =
     searchText.length === 0
-      ? meta.schemas.views || []
-      : (meta.schemas.views || []).filter((view) =>
-          view.name.toLowerCase().includes(searchText.toLowerCase())
+      ? views || []
+      : (views || []).filter((view: Partial<PostgresTable>) =>
+          (view?.name ?? '').toLowerCase().includes(searchText.toLowerCase())
         )
 
   const filteredForeignTables =
@@ -229,147 +218,165 @@ const TableEditorMenu: FC<Props> = ({
         </div>
       </div>
 
-      <div className="flex-auto px-4 overflow-y-auto space-y-6 pb-4">
-        {/* List of tables belonging to selected schema */}
-        {filteredTables.length > 0 && (
-          <Menu type="pills">
-            <Menu.Group
-              // @ts-ignore
-              title={
-                <>
-                  <div className="flex w-full items-center justify-between">
-                    <div className="flex items-center space-x-1">
-                      <p>Tables</p>
-                      <p style={{ fontVariantNumeric: 'tabular-nums' }}>
-                        ({filteredTables.length})
-                      </p>
+      {isFetchingTables ? (
+        <div className="mx-7 flex items-center space-x-2">
+          <IconLoader className="animate-spin" size={14} strokeWidth={1.5} />
+          <p className="text-sm text-scale-1000">Loading tables...</p>
+        </div>
+      ) : searchText.length === 0 && filteredTables.length === 0 && filteredViews.length === 0 ? (
+        <div className="mx-7 space-y-1 rounded-md border border-scale-400 bg-scale-300 py-3 px-4">
+          <p className="text-xs">No tables available</p>
+          <p className="text-xs text-scale-1100">This schema has no tables available yet</p>
+        </div>
+      ) : (
+        <div className="flex-auto px-4 overflow-y-auto space-y-6 pb-4">
+          {/* List of tables belonging to selected schema */}
+          {filteredTables.length > 0 && (
+            <Menu type="pills">
+              <Menu.Group
+                // @ts-ignore
+                title={
+                  <>
+                    <div className="flex w-full items-center justify-between">
+                      <div className="flex items-center space-x-1">
+                        <p>Tables</p>
+                        <p style={{ fontVariantNumeric: 'tabular-nums' }}>
+                          ({filteredTables.length})
+                        </p>
+                      </div>
+                      <button className="cursor-pointer" onClick={refreshTables}>
+                        <IconRefreshCw className={isRefreshing ? 'animate-spin' : ''} size={14} />
+                      </button>
                     </div>
-                    <button className="cursor-pointer" onClick={refreshTables}>
-                      <IconRefreshCw className={isRefreshing ? 'animate-spin' : ''} size={14} />
-                    </button>
-                  </div>
-                </>
-              }
-            />
+                  </>
+                }
+              />
 
-            <div>
-              {filteredTables.map((table) => {
-                const isActive = Number(id) === table.id
+              <div>
+                {filteredTables.map((table) => {
+                  const isActive = Number(id) === table.id
+                  return (
+                    <ProductMenuItem
+                      key={table.name}
+                      url={`/project/${ref}/editor/${table.id}`}
+                      name={table.name}
+                      hoverText={table.comment ? table.comment : table.name}
+                      isActive={isActive}
+                      action={
+                        isActive &&
+                        !isLocked && (
+                          <Dropdown
+                            size="small"
+                            side="bottom"
+                            align="start"
+                            overlay={[
+                              <Dropdown.Item
+                                key="edit-table"
+                                icon={<IconEdit size="tiny" />}
+                                onClick={() => onEditTable(table)}
+                              >
+                                Edit Table
+                              </Dropdown.Item>,
+                              <Dropdown.Item
+                                key="duplicate-table"
+                                icon={<IconCopy size="tiny" />}
+                                onClick={() => onDuplicateTable(table)}
+                              >
+                                Duplicate Table
+                              </Dropdown.Item>,
+                              <Link href={`/project/${ref}/auth/policies?search=${table.id}`}>
+                                <a>
+                                  <Dropdown.Item key="delete-table" icon={<IconLock size="tiny" />}>
+                                    View Policies
+                                  </Dropdown.Item>
+                                </a>
+                              </Link>,
+                              <Dropdown.Separator key="separator" />,
+                              <Dropdown.Item
+                                key="delete-table"
+                                icon={<IconTrash size="tiny" />}
+                                onClick={() => onDeleteTable(table)}
+                              >
+                                Delete Table
+                              </Dropdown.Item>,
+                            ]}
+                          >
+                            <div className="text-scale-900 transition-colors hover:text-scale-1200">
+                              <IconChevronDown size={14} strokeWidth={2} />
+                            </div>
+                          </Dropdown>
+                        )
+                      }
+                    />
+                  )
+                })}
+              </div>
+            </Menu>
+          )}
+
+          {/* List of views belonging to selected schema */}
+          {filteredViews.length > 0 && (
+            <Menu type="pills">
+              <Menu.Group
+                // @ts-ignore
+                title={
+                  <div className="flex w-full items-center space-x-1">
+                    <p>Views</p>
+                    <p style={{ fontVariantNumeric: 'tabular-nums' }}>({filteredViews.length})</p>
+                  </div>
+                }
+              />
+
+              {filteredViews.map((view: SchemaView) => {
+                const isActive = Number(id) === view.id
                 return (
-                  <ProductMenuItem
-                    key={table.name}
-                    url={`/project/${projectRef}/editor/${table.id}`}
-                    name={table.name}
-                    hoverText={table.comment ? table.comment : table.name}
-                    isActive={isActive}
-                    action={
-                      isActive &&
-                      !isLocked && (
-                        <Dropdown
-                          size="small"
-                          side="bottom"
-                          align="start"
-                          overlay={[
-                            <Dropdown.Item
-                              key="edit-table"
-                              icon={<IconEdit size="tiny" />}
-                              onClick={() => onEditTable(table)}
-                            >
-                              Edit Table
-                            </Dropdown.Item>,
-                            <Dropdown.Item
-                              key="duplicate-table"
-                              icon={<IconCopy size="tiny" />}
-                              onClick={() => onDuplicateTable(table)}
-                            >
-                              Duplicate Table
-                            </Dropdown.Item>,
-                            <Dropdown.Separator key="separator" />,
-                            <Dropdown.Item
-                              key="delete-table"
-                              icon={<IconTrash size="tiny" />}
-                              onClick={() => onDeleteTable(table)}
-                            >
-                              Delete Table
-                            </Dropdown.Item>,
-                          ]}
-                        >
-                          <div className="text-scale-900 transition-colors hover:text-scale-1200">
-                            <IconChevronDown size={14} strokeWidth={2} />
-                          </div>
-                        </Dropdown>
-                      )
-                    }
-                  />
+                  <Link key={view.id} href={`/project/${ref}/editor/${view.id}?type=view`}>
+                    <a>
+                      <Menu.Item key={view.id} rounded active={isActive}>
+                        <div className="flex justify-between">
+                          <p className="truncate">{view.name}</p>
+                        </div>
+                      </Menu.Item>
+                    </a>
+                  </Link>
                 )
               })}
-            </div>
-          </Menu>
-        )}
+            </Menu>
+          )}
 
-        {/* List of views belonging to selected schema */}
-        {filteredViews.length > 0 && (
-          <Menu type="pills">
-            <Menu.Group
-              // @ts-ignore
-              title={
-                <div className="flex w-full items-center space-x-1">
-                  <p>Views</p>
-                  <p style={{ fontVariantNumeric: 'tabular-nums' }}>({filteredViews.length})</p>
-                </div>
-              }
-            />
+          {/* List of foreign tables belonging to selected schema */}
+          {filteredForeignTables.length > 0 && (
+            <Menu type="pills">
+              <Menu.Group
+                // @ts-ignore
+                title={
+                  <div className="flex w-full items-center space-x-1">
+                    <p>Foreign Tables</p>
+                    <p style={{ fontVariantNumeric: 'tabular-nums' }}>
+                      ({filteredForeignTables.length})
+                    </p>
+                  </div>
+                }
+              />
 
-            {filteredViews.map((view: SchemaView) => {
-              const viewId = Base64.encode(JSON.stringify(view))
-              const isActive = id === viewId
-              return (
-                <Link key={viewId} href={`/project/${projectRef}/editor/${viewId}`}>
-                  <a>
-                    <Menu.Item key={viewId} rounded active={isActive}>
-                      <div className="flex justify-between">
-                        <p className="truncate">{view.name}</p>
-                      </div>
-                    </Menu.Item>
-                  </a>
-                </Link>
-              )
-            })}
-          </Menu>
-        )}
-
-        {/* List of foreign tables belonging to selected schema */}
-        {filteredForeignTables.length > 0 && (
-          <Menu type="pills">
-            <Menu.Group
-              // @ts-ignore
-              title={
-                <div className="flex w-full items-center space-x-1">
-                  <p>Foreign Tables</p>
-                  <p style={{ fontVariantNumeric: 'tabular-nums' }}>
-                    ({filteredForeignTables.length})
-                  </p>
-                </div>
-              }
-            />
-
-            {filteredForeignTables.map((table: Partial<PostgresTable>) => {
-              const isActive = Number(id) === table.id
-              return (
-                <Link key={table.id} href={`/project/${projectRef}/editor/${table.id}`}>
-                  <a>
-                    <Menu.Item key={table.id} rounded active={isActive}>
-                      <div className="flex justify-between">
-                        <p className="truncate">{table.name}</p>
-                      </div>
-                    </Menu.Item>
-                  </a>
-                </Link>
-              )
-            })}
-          </Menu>
-        )}
-      </div>
+              {filteredForeignTables.map((table: Partial<PostgresTable>) => {
+                const isActive = Number(id) === table.id
+                return (
+                  <Link key={table.id} href={`/project/${ref}/editor/${table.id}?type=foreign`}>
+                    <a>
+                      <Menu.Item key={table.id} rounded active={isActive}>
+                        <div className="flex justify-between">
+                          <p className="truncate">{table.name}</p>
+                        </div>
+                      </Menu.Item>
+                    </a>
+                  </Link>
+                )
+              })}
+            </Menu>
+          )}
+        </div>
+      )}
 
       {searchText.length > 0 && filteredTables.length === 0 && filteredViews.length === 0 && (
         <div className="!mt-0 mx-7 space-y-1 rounded-md border border-scale-400 bg-scale-300 py-3 px-4">
@@ -379,13 +386,6 @@ const TableEditorMenu: FC<Props> = ({
           </p>
         </div>
       )}
-
-      {searchText.length === 0 && filteredTables.length === 0 && filteredViews.length === 0 && (
-        <div className="!mt-0 mx-7 space-y-1 rounded-md border border-scale-400 bg-scale-300 py-3 px-4">
-          <p className="text-xs">No tables available</p>
-          <p className="text-xs text-scale-1100">This schema has no tables available yet</p>
-        </div>
-      )}
     </div>
   )
 }
diff --git a/studio/components/to-be-cleaned/Docs/Snippets.js b/studio/components/to-be-cleaned/Docs/Snippets.js
index 955409e15bb..0357c37a471 100644
--- a/studio/components/to-be-cleaned/Docs/Snippets.js
+++ b/studio/components/to-be-cleaned/Docs/Snippets.js
@@ -604,9 +604,10 @@ curl -X POST '${endpoint}/auth/v1/verify' \\
     js: {
       language: 'js',
       code: `
-let { data, error } = await supabase.auth.verifyOTP({
+let { data, error } = await supabase.auth.verifyOtp({
   phone: '+13334445555',
-  token: '123456'
+  token: '123456',
+  type: 'sms'
 })
 `,
     },
@@ -633,7 +634,7 @@ let { data, error } = await supabase.auth.api.inviteUserByEmail('someone@email.c
     },
   }),
   authThirdPartyLogin: (endpoint, apiKey) => ({
-    title: '',
+    title: 'Third Party Login',
     bash: {
       language: 'bash',
       code: ``,
@@ -680,7 +681,7 @@ const { data: { user } } = await supabase.auth.getUser()
     js: {
       language: 'js',
       code: `
-let { data, error } = await supabase.auth.api.resetPasswordForEmail(email)
+let { data, error } = await supabase.auth.resetPasswordForEmail(email)
 `,
     },
   }),
diff --git a/studio/components/to-be-cleaned/SqlEditor/TabSqlQuery.js b/studio/components/to-be-cleaned/SqlEditor/TabSqlQuery.js
index 28888b61c59..c377465d834 100644
--- a/studio/components/to-be-cleaned/SqlEditor/TabSqlQuery.js
+++ b/studio/components/to-be-cleaned/SqlEditor/TabSqlQuery.js
@@ -246,6 +246,16 @@ const ResultsDropdown = observer(() => {
     }
   }
 
+  const formatDataForCSV = (data = []) => {
+    return data.map((row) => {
+      const formattedRow = { ...row }
+      Object.keys(row).forEach((key) => {
+        if (typeof row[key] === 'object') formattedRow[key] = JSON.stringify(row[key])
+      })
+      return formattedRow
+    })
+  }
+
   return (
     <Dropdown
       side="bottom"
@@ -263,7 +273,7 @@ const ResultsDropdown = observer(() => {
       <CSVLink
         ref={csvRef}
         className="hidden"
-        data={sqlEditorStore.activeTab?.csvData || ''}
+        data={formatDataForCSV(sqlEditorStore.activeTab?.csvData || '')}
         filename={`supabase_${sqlEditorStore.projectRef}_${sqlEditorStore.activeTab.name}`}
       />
     </Dropdown>
diff --git a/studio/components/to-be-cleaned/Storage/Storage.constants.ts b/studio/components/to-be-cleaned/Storage/Storage.constants.ts
index 2620cf9fb2d..94fecf605f3 100644
--- a/studio/components/to-be-cleaned/Storage/Storage.constants.ts
+++ b/studio/components/to-be-cleaned/Storage/Storage.constants.ts
@@ -1,3 +1,9 @@
+export const URL_EXPIRY_DURATION = {
+  WEEK: 60 * 60 * 24 * 7,
+  MONTH: 60 * 60 * 24 * 30,
+  YEAR: 60 * 60 * 24 * 365,
+}
+
 export const STORAGE_VIEWS = {
   COLUMNS: 'COLUMNS',
   LIST: 'LIST',
diff --git a/studio/components/to-be-cleaned/Storage/StorageExplorer/CustomExpiryModal.tsx b/studio/components/to-be-cleaned/Storage/StorageExplorer/CustomExpiryModal.tsx
new file mode 100644
index 00000000000..f702ba38bfa
--- /dev/null
+++ b/studio/components/to-be-cleaned/Storage/StorageExplorer/CustomExpiryModal.tsx
@@ -0,0 +1,78 @@
+import { FC } from 'react'
+import { Form, Modal, Input, Button } from 'ui'
+import { observer } from 'mobx-react-lite'
+import { useStorageStore } from 'localStores/storageExplorer/StorageExplorerStore'
+
+interface Props {}
+
+const CustomExpiryModal: FC<Props> = () => {
+  const storageExplorerStore = useStorageStore()
+  const { selectedFileCustomExpiry, setSelectedFileCustomExpiry, copyFileURLToClipboard } =
+    storageExplorerStore
+
+  const visible = selectedFileCustomExpiry !== undefined
+  const onClose = () => setSelectedFileCustomExpiry(undefined)
+
+  return (
+    <Modal
+      hideFooter
+      size="small"
+      header="Custom expiry for signed URL"
+      visible={visible}
+      alignFooter="right"
+      confirmText="Get URL"
+      onCancel={() => onClose()}
+    >
+      <Form
+        validateOnBlur
+        initialValues={{ expiresIn: '' }}
+        onSubmit={async (values: any, { setSubmitting }: any) => {
+          setSubmitting(true)
+          await copyFileURLToClipboard(selectedFileCustomExpiry, values.expiresIn)
+          setSubmitting(false)
+          onClose()
+        }}
+        validate={(values: any) => {
+          const errors: any = {}
+          if (values.expiresIn !== '' && values.expiresIn <= 0)
+            errors.expiresIn = 'Expiry duration cannot be less than 0'
+          return errors
+        }}
+      >
+        {({ values, isSubmitting }: { values: any; isSubmitting: boolean }) => (
+          <>
+            <div className="py-6">
+              <Modal.Content>
+                <Input
+                  disabled={isSubmitting}
+                  type="number"
+                  id="expiresIn"
+                  label="Enter the duration for which the URL will be valid:"
+                  actions={<p className="text-sm text-scale-1000 mr-2">seconds</p>}
+                />
+              </Modal.Content>
+            </div>
+            <Modal.Separator />
+            <Modal.Content>
+              <div className="flex items-center justify-end space-x-2 pt-1 pb-3">
+                <Button type="default" onClick={() => onClose()}>
+                  Cancel
+                </Button>
+                <Button
+                  disabled={values.expiresIn === '' || isSubmitting}
+                  loading={isSubmitting}
+                  htmlType="submit"
+                  type="primary"
+                >
+                  Get signed URL
+                </Button>
+              </div>
+            </Modal.Content>
+          </>
+        )}
+      </Form>
+    </Modal>
+  )
+}
+
+export default observer(CustomExpiryModal)
diff --git a/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorer.js b/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorer.js
index c76f2d2a2e4..69e9a354f06 100644
--- a/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorer.js
+++ b/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorer.js
@@ -1,10 +1,12 @@
 import React, { useEffect, useRef } from 'react'
-import { STORAGE_VIEWS, CONTEXT_MENU_KEYS } from '../Storage.constants'
+import { observer } from 'mobx-react-lite'
 
+import { STORAGE_VIEWS, CONTEXT_MENU_KEYS } from '../Storage.constants'
 import ItemContextMenu from './ItemContextMenu'
 import FolderContextMenu from './FolderContextMenu'
 import ColumnContextMenu from './ColumnContextMenu'
 import FileExplorerColumn from './FileExplorerColumn'
+import { useStorageStore } from 'localStores/storageExplorer/StorageExplorerStore'
 
 const FileExplorer = ({
   view = STORAGE_VIEWS.COLUMNS,
@@ -12,18 +14,7 @@ const FileExplorer = ({
   openedFolders = [],
   selectedItems = [],
   selectedFilePreview = {},
-  onCheckItem = () => {},
-  onSelectItemDelete = () => {},
-  onSelectItemRename = () => {},
-  onSelectItemMove = () => {},
-  onSelectFile = () => {},
-  onRenameFile = () => {},
   onFilesUpload = () => {},
-  onCopyFileURL = () => {},
-  onDownloadFile = () => {},
-  onSelectFolder = () => {},
-  onRenameFolder = () => {},
-  onCreateFolder = () => {},
   onSelectAllItemsInColumn = () => {},
   onSelectColumnEmptySpace = () => {},
   onSelectCreateFolder = () => {},
@@ -33,6 +24,9 @@ const FileExplorer = ({
   onColumnLoadMore = () => {},
 }) => {
   const fileExplorerRef = useRef(null)
+  const storageExplorerStore = useStorageStore()
+
+  const { setSelectedItemToRename, setSelectedItemsToDelete } = storageExplorerStore
 
   useEffect(() => {
     if (fileExplorerRef) {
@@ -56,18 +50,11 @@ const FileExplorer = ({
         onSelectSort={onChangeSortBy}
         onSelectSortByOrder={onChangeSortByOrder}
       />
-      <ItemContextMenu
-        id={CONTEXT_MENU_KEYS.STORAGE_ITEM}
-        onCopyFileURL={onCopyFileURL}
-        onSelectItemRename={onSelectItemRename}
-        onSelectItemMove={onSelectItemMove}
-        onDownloadFile={onDownloadFile}
-        onSelectItemDelete={onSelectItemDelete}
-      />
+      <ItemContextMenu id={CONTEXT_MENU_KEYS.STORAGE_ITEM} />
       <FolderContextMenu
         id={CONTEXT_MENU_KEYS.STORAGE_FOLDER}
-        onRenameFolder={onSelectItemRename}
-        onDeleteFolder={onSelectItemDelete}
+        onRenameFolder={(folder) => setSelectedItemToRename(folder)}
+        onDeleteFolder={(folder) => setSelectedItemsToDelete([folder])}
       />
       {view === STORAGE_VIEWS.COLUMNS ? (
         <div className="flex">
@@ -80,18 +67,7 @@ const FileExplorer = ({
               openedFolders={openedFolders}
               selectedItems={selectedItems}
               selectedFilePreview={selectedFilePreview}
-              onCheckItem={onCheckItem}
-              onSelectFile={onSelectFile}
-              onRenameFile={onRenameFile}
-              onCopyFileURL={onCopyFileURL}
               onFilesUpload={onFilesUpload}
-              onDownloadFile={onDownloadFile}
-              onSelectFolder={onSelectFolder}
-              onRenameFolder={onRenameFolder}
-              onCreateFolder={onCreateFolder}
-              onSelectItemDelete={onSelectItemDelete}
-              onSelectItemRename={onSelectItemRename}
-              onSelectItemMove={onSelectItemMove}
               onSelectAllItemsInColumn={onSelectAllItemsInColumn}
               onSelectColumnEmptySpace={onSelectColumnEmptySpace}
               onColumnLoadMore={onColumnLoadMore}
@@ -108,18 +84,7 @@ const FileExplorer = ({
               column={columns[columns.length - 1]}
               selectedItems={selectedItems}
               selectedFilePreview={selectedFilePreview}
-              onCheckItem={onCheckItem}
-              onSelectFile={onSelectFile}
-              onRenameFile={onRenameFile}
-              onCopyFileURL={onCopyFileURL}
               onFilesUpload={onFilesUpload}
-              onDownloadFile={onDownloadFile}
-              onSelectFolder={onSelectFolder}
-              onRenameFolder={onRenameFolder}
-              onCreateFolder={onCreateFolder}
-              onSelectItemDelete={onSelectItemDelete}
-              onSelectItemRename={onSelectItemRename}
-              onSelectItemMove={onSelectItemMove}
               onSelectAllItemsInColumn={onSelectAllItemsInColumn}
               onSelectColumnEmptySpace={onSelectColumnEmptySpace}
               onColumnLoadMore={onColumnLoadMore}
@@ -133,4 +98,4 @@ const FileExplorer = ({
   )
 }
 
-export default FileExplorer
+export default observer(FileExplorer)
diff --git a/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerColumn.js b/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerColumn.js
index bc418c2f92a..db2a5886e1b 100644
--- a/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerColumn.js
+++ b/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerColumn.js
@@ -57,18 +57,7 @@ const FileExplorerColumn = ({
   openedFolders = [],
   selectedItems = [],
   selectedFilePreview = {},
-  onCheckItem = () => {},
-  onSelectItemDelete = () => {},
-  onSelectItemRename = () => {},
-  onSelectItemMove = () => {},
-  onSelectFile = () => {},
-  onRenameFile = () => {},
-  onCopyFileURL = () => {},
   onFilesUpload = () => {},
-  onDownloadFile = () => {},
-  onSelectFolder = () => {},
-  onRenameFolder = () => {},
-  onCreateFolder = () => {},
   onSelectAllItemsInColumn = () => {},
   onSelectColumnEmptySpace = () => {},
   onColumnLoadMore = () => {},
@@ -212,17 +201,15 @@ const FileExplorerColumn = ({
           selectedItems,
           openedFolders,
           selectedFilePreview,
-          onCheckItem,
-          onSelectFile,
-          onRenameFile,
-          onCopyFileURL,
-          onDownloadFile,
-          onSelectFolder,
-          onRenameFolder,
-          onCreateFolder,
-          onSelectItemDelete,
-          onSelectItemRename,
-          onSelectItemMove,
+          // onCheckItem,
+          // onRenameFile,
+          // onCopyFileURL,
+          // onDownloadFile,
+          // onRenameFolder,
+          // onCreateFolder,
+          // onSelectItemDelete,
+          // onSelectItemRename,
+          // onSelectItemMove,
         }}
         ItemComponent={FileExplorerRow}
         getItemSize={(index) => (index !== 0 && index === columnItems.length ? 85 : 37)}
diff --git a/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerRow.js b/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerRow.tsx
similarity index 66%
rename from studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerRow.js
rename to studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerRow.tsx
index 6712cc90e09..b5bd5982c23 100644
--- a/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerRow.js
+++ b/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerRow.tsx
@@ -1,4 +1,4 @@
-import { useState, useRef, useEffect } from 'react'
+import { FC, useState, useRef, useEffect } from 'react'
 import { find, has, isEmpty, isEqual } from 'lodash'
 import {
   Checkbox,
@@ -11,10 +11,11 @@ import {
   IconFile,
   IconAlertCircle,
   IconDownload,
-  IconTrash,
-  IconCopy,
   IconEdit,
   IconMove,
+  IconClipboard,
+  IconTrash2,
+  IconChevronRight,
 } from 'ui'
 import SVG from 'react-inlinesvg'
 import * as Tooltip from '@radix-ui/react-tooltip'
@@ -24,11 +25,12 @@ import {
   STORAGE_ROW_TYPES,
   STORAGE_ROW_STATUS,
   CONTEXT_MENU_KEYS,
-} from '../Storage.constants.ts'
+  URL_EXPIRY_DURATION,
+} from '../Storage.constants'
 import { formatBytes } from 'lib/helpers'
 import { useStorageStore } from 'localStores/storageExplorer/StorageExplorerStore'
 
-const RowIcon = ({ view, status, fileType, mimeType }) => {
+const RowIcon = ({ view, status, fileType, mimeType }: any) => {
   if (view === STORAGE_VIEWS.LIST && status === STORAGE_ROW_STATUS.LOADING) {
     return <IconLoader size={16} strokeWidth={2} className="animate-spin" />
   }
@@ -43,7 +45,6 @@ const RowIcon = ({ view, status, fileType, mimeType }) => {
     return (
       <SVG
         src={iconSrc}
-        alt={fileType}
         preProcessor={(code) =>
           code.replace(/svg/, 'svg class="w-4 h-4 text-color-inherit opacity-75"')
         }
@@ -66,28 +67,44 @@ const RowIcon = ({ view, status, fileType, mimeType }) => {
   return <IconFile size={16} strokeWidth={2} />
 }
 
-const FileExplorerRow = ({
+interface Props {
+  item: any
+  view: string
+  columnIndex: number
+  selectedItems: any[]
+  openedFolders: any[]
+  selectedFilePreview: any
+}
+
+const FileExplorerRow: FC<Props> = ({
   item = {},
   view = STORAGE_VIEWS.COLUMNS,
   columnIndex = 0,
   selectedItems = [],
   openedFolders = [],
   selectedFilePreview = {},
-
-  onCheckItem = () => {},
-  onSelectFile = () => {},
-  onRenameFile = () => {},
-  onCopyFileURL = () => {},
-  onDownloadFile = () => {},
-  onSelectFolder = () => {},
-  onRenameFolder = () => {},
-  onCreateFolder = () => {},
-  onSelectItemDelete = () => {},
-  onSelectItemRename = () => {},
-  onSelectItemMove = () => {},
 }) => {
   const storageExplorerStore = useStorageStore()
-  const { downloadFolder } = storageExplorerStore
+  const {
+    popColumnAtIndex,
+    pushOpenedFolderAtIndex,
+    popOpenedFoldersAtIndex,
+    setFilePreview,
+    closeFilePreview,
+    clearSelectedItems,
+    addNewFolder,
+    renameFolder,
+    renameFile,
+    setSelectedItems,
+    setSelectedItemsToDelete,
+    setSelectedItemToRename,
+    setSelectedItemsToMove,
+    setSelectedFileCustomExpiry,
+    fetchFolderContents,
+    downloadFile,
+    downloadFolder,
+    copyFileURLToClipboard,
+  } = storageExplorerStore
 
   const itemWithColumnIndex = { ...item, columnIndex }
   const isSelected = find(selectedItems, item) !== undefined
@@ -95,25 +112,47 @@ const FileExplorerRow = ({
     openedFolders.length > columnIndex ? isEqual(openedFolders[columnIndex], item) : false
   const isPreviewed = !isEmpty(selectedFilePreview) && isEqual(selectedFilePreview.id, item.id)
 
+  const onSelectFile = async (columnIndex: number, file: any) => {
+    popColumnAtIndex(columnIndex)
+    popOpenedFoldersAtIndex(columnIndex - 1)
+    setFilePreview(file)
+    clearSelectedItems()
+  }
+
+  const onSelectFolder = async (columnIndex: number, folder: any) => {
+    closeFilePreview()
+    clearSelectedItems(columnIndex + 1)
+    popOpenedFoldersAtIndex(columnIndex - 1)
+    pushOpenedFolderAtIndex(folder, columnIndex)
+    await fetchFolderContents(folder.id, folder.name, columnIndex)
+  }
+
+  const onCheckItem = (item: any) => {
+    if (find(selectedItems, item) === undefined) {
+      setSelectedItems(selectedItems.concat([item]))
+    } else {
+      setSelectedItems(selectedItems.filter((selectedItem: any) => item.id !== selectedItem.id))
+    }
+    closeFilePreview()
+  }
+
   if (item.status === STORAGE_ROW_STATUS.EDITING) {
-    const inputRef = useRef(null)
+    const inputRef = useRef<any>(null)
     const [itemName, setItemName] = useState(item.name)
 
     useEffect(() => {
-      if (inputRef.current) {
-        inputRef.current.select()
-      }
+      if (inputRef.current) inputRef.current.select()
     }, [])
 
-    const onSetItemName = (event) => {
+    const onSetItemName = async (event: any) => {
       event.preventDefault()
       event.stopPropagation()
       if (item.type === STORAGE_ROW_TYPES.FILE) {
-        onRenameFile(item, itemName, columnIndex)
+        await renameFile(item, itemName, columnIndex)
       } else if (has(item, 'id')) {
-        onRenameFolder(itemWithColumnIndex, itemName, columnIndex)
+        renameFolder(itemWithColumnIndex, itemName, columnIndex)
       } else {
-        onCreateFolder(itemName, columnIndex)
+        addNewFolder(itemName, columnIndex)
       }
     }
 
@@ -146,57 +185,78 @@ const FileExplorerRow = ({
   }
 
   const rowOptions =
-    item.type === STORAGE_ROW_TYPES.BUCKET
-      ? [{ name: 'Delete', onClick: () => onSelectItemDelete(itemWithColumnIndex) }]
-      : item.type === STORAGE_ROW_TYPES.FOLDER
+    item.type === STORAGE_ROW_TYPES.FOLDER
       ? [
           {
             name: 'Rename',
             icon: <IconEdit size="tiny" />,
-            onClick: () => onSelectItemRename(itemWithColumnIndex),
+            onClick: () => setSelectedItemToRename(itemWithColumnIndex),
           },
           {
             name: 'Download',
             icon: <IconDownload size="tiny" />,
             onClick: () => downloadFolder(itemWithColumnIndex),
           },
-          { name: 'Separator' },
+          { name: 'Separator', icon: undefined, onClick: undefined },
           {
             name: 'Delete',
-            icon: <IconTrash size="tiny" />,
-            onClick: () => onSelectItemDelete(itemWithColumnIndex),
+            icon: <IconTrash2 size="tiny" />,
+            onClick: () => setSelectedItemsToDelete([itemWithColumnIndex]),
           },
         ]
       : [
           ...(!item.isCorrupted
             ? [
                 {
-                  name: 'Copy URL',
-                  icon: <IconCopy size="tiny" />,
-                  onClick: () => onCopyFileURL(itemWithColumnIndex),
+                  name: 'Get URL',
+                  icon: <IconClipboard size="tiny" />,
+                  children: [
+                    {
+                      name: 'Expire in 1 week',
+                      onClick: async () =>
+                        await copyFileURLToClipboard(itemWithColumnIndex, URL_EXPIRY_DURATION.WEEK),
+                    },
+                    {
+                      name: 'Expire in 1 month',
+                      onClick: async () =>
+                        await copyFileURLToClipboard(
+                          itemWithColumnIndex,
+                          URL_EXPIRY_DURATION.MONTH
+                        ),
+                    },
+                    {
+                      name: 'Expire in 1 year',
+                      onClick: async () =>
+                        await copyFileURLToClipboard(itemWithColumnIndex, URL_EXPIRY_DURATION.YEAR),
+                    },
+                    {
+                      name: 'Custom expiry',
+                      onClick: async () => setSelectedFileCustomExpiry(itemWithColumnIndex),
+                    },
+                  ],
                 },
                 {
                   name: 'Rename',
                   icon: <IconEdit size="tiny" />,
-                  onClick: () => onSelectItemRename(itemWithColumnIndex),
+                  onClick: () => setSelectedItemToRename(itemWithColumnIndex),
                 },
                 {
                   name: 'Move',
                   icon: <IconMove size="tiny" />,
-                  onClick: () => onSelectItemMove(itemWithColumnIndex),
+                  onClick: () => setSelectedItemsToMove([itemWithColumnIndex]),
                 },
                 {
                   name: 'Download',
                   icon: <IconDownload size="tiny" />,
-                  onClick: () => onDownloadFile(itemWithColumnIndex),
+                  onClick: async () => await downloadFile(itemWithColumnIndex),
                 },
-                { name: 'Separator' },
+                { name: 'Separator', icon: undefined, onClick: undefined },
               ]
             : []),
           {
             name: 'Delete',
-            icon: <IconTrash size="tiny" />,
-            onClick: () => onSelectItemDelete(itemWithColumnIndex),
+            icon: <IconTrash2 size="tiny" />,
+            onClick: () => setSelectedItemsToDelete([itemWithColumnIndex]),
           },
         ]
 
@@ -206,7 +266,7 @@ const FileExplorerRow = ({
   const updatedAt = item.updated_at ? new Date(item.updated_at).toLocaleString() : '-'
 
   const { show } = useContextMenu()
-  const displayMenu = (event, rowType) => {
+  const displayMenu = (event: any, rowType: any) => {
     show(event, {
       id:
         rowType === STORAGE_ROW_TYPES.FILE
@@ -342,7 +402,36 @@ const FileExplorerRow = ({
               align="end"
               overlay={[
                 rowOptions.map((option) => {
-                  if (option.name === 'Separator') {
+                  if ((option?.children ?? []).length > 0) {
+                    return (
+                      <Dropdown
+                        isNested
+                        key={option.name}
+                        side="right"
+                        align="start"
+                        overlay={(option?.children ?? [])?.map((child) => {
+                          return (
+                            <Dropdown.Item key={child.name} onClick={child.onClick}>
+                              {child.name}
+                            </Dropdown.Item>
+                          )
+                        })}
+                      >
+                        <div
+                          className={[
+                            'flex items-center justify-between px-4 py-1.5 text-xs text-scale-1100',
+                            'w-full focus:bg-scale-300 dark:focus:bg-scale-500 focus:text-scale-1200',
+                          ].join(' ')}
+                        >
+                          <div className="flex items-center space-x-2">
+                            {option.icon}
+                            <p>{option.name}</p>
+                          </div>
+                          <IconChevronRight size="tiny" />
+                        </div>
+                      </Dropdown>
+                    )
+                  } else if (option.name === 'Separator') {
                     return <Dropdown.Separator key="row-separator" />
                   } else {
                     return (
diff --git a/studio/components/to-be-cleaned/Storage/StorageExplorer/ItemContextMenu.js b/studio/components/to-be-cleaned/Storage/StorageExplorer/ItemContextMenu.js
index 993fd661b14..eb48047e271 100644
--- a/studio/components/to-be-cleaned/Storage/StorageExplorer/ItemContextMenu.js
+++ b/studio/components/to-be-cleaned/Storage/StorageExplorer/ItemContextMenu.js
@@ -1,43 +1,97 @@
-import { Menu, Item } from 'react-contexify'
+import { observer } from 'mobx-react-lite'
+import { Menu, Item, Separator, Submenu } from 'react-contexify'
 import 'react-contexify/dist/ReactContexify.css'
+import { IconClipboard, IconEdit, IconMove, IconDownload, IconTrash2, IconChevronRight } from 'ui'
+
+import { URL_EXPIRY_DURATION } from '../Storage.constants'
+import { useStorageStore } from 'localStores/storageExplorer/StorageExplorerStore'
+
+const ItemContextMenu = ({ id = '' }) => {
+  const storageExplorerStore = useStorageStore()
+  const {
+    downloadFile,
+    selectedBucket,
+    setSelectedItemsToDelete,
+    setSelectedItemToRename,
+    setSelectedItemsToMove,
+    setSelectedFileCustomExpiry,
+    copyFileURLToClipboard,
+  } = storageExplorerStore
+  const isPublic = selectedBucket.public
+
+  const onHandleClick = async (event, item, expiresIn) => {
+    if (item.isCorrupted) return
+    switch (event) {
+      case 'copy':
+        if (expiresIn < 0) return setSelectedFileCustomExpiry(item)
+        else return await copyFileURLToClipboard(item, expiresIn)
+      case 'rename':
+        return setSelectedItemToRename(item)
+      case 'move':
+        return setSelectedItemsToMove([item])
+      case 'download':
+        return await downloadFile(item)
+      default:
+        break
+    }
+  }
 
-const ItemContextMenu = ({
-  id = '',
-  onCopyFileURL = () => {},
-  onSelectItemRename = () => {},
-  onSelectItemMove = () => {},
-  onDownloadFile = () => {},
-  onSelectItemDelete = () => {},
-}) => {
   return (
     <Menu id={id} animation="fade" className="!bg-scale-300 border border-scale-500">
-      <Item
-        onClick={({ props }) => (!props.item.isCorrupted ? onCopyFileURL(props.item) : () => {})}
-      >
-        <span className="text-xs">Copy URL</span>
+      {isPublic ? (
+        <Item onClick={({ props }) => onHandleClick('copy', props.item)}>
+          <IconClipboard size="tiny" />
+          <span className="ml-2 text-xs">Get URL</span>
+        </Item>
+      ) : (
+        <Submenu
+          label={
+            <div className="flex items-center space-x-2">
+              <IconClipboard size="tiny" />
+              <span className="text-xs">Get URL</span>
+            </div>
+          }
+          arrow={<IconChevronRight size="tiny" />}
+        >
+          <Item
+            onClick={({ props }) => onHandleClick('copy', props.item, URL_EXPIRY_DURATION.WEEK)}
+          >
+            <span className="ml-2 text-xs">Expire in 1 week</span>
+          </Item>
+          <Item
+            onClick={({ props }) => onHandleClick('copy', props.item, URL_EXPIRY_DURATION.MONTH)}
+          >
+            <span className="ml-2 text-xs">Expire in 1 month</span>
+          </Item>
+          <Item
+            onClick={({ props }) => onHandleClick('copy', props.item, URL_EXPIRY_DURATION.YEAR)}
+          >
+            <span className="ml-2 text-xs">Expire in 1 year</span>
+          </Item>
+          <Item onClick={({ props }) => onHandleClick('copy', props.item, -1)}>
+            <span className="ml-2 text-xs">Custom expiry</span>
+          </Item>
+        </Submenu>
+      )}
+      <Item onClick={({ props }) => onHandleClick('rename', props.item)}>
+        <IconEdit size="tiny" />
+        <span className="ml-2 text-xs">Rename</span>
       </Item>
-      <Item
-        onClick={({ props }) =>
-          !props.item.isCorrupted ? onSelectItemRename(props.item) : () => {}
-        }
-      >
-        <span className="text-xs">Rename</span>
+      <Item onClick={({ props }) => onHandleClick('move', props.item)}>
+        <IconMove size="tiny" />
+        <span className="ml-2 text-xs">Move</span>
       </Item>
-      <Item
-        onClick={({ props }) => (!props.item.isCorrupted ? onSelectItemMove(props.item) : () => {})}
-      >
-        <span className="text-xs">Move</span>
+      <Item onClick={({ props }) => onHandleClick('download', props.item)}>
+        <IconDownload size="tiny" />
+        <span className="ml-2 text-xs">Download</span>
       </Item>
-      <Item
-        onClick={({ props }) => (!props.item.isCorrupted ? onDownloadFile(props.item) : () => {})}
-      >
-        <span className="text-xs">Download</span>
-      </Item>
-      <Item onClick={({ props }) => onSelectItemDelete(props.item)}>
-        <span className="text-xs">Delete</span>
+      <Separator />
+      <Item onClick={({ props }) => setSelectedItemsToDelete([props.item])}>
+        <IconTrash2 size="tiny" />
+        <span className="ml-2 text-xs">Delete</span>
       </Item>
     </Menu>
   )
 }
 
-export default ItemContextMenu
+export default observer(ItemContextMenu)
diff --git a/studio/components/to-be-cleaned/Storage/StorageExplorer/PreviewPane.tsx b/studio/components/to-be-cleaned/Storage/StorageExplorer/PreviewPane.tsx
index 49066467eae..205e6fbbba6 100644
--- a/studio/components/to-be-cleaned/Storage/StorageExplorer/PreviewPane.tsx
+++ b/studio/components/to-be-cleaned/Storage/StorageExplorer/PreviewPane.tsx
@@ -1,17 +1,20 @@
+import Link from 'next/link'
 import { isEmpty } from 'lodash'
 import {
   Button,
+  Dropdown,
   IconX,
   IconLoader,
   IconClipboard,
   IconDownload,
   IconTrash2,
   IconAlertCircle,
+  IconChevronDown,
 } from 'ui'
 import SVG from 'react-inlinesvg'
 import { formatBytes } from 'lib/helpers'
 import { Transition } from '@headlessui/react'
-import Link from 'next/link'
+import { URL_EXPIRY_DURATION } from '../Storage.constants'
 import { useStorageStore } from 'localStores/storageExplorer/StorageExplorerStore'
 
 const PreviewFile = ({ mimeType, previewUrl }: { mimeType: string; previewUrl: string }) => {
@@ -90,10 +93,12 @@ const PreviewFile = ({ mimeType, previewUrl }: { mimeType: string; previewUrl: s
 const PreviewPane = () => {
   const storageExplorerStore = useStorageStore()
   const {
+    selectedBucket,
     selectedFilePreview: file,
     copyFileURLToClipboard,
     closeFilePreview,
     setSelectedItemsToDelete,
+    setSelectedFileCustomExpiry,
   } = storageExplorerStore
 
   const width = 450
@@ -104,104 +109,148 @@ const PreviewPane = () => {
   const updatedAt = file.updated_at ? new Date(file.updated_at).toLocaleString() : 'Unknown'
 
   return (
-    <Transition
-      show={isOpen}
-      enter="transition ease-out duration-150"
-      enterFrom="transform opacity-0"
-      enterTo="transform opacity-100"
-      leave="transition ease-in duration-100"
-      leaveFrom="transform opacity-100"
-      leaveTo="transform opacity-0"
-    >
-      <div
-        className="
+    <>
+      <Transition
+        show={isOpen}
+        enter="transition ease-out duration-150"
+        enterFrom="transform opacity-0"
+        enterTo="transform opacity-100"
+        leave="transition ease-in duration-100"
+        leaveFrom="transform opacity-100"
+        leaveTo="transform opacity-0"
+      >
+        <div
+          className="
         h-full border-l
         border-panel-border-light bg-panel-header-light p-4 dark:border-panel-border-dark dark:bg-panel-header-dark"
-        style={{ width }}
-      >
-        {/* Preview Header */}
-        <div className="flex w-full justify-end text-scale-900 transition-colors hover:text-scale-1200">
-          <IconX
-            className="cursor-pointer"
-            size={14}
-            strokeWidth={2}
-            onClick={() => closeFilePreview()}
-          />
-        </div>
-
-        {/* Preview Thumbnail*/}
-        <div className="my-4 border border-panel-border-light dark:border-panel-border-dark">
-          <div className="flex h-56 w-full items-center 2xl:h-72">
-            <PreviewFile mimeType={mimeType} previewUrl={file.previewUrl} />
+          style={{ width }}
+        >
+          {/* Preview Header */}
+          <div className="flex w-full justify-end text-scale-900 transition-colors hover:text-scale-1200">
+            <IconX
+              className="cursor-pointer"
+              size={14}
+              strokeWidth={2}
+              onClick={() => closeFilePreview()}
+            />
           </div>
-        </div>
 
-        <div className="w-full space-y-6">
-          {/* Preview Information */}
-          <div className="space-y-1">
-            <h5 className="break-words text-base text-scale-1200">{file.name}</h5>
-            {file.isCorrupted && (
-              <div className="flex items-center space-x-2">
-                <IconAlertCircle size={14} strokeWidth={2} className="text-scale-1100" />
+          {/* Preview Thumbnail*/}
+          <div className="my-4 border border-panel-border-light dark:border-panel-border-dark">
+            <div className="flex h-56 w-full items-center 2xl:h-72">
+              <PreviewFile mimeType={mimeType} previewUrl={file.previewUrl} />
+            </div>
+          </div>
+
+          <div className="w-full space-y-6">
+            {/* Preview Information */}
+            <div className="space-y-1">
+              <h5 className="break-words text-base text-scale-1200">{file.name}</h5>
+              {file.isCorrupted && (
+                <div className="flex items-center space-x-2">
+                  <IconAlertCircle size={14} strokeWidth={2} className="text-scale-1100" />
+                  <p className="text-sm text-scale-1100">
+                    File is corrupted, please delete and reupload this file again
+                  </p>
+                </div>
+              )}
+              {mimeType && (
                 <p className="text-sm text-scale-1100">
-                  File is corrupted, please delete and reupload this file again
+                  {mimeType}
+                  {size && <span> - {size}</span>}
                 </p>
+              )}
+            </div>
+
+            {/* Preview Metadata */}
+            <div className="space-y-2">
+              <div>
+                <label className="mb-1 text-xs text-scale-900">Added on</label>
+                <p className="text-sm text-scale-1100">{createdAt}</p>
+              </div>
+              <div>
+                <label className="mb-1 text-xs text-scale-900">Last modified</label>
+                <p className="text-sm text-scale-1100">{updatedAt}</p>
               </div>
-            )}
-            {mimeType && (
-              <p className="text-sm text-scale-1100">
-                {mimeType}
-                {size && <span> - {size}</span>}
-              </p>
-            )}
-          </div>
-
-          {/* Preview Metadata */}
-          <div className="space-y-2">
-            <div>
-              <label className="mb-1 text-xs text-scale-900">Added on</label>
-              <p className="text-sm text-scale-1100">{createdAt}</p>
             </div>
-            <div>
-              <label className="mb-1 text-xs text-scale-900">Last modified</label>
-              <p className="text-sm text-scale-1100">{updatedAt}</p>
-            </div>
-          </div>
 
-          {/* Actions */}
-          <div className="flex space-x-2 border-b border-panel-border-light pb-4 dark:border-panel-border-dark">
-            <Link href={`${file.previewUrl}&download`}>
-              <a>
+            {/* Actions */}
+            <div className="flex space-x-2 border-b border-panel-border-light pb-4 dark:border-panel-border-dark">
+              <Link href={`${file.previewUrl}&download`}>
+                <a>
+                  <Button
+                    type="default"
+                    icon={<IconDownload size={16} strokeWidth={2} />}
+                    disabled={file.isCorrupted}
+                  >
+                    Download
+                  </Button>
+                </a>
+              </Link>
+              {selectedBucket.public ? (
                 <Button
-                  type="default"
-                  icon={<IconDownload size={16} strokeWidth={2} />}
+                  type="outline"
+                  icon={<IconClipboard size={16} strokeWidth={2} />}
+                  onClick={async () => await copyFileURLToClipboard(file)}
                   disabled={file.isCorrupted}
                 >
-                  Download
+                  Get URL
                 </Button>
-              </a>
-            </Link>
+              ) : (
+                <Dropdown
+                  side="bottom"
+                  align="center"
+                  overlay={[
+                    <Dropdown.Item
+                      onClick={async () =>
+                        await copyFileURLToClipboard(file, URL_EXPIRY_DURATION.WEEK)
+                      }
+                    >
+                      Expire in 1 week
+                    </Dropdown.Item>,
+                    <Dropdown.Item
+                      onClick={async () =>
+                        await copyFileURLToClipboard(file, URL_EXPIRY_DURATION.MONTH)
+                      }
+                    >
+                      Expire in 1 month
+                    </Dropdown.Item>,
+                    <Dropdown.Item
+                      onClick={async () =>
+                        await copyFileURLToClipboard(file, URL_EXPIRY_DURATION.YEAR)
+                      }
+                    >
+                      Expire in 1 year
+                    </Dropdown.Item>,
+                    <Dropdown.Item onClick={() => setSelectedFileCustomExpiry(file)}>
+                      Custom expiry
+                    </Dropdown.Item>,
+                  ]}
+                >
+                  <Button
+                    type="outline"
+                    icon={<IconClipboard size={16} strokeWidth={2} />}
+                    iconRight={<IconChevronDown />}
+                    disabled={file.isCorrupted}
+                  >
+                    Get URL
+                  </Button>
+                </Dropdown>
+              )}
+            </div>
             <Button
               type="outline"
-              icon={<IconClipboard size={16} strokeWidth={2} />}
-              onClick={async () => await copyFileURLToClipboard(file)}
-              disabled={file.isCorrupted}
+              shadow={false}
+              size="tiny"
+              icon={<IconTrash2 size={16} strokeWidth={2} />}
+              onClick={() => setSelectedItemsToDelete([file])}
             >
-              Copy URL
+              Delete file
             </Button>
           </div>
-          <Button
-            type="outline"
-            shadow={false}
-            size="tiny"
-            icon={<IconTrash2 size={16} strokeWidth={2} />}
-            onClick={() => setSelectedItemsToDelete([file])}
-          >
-            Delete file
-          </Button>
         </div>
-      </div>
-    </Transition>
+      </Transition>
+    </>
   )
 }
 
diff --git a/studio/components/to-be-cleaned/Storage/StorageExplorer/StorageExplorer.js b/studio/components/to-be-cleaned/Storage/StorageExplorer/StorageExplorer.js
index 23da2ae932e..b19374ff0ba 100644
--- a/studio/components/to-be-cleaned/Storage/StorageExplorer/StorageExplorer.js
+++ b/studio/components/to-be-cleaned/Storage/StorageExplorer/StorageExplorer.js
@@ -1,6 +1,6 @@
 import { useEffect, useState, useRef } from 'react'
 import { observer } from 'mobx-react-lite'
-import { compact, find, isEmpty, uniqBy, get } from 'lodash'
+import { compact, isEmpty, uniqBy, get } from 'lodash'
 
 import { useStorageStore } from 'localStores/storageExplorer/StorageExplorerStore'
 import { STORAGE_ROW_TYPES } from '../Storage.constants'
@@ -11,47 +11,38 @@ import FileExplorerHeaderSelection from './FileExplorerHeaderSelection'
 import ConfirmDeleteModal from './ConfirmDeleteModal'
 import MoveItemsModal from './MoveItemsModal'
 import PreviewPane from './PreviewPane'
+import CustomExpiryModal from './CustomExpiryModal'
 
 const StorageExplorer = observer(({ bucket }) => {
   const storageExplorerStore = useStorageStore()
   const {
     columns,
     selectedFilePreview,
-    setFilePreview,
     closeFilePreview,
     selectedItems,
     setSelectedItems,
     clearSelectedItems,
     selectedItemsToDelete,
-    setSelectedItemsToDelete,
     clearSelectedItemsToDelete,
     openedFolders,
-    pushOpenedFolderAtIndex,
     popColumnAtIndex,
     popOpenedFoldersAtIndex,
-    setSelectedItemToRename,
     selectedItemsToMove,
-    setSelectedItemsToMove,
     clearSelectedItemsToMove,
     view,
     setView,
     setSortBy,
     setSortByOrder,
     currentBucketName,
-    copyFileURLToClipboard,
     openBucket,
 
     loadExplorerPreferences,
     addNewFolderPlaceholder,
-    addNewFolder,
     fetchFolderContents,
     fetchMoreFolderContents,
-    renameFolder,
     deleteFolder,
     uploadFiles,
     deleteFiles,
-    downloadFile,
-    renameFile,
     moveFiles,
   } = storageExplorerStore
 
@@ -100,35 +91,9 @@ const StorageExplorer = observer(({ bucket }) => {
     openBucket(bucket)
   }, [bucket])
 
-  /** Navigation methods */
-
-  const onSelectFile = async (columnIndex, file) => {
-    popColumnAtIndex(columnIndex)
-    popOpenedFoldersAtIndex(columnIndex - 1)
-    setFilePreview(file)
-    clearSelectedItems()
-  }
-
-  const onSelectFolder = async (columnIndex, folder) => {
-    closeFilePreview()
-    clearSelectedItems(columnIndex + 1)
-    popOpenedFoldersAtIndex(columnIndex - 1)
-    pushOpenedFolderAtIndex(folder, columnIndex)
-    await fetchFolderContents(folder.id, folder.name, columnIndex)
-  }
-
   /** Checkbox selection methods */
   /** [Joshen] We'll only support checkbox selection for files ONLY */
 
-  const onCheckItem = (item) => {
-    if (find(selectedItems, item) === undefined) {
-      setSelectedItems(selectedItems.concat([item]))
-    } else {
-      setSelectedItems(selectedItems.filter((selectedItem) => item.id !== selectedItem.id))
-    }
-    closeFilePreview()
-  }
-
   const onSelectAllItemsInColumn = (columnIndex) => {
     const columnFiles = columns[columnIndex].items
       .filter((item) => item.type === STORAGE_ROW_TYPES.FILE)
@@ -155,38 +120,6 @@ const StorageExplorer = observer(({ bucket }) => {
     addNewFolderPlaceholder(columnIndex)
   }
 
-  const onCreateFolder = (folderName, columnIndex) => {
-    addNewFolder(folderName, columnIndex)
-  }
-
-  const onRenameFolder = (folder, newName, columnIndex) => {
-    renameFolder(folder, newName, columnIndex)
-  }
-
-  const onSelectItemDelete = (file) => {
-    setSelectedItemsToDelete([file])
-  }
-
-  const onSelectItemRename = (file) => {
-    setSelectedItemToRename(file)
-  }
-
-  const onSelectItemMove = (file) => {
-    setSelectedItemsToMove([file])
-  }
-
-  const onCopyFileURL = async (file) => {
-    await copyFileURLToClipboard(file)
-  }
-
-  const onDownloadFile = async (file) => {
-    await downloadFile(file)
-  }
-
-  const onRenameFile = async (file, newName, columnIndex) => {
-    await renameFile(file, newName, columnIndex)
-  }
-
   const onFilesUpload = async (event, columnIndex = -1) => {
     event.persist()
     const items = event.target.files || event.dataTransfer.items
@@ -255,18 +188,7 @@ const StorageExplorer = observer(({ bucket }) => {
           openedFolders={openedFolders}
           selectedItems={selectedItems}
           selectedFilePreview={selectedFilePreview}
-          onCheckItem={onCheckItem}
-          onSelectFile={onSelectFile}
-          onRenameFile={onRenameFile}
           onFilesUpload={onFilesUpload}
-          onCopyFileURL={onCopyFileURL}
-          onDownloadFile={onDownloadFile}
-          onSelectFolder={onSelectFolder}
-          onRenameFolder={onRenameFolder}
-          onCreateFolder={onCreateFolder}
-          onSelectItemDelete={onSelectItemDelete}
-          onSelectItemRename={onSelectItemRename}
-          onSelectItemMove={onSelectItemMove}
           onSelectAllItemsInColumn={onSelectAllItemsInColumn}
           onSelectColumnEmptySpace={onSelectColumnEmptySpace}
           onSelectCreateFolder={onSelectCreateFolder}
@@ -292,6 +214,7 @@ const StorageExplorer = observer(({ bucket }) => {
         onSelectCancel={clearSelectedItemsToMove}
         onSelectMove={onMoveSelectedFiles}
       />
+      <CustomExpiryModal />
     </div>
   )
 })
diff --git a/studio/components/ui/BackButton.tsx b/studio/components/ui/BackButton.tsx
index 0ae4923d8e7..5460c16a203 100644
--- a/studio/components/ui/BackButton.tsx
+++ b/studio/components/ui/BackButton.tsx
@@ -2,7 +2,7 @@ import { Button, IconArrowLeft } from 'ui'
 
 export function BackButton({ onClick }: { onClick: () => void }) {
   return (
-    <div className="-ml-2 2xl:absolute 2xl:top-[2px] 2xl:-left-24">
+    <div className="-ml-2 2xl:absolute 2xl:top-[2px] 2xl:left-0">
       <Button type="text" icon={<IconArrowLeft />} onClick={onClick}>
         Back
       </Button>
diff --git a/studio/components/ui/ProjectSettings/DisplayApiSettings.tsx b/studio/components/ui/ProjectSettings/DisplayApiSettings.tsx
index c691e0d5730..73d86086ff9 100644
--- a/studio/components/ui/ProjectSettings/DisplayApiSettings.tsx
+++ b/studio/components/ui/ProjectSettings/DisplayApiSettings.tsx
@@ -3,8 +3,8 @@ import { IconAlertCircle, IconLoader, Input } from 'ui'
 import { JwtSecretUpdateStatus } from '@supabase/shared-types/out/events'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
 
-import { checkPermissions, useJwtSecretUpdateStatus, useProjectSettings } from 'hooks'
-import { DEFAULT_PROJECT_API_SERVICE_ID } from 'lib/constants'
+import { useProjectSettingsQuery } from 'data/config/project-settings-query'
+import { checkPermissions, useJwtSecretUpdateStatus } from 'hooks'
 import Panel from 'components/ui/Panel'
 
 const DisplayApiSettings = () => {
@@ -12,11 +12,10 @@ const DisplayApiSettings = () => {
   const { ref } = router.query
 
   const {
-    services,
-    error: projectSettingsError,
+    data: settings,
     isError: isProjectSettingsError,
     isLoading: isProjectSettingsLoading,
-  } = useProjectSettings(ref as string | undefined)
+  } = useProjectSettingsQuery({ projectRef: ref as string })
   const {
     jwtSecretUpdateStatus,
     isError: isJwtSecretUpdateStatusError,
@@ -28,8 +27,7 @@ const DisplayApiSettings = () => {
   const isNotUpdatingJwtSecret =
     jwtSecretUpdateStatus === undefined || jwtSecretUpdateStatus === JwtSecretUpdateStatus.Updated
   // Get the API service
-  const apiService = (services ?? []).find((x: any) => x.app.id == DEFAULT_PROJECT_API_SERVICE_ID)
-  const apiKeys = apiService?.service_api_keys ?? []
+  const apiKeys = settings?.autoApiService.service_api_keys ?? []
   // api keys should not be empty. However it can be populated with a delay on project creation
   const isApiKeysEmpty = apiKeys.length === 0
 
diff --git a/studio/components/ui/ProjectSettings/DisplayConfigSettings.tsx b/studio/components/ui/ProjectSettings/DisplayConfigSettings.tsx
index ea70fb700dd..320a0a8b82e 100644
--- a/studio/components/ui/ProjectSettings/DisplayConfigSettings.tsx
+++ b/studio/components/ui/ProjectSettings/DisplayConfigSettings.tsx
@@ -3,8 +3,7 @@ import { useRouter } from 'next/router'
 import { Input, IconAlertCircle, IconLoader } from 'ui'
 import { JwtSecretUpdateStatus } from '@supabase/shared-types/out/events'
 import { useJwtSecretUpdateStatus, useProjectSettings } from 'hooks'
-import { DEFAULT_PROJECT_API_SERVICE_ID, IS_PLATFORM } from 'lib/constants'
-import { PROJECT_ENDPOINT_PROTOCOL } from 'pages/api/constants'
+import { DEFAULT_PROJECT_API_SERVICE_ID } from 'lib/constants'
 import Panel from 'components/ui/Panel'
 
 const DisplayConfigSettings = () => {
@@ -28,6 +27,7 @@ const DisplayConfigSettings = () => {
   const jwtSecret = project?.jwt_secret ?? ''
   const apiService = (services ?? []).find((x: any) => x.app.id == DEFAULT_PROJECT_API_SERVICE_ID)
   const apiConfig = apiService?.app_config ?? {}
+  const apiUrl = `${apiConfig.protocol ?? 'https'}://${apiConfig.endpoint ?? '-'}`
 
   return (
     <ConfigContentWrapper>
@@ -56,7 +56,7 @@ const DisplayConfigSettings = () => {
               copy
               disabled
               className="input-mono"
-              value={`${IS_PLATFORM ? 'https' : PROJECT_ENDPOINT_PROTOCOL}://${apiConfig.endpoint}`}
+              value={apiUrl}
               descriptionText="A RESTful endpoint for querying and managing your database."
               layout="horizontal"
             />
diff --git a/studio/data/config/project-settings-query.ts b/studio/data/config/project-settings-query.ts
index ad473e32e38..2c61a9909a8 100644
--- a/studio/data/config/project-settings-query.ts
+++ b/studio/data/config/project-settings-query.ts
@@ -48,6 +48,7 @@ export type ServiceApiKey = {
 }
 
 export type AutoApiService = Service & {
+  protocol: 'https' | 'http'
   endpoint: string
   restUrl: string
   project: Project
diff --git a/studio/lib/helpers.ts b/studio/lib/helpers.ts
index ef127b6ab46..da727d7ec87 100644
--- a/studio/lib/helpers.ts
+++ b/studio/lib/helpers.ts
@@ -1,5 +1,4 @@
 import { v4 as _uuidV4 } from 'uuid'
-import { PostgresColumn } from '@supabase/postgres-meta'
 import { post } from 'lib/common/fetch'
 import { PASSWORD_STRENGTH, DEFAULT_MINIMUM_PASSWORD_STRENGTH, API_URL } from 'lib/constants'
 
diff --git a/studio/localStores/storageExplorer/StorageExplorerStore.js b/studio/localStores/storageExplorer/StorageExplorerStore.js
index 5e11d3c234c..6d75f5f36db 100644
--- a/studio/localStores/storageExplorer/StorageExplorerStore.js
+++ b/studio/localStores/storageExplorer/StorageExplorerStore.js
@@ -37,7 +37,7 @@ export const useStorageExplorerStore = () => {
 const CORRUPTED_THRESHOLD_MS = 15 * 60 * 1000 // 15 minutes
 const LIMIT = 200
 const OFFSET = 0
-const DEFAULT_EXPIRY = 10 * 365 * 24 * 60 * 60 // in seconds, default to 1 year
+const DEFAULT_EXPIRY = 10 * 365 * 24 * 60 * 60 // in seconds, default to 10 years
 const PREVIEW_SIZE_LIMIT = 10000000 // 10MB
 const BATCH_SIZE = 2
 const EMPTY_FOLDER_PLACEHOLDER_FILE_NAME = '.emptyFolderPlaceholder'
@@ -58,6 +58,7 @@ class StorageExplorerStore {
   selectedItemsToDelete = []
   selectedItemsToMove = []
   selectedFilePreview = {}
+  selectedFileCustomExpiry = undefined
 
   DEFAULT_OPTIONS = {
     limit: LIMIT,
@@ -96,17 +97,16 @@ class StorageExplorerStore {
     }
   }
 
-  initStore(projectRef, url, serviceKey) {
+  initStore(projectRef, url, serviceKey, protocol = PROJECT_ENDPOINT_PROTOCOL) {
     this.projectRef = projectRef
-    this.initializeSupabaseClient(serviceKey, url)
+    this.initializeSupabaseClient(serviceKey, url, protocol)
   }
 
   /* Methods which are commonly used + For better readability */
 
-  initializeSupabaseClient = (serviceKey, serviceEndpoint) => {
-    console.debug(serviceEndpoint)
+  initializeSupabaseClient = (serviceKey, serviceEndpoint, protocol) => {
     this.supabaseClient = createClient(
-      `${IS_PLATFORM ? 'https' : PROJECT_ENDPOINT_PROTOCOL}://${serviceEndpoint}`,
+      `${IS_PLATFORM ? 'https' : protocol}://${serviceEndpoint}`,
       serviceKey,
       {
         auth: {
@@ -300,6 +300,10 @@ class StorageExplorerStore {
     this.selectedItemsToMove = []
   }
 
+  setSelectedFileCustomExpiry = (item) => {
+    this.selectedFileCustomExpiry = item
+  }
+
   addNewFolderPlaceholder = (columnIndex) => {
     const isPrepend = true
     const folderName = 'Untitled folder'
@@ -397,9 +401,9 @@ class StorageExplorerStore {
     this.selectedFilePreview = {}
   }
 
-  copyFileURLToClipboard = async (file) => {
+  copyFileURLToClipboard = async (file, expiresIn = 0) => {
     const filePreview = find(this.filePreviewCache, { id: file.id })
-    if (filePreview) {
+    if (filePreview && expiresIn === 0) {
       // Already generated signed URL
       copyToClipboard(filePreview.url, () => {
         this.ui.setNotification({
@@ -410,7 +414,7 @@ class StorageExplorerStore {
       })
     } else {
       // Need to generate signed URL, and might as well save it to cache as well
-      const signedUrl = await this.fetchFilePreview(file.name)
+      const signedUrl = await this.fetchFilePreview(file.name, expiresIn)
 
       try {
         let formattedUrl = new URL(signedUrl)
@@ -840,7 +844,7 @@ class StorageExplorerStore {
     this.clearSelectedItemsToMove()
   }
 
-  fetchFilePreview = async (fileName) => {
+  fetchFilePreview = async (fileName, expiresIn = 0) => {
     const includeBucket = false
     const pathToFile = this.getPathAlongOpenedFolders(includeBucket)
     const formattedPathToFile = pathToFile.length > 0 ? `${pathToFile}/${fileName}` : fileName
@@ -857,7 +861,7 @@ class StorageExplorerStore {
 
     const { data, error } = await this.supabaseClient.storage
       .from(this.selectedBucket.name)
-      .createSignedUrl(formattedPathToFile, DEFAULT_EXPIRY)
+      .createSignedUrl(formattedPathToFile, expiresIn || DEFAULT_EXPIRY)
 
     if (!error) {
       return data.signedUrl
diff --git a/studio/next.config.js b/studio/next.config.js
index 2a78210b5b7..99b4b7d2513 100644
--- a/studio/next.config.js
+++ b/studio/next.config.js
@@ -131,6 +131,19 @@ const nextConfig = {
             key: 'X-Frame-Options',
             value: 'DENY',
           },
+          {
+            key: 'X-Content-Type-Options',
+            value: 'no-sniff',
+          },
+          {
+            key: 'Content-Security-Policy',
+            value: `
+            frame-ancestors 'none';
+            upgrade-insecure-requests;
+            `
+              .replace(/\s{2,}/g, ' ')
+              .trim(),
+          },
           {
             key: 'Referrer-Policy',
             value: 'strict-origin-when-cross-origin',
diff --git a/studio/package.json b/studio/package.json
index c4792cb5292..0e6a6fc37a7 100644
--- a/studio/package.json
+++ b/studio/package.json
@@ -26,7 +26,6 @@
     "@sentry/nextjs": "^6.17.4",
     "@stripe/react-stripe-js": "^1.7.0",
     "@stripe/stripe-js": "^1.25.0",
-    "@supabase/postgres-meta": "^0.26.1",
     "@supabase/react-data-grid": "^7.1.0-beta.7",
     "@supabase/shared-types": "^0.1.29",
     "@supabase/supabase-js": "^2.1.1",
@@ -102,6 +101,7 @@
     "@storybook/addon-links": "^6.4.19",
     "@storybook/react": "^6.4.19",
     "@storybook/testing-library": "^0.0.9",
+    "@supabase/postgres-meta": "^0.60.2",
     "@tailwindcss/typography": "^0.5.2",
     "@testing-library/dom": "^8.19.0",
     "@testing-library/react": "^12.1.5",
diff --git a/studio/pages/api/constants.ts b/studio/pages/api/constants.ts
index 18dda1ac966..ae150beae97 100644
--- a/studio/pages/api/constants.ts
+++ b/studio/pages/api/constants.ts
@@ -1,4 +1,4 @@
-const PUBLIC_URL = new URL(process.env.NEXT_PUBLIC_SUPABASE_PUBLIC_URL || 'http://localhost:8000')
+const PUBLIC_URL = new URL(process.env.SUPABASE_PUBLIC_URL || 'http://localhost:8000')
 
 export const PROJECT_REST_URL = `${PUBLIC_URL.origin}/rest/v1/`
 export const PROJECT_ENDPOINT = PUBLIC_URL.host
diff --git a/studio/pages/api/database/[ref]/backups.ts b/studio/pages/api/database/[ref]/backups.ts
deleted file mode 100644
index 32e883b78d4..00000000000
--- a/studio/pages/api/database/[ref]/backups.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { NextApiRequest, NextApiResponse } from 'next'
-import apiWrapper from 'lib/api/apiWrapper'
-
-export default (req: NextApiRequest, res: NextApiResponse) => apiWrapper(req, res, handler)
-
-async function handler(req: NextApiRequest, res: NextApiResponse) {
-  const { method } = req
-
-  switch (method) {
-    case 'GET':
-      return handleGetAll(req, res)
-    default:
-      res.setHeader('Allow', ['GET'])
-      res.status(405).json({ data: null, error: { message: `Method ${method} Not Allowed` } })
-  }
-}
-
-const handleGetAll = async (req: NextApiRequest, res: NextApiResponse) => {
-  return res.status(200).json({ tierKey: 'FREE', backups: [] })
-}
diff --git a/studio/pages/api/pg-meta/[ref]/foreign-tables.ts b/studio/pages/api/pg-meta/[ref]/foreign-tables.ts
new file mode 100644
index 00000000000..b5cf41f4be3
--- /dev/null
+++ b/studio/pages/api/pg-meta/[ref]/foreign-tables.ts
@@ -0,0 +1,32 @@
+import { NextApiRequest, NextApiResponse } from 'next'
+
+import apiWrapper from 'lib/api/apiWrapper'
+import { get } from 'lib/common/fetch'
+import { constructHeaders } from 'lib/api/apiHelpers'
+import { PG_META_URL } from 'lib/constants'
+
+export default (req: NextApiRequest, res: NextApiResponse) =>
+  apiWrapper(req, res, handler, { withAuth: true })
+
+async function handler(req: NextApiRequest, res: NextApiResponse) {
+  const { method } = req
+
+  switch (method) {
+    case 'GET':
+      return handleGetAll(req, res)
+    default:
+      res.setHeader('Allow', ['GET'])
+      res.status(405).json({ error: { message: `Method ${method} Not Allowed` } })
+  }
+}
+
+const handleGetAll = async (req: NextApiRequest, res: NextApiResponse) => {
+  const headers = constructHeaders(req.headers)
+  let response = await get(`${PG_META_URL}/foreign-tables`, {
+    headers,
+  })
+  if (response.error) {
+    return res.status(400).json({ error: response.error })
+  }
+  return res.status(200).json(response)
+}
diff --git a/studio/pages/api/pg-meta/[ref]/views.ts b/studio/pages/api/pg-meta/[ref]/views.ts
new file mode 100644
index 00000000000..aa205be3019
--- /dev/null
+++ b/studio/pages/api/pg-meta/[ref]/views.ts
@@ -0,0 +1,32 @@
+import { NextApiRequest, NextApiResponse } from 'next'
+
+import apiWrapper from 'lib/api/apiWrapper'
+import { get } from 'lib/common/fetch'
+import { constructHeaders } from 'lib/api/apiHelpers'
+import { PG_META_URL } from 'lib/constants'
+
+export default (req: NextApiRequest, res: NextApiResponse) =>
+  apiWrapper(req, res, handler, { withAuth: true })
+
+async function handler(req: NextApiRequest, res: NextApiResponse) {
+  const { method } = req
+
+  switch (method) {
+    case 'GET':
+      return handleGetAll(req, res)
+    default:
+      res.setHeader('Allow', ['GET'])
+      res.status(405).json({ error: { message: `Method ${method} Not Allowed` } })
+  }
+}
+
+const handleGetAll = async (req: NextApiRequest, res: NextApiResponse) => {
+  const headers = constructHeaders(req.headers)
+  let response = await get(`${PG_META_URL}/views`, {
+    headers,
+  })
+  if (response.error) {
+    return res.status(400).json({ error: response.error })
+  }
+  return res.status(200).json(response)
+}
diff --git a/studio/pages/api/props/project/[ref]/api.ts b/studio/pages/api/props/project/[ref]/api.ts
index 9e6cb871c40..d6f30707f2a 100644
--- a/studio/pages/api/props/project/[ref]/api.ts
+++ b/studio/pages/api/props/project/[ref]/api.ts
@@ -1,7 +1,7 @@
 import { NextApiRequest, NextApiResponse } from 'next'
 
 import apiWrapper from 'lib/api/apiWrapper'
-import { PROJECT_ENDPOINT, PROJECT_REST_URL } from 'pages/api/constants'
+import { PROJECT_ENDPOINT, PROJECT_ENDPOINT_PROTOCOL, PROJECT_REST_URL } from 'pages/api/constants'
 
 export default (req: NextApiRequest, res: NextApiResponse) => apiWrapper(req, res, handler)
 
@@ -36,17 +36,12 @@ const handleGetAll = async (req: NextApiRequest, res: NextApiResponse) => {
         {
           id: 1,
           name: 'Default API',
-          project: { ref: 'default' },
           app: { id: 1, name: 'Auto API' },
           app_config: {
             db_schema: 'public',
             endpoint: PROJECT_ENDPOINT,
             realtime_enabled: true,
           },
-          endpoint: PROJECT_ENDPOINT,
-          restUrl: PROJECT_REST_URL,
-          defaultApiKey: process.env.SUPABASE_ANON_KEY,
-          serviceApiKey: process.env.SUPABASE_SERVICE_KEY,
           service_api_keys: [
             {
               api_key_encrypted: '-',
@@ -72,6 +67,7 @@ const handleGetAll = async (req: NextApiRequest, res: NextApiResponse) => {
         endpoint: PROJECT_ENDPOINT,
         realtime_enabled: true,
       },
+      protocol: PROJECT_ENDPOINT_PROTOCOL,
       endpoint: PROJECT_ENDPOINT,
       restUrl: PROJECT_REST_URL,
       defaultApiKey: process.env.SUPABASE_ANON_KEY,
diff --git a/studio/pages/new/index.tsx b/studio/pages/new/index.tsx
index 290d515599b..fb8c96b2bb2 100644
--- a/studio/pages/new/index.tsx
+++ b/studio/pages/new/index.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react'
 import { observer } from 'mobx-react-lite'
-import { Button, Input } from 'ui'
+import { Button, Input, Listbox } from 'ui'
 import { useRouter } from 'next/router'
 
 import { API_URL } from 'lib/constants'
@@ -10,6 +10,25 @@ import { WizardLayout } from 'components/layouts'
 import Panel from 'components/ui/Panel'
 import { NextPageWithLayout } from 'types'
 
+const ORG_KIND_TYPES = {
+  PERSONAL: 'Personal',
+  EDUCATIONAL: 'Educational',
+  STARTUP: 'Startup',
+  AGENCY: 'Agency',
+  COMPANY: 'Company',
+  UNDISCLOSED: 'N/A',
+}
+const ORG_KIND_DEFAULT = 'PERSONAL'
+
+const ORG_SIZE_TYPES = {
+  '1': '1 - 10',
+  '10': '10 - 49',
+  '50': '50 - 99',
+  '100': '100 - 299',
+  '300': 'More than 300',
+}
+const ORG_SIZE_DEFAULT = '1'
+
 /**
  * No org selected yet, create a new one
  */
@@ -18,6 +37,8 @@ const Wizard: NextPageWithLayout = () => {
   const router = useRouter()
 
   const [orgName, setOrgName] = useState('')
+  const [orgKind, setOrgKind] = useState(ORG_KIND_DEFAULT)
+  const [orgSize, setOrgSize] = useState(ORG_SIZE_DEFAULT)
   const [newOrgLoading, setNewOrgLoading] = useState(false)
 
   function validateOrgName(name: any) {
@@ -29,6 +50,14 @@ const Wizard: NextPageWithLayout = () => {
     setOrgName(e.target.value)
   }
 
+  function onOrgKindChange(value: any) {
+    setOrgKind(value)
+  }
+
+  function onOrgSizeChange(value: any) {
+    setOrgSize(value)
+  }
+
   async function onClickSubmit(e: any) {
     e.preventDefault()
     const isOrgNameValid = validateOrgName(orgName)
@@ -40,6 +69,8 @@ const Wizard: NextPageWithLayout = () => {
     setNewOrgLoading(true)
     const response = await post(`${API_URL}/organizations`, {
       name: orgName,
+      kind: orgKind,
+      ...(orgKind == 'COMPANY' ? { size: orgSize } : {}),
     })
 
     if (response.error) {
@@ -78,9 +109,9 @@ const Wizard: NextPageWithLayout = () => {
       }
     >
       <Panel.Content className="pt-0">
-        <p className="text-sm">This is your organization's name within Supabase.</p>
+        <p className="text-sm">This is your organization within Supabase.</p>
         <p className="text-sm text-scale-1100">
-          For example, you can use the name of your company or department
+          For example, you can use the name of your company or department.
         </p>
       </Panel.Content>
       <Panel.Content className="Form section-block--body has-inputs-centered">
@@ -95,6 +126,44 @@ const Wizard: NextPageWithLayout = () => {
           onChange={onOrgNameChange}
         />
       </Panel.Content>
+      <Panel.Content className="Form section-block--body has-inputs-centered">
+        <Listbox
+          label="Type of organization"
+          layout="horizontal"
+          value={orgKind}
+          onChange={onOrgKindChange}
+          descriptionText="What would best describe your organization?"
+        >
+          {Object.entries(ORG_KIND_TYPES).map(([k, v]) => {
+            return (
+              <Listbox.Option key={k} label={v} value={k}>
+                {v}
+              </Listbox.Option>
+            )
+          })}
+        </Listbox>
+      </Panel.Content>
+      {orgKind == 'COMPANY' ? (
+        <Panel.Content className="Form section-block--body has-inputs-centered">
+          <Listbox
+            label="Company size"
+            layout="horizontal"
+            value={orgSize}
+            onChange={onOrgSizeChange}
+            descriptionText="How many people are in your company?"
+          >
+            {Object.entries(ORG_SIZE_TYPES).map(([k, v]) => {
+              return (
+                <Listbox.Option key={k} label={v} value={k}>
+                  {v}
+                </Listbox.Option>
+              )
+            })}
+          </Listbox>
+        </Panel.Content>
+      ) : (
+        <></>
+      )}
     </Panel>
   )
 }
diff --git a/studio/pages/org/_/[[...routeSlug]].tsx b/studio/pages/org/_/[[...routeSlug]].tsx
new file mode 100644
index 00000000000..69c379f35b3
--- /dev/null
+++ b/studio/pages/org/_/[[...routeSlug]].tsx
@@ -0,0 +1,123 @@
+import Link from 'next/link'
+import { useRouter } from 'next/router'
+import { NextPage } from 'next'
+import { observer } from 'mobx-react-lite'
+import { Button, IconPlus } from 'ui'
+
+import { withAuth, useStore } from 'hooks'
+import CardButton from 'components/ui/CardButton'
+import ShimmeringCard from 'components/interfaces/Home/ProjectList/ShimmeringCard'
+
+const Header = () => {
+  return (
+    <div className="dark:border-dark border-b p-3">
+      <div className="flex items-center space-x-2">
+        <Link href="/projects">
+          <a>
+            <img
+              src="/img/supabase-logo.svg"
+              alt="Supabase"
+              className="dark:border-dark rounded border p-1 hover:border-white"
+              style={{ height: 24 }}
+            />
+          </a>
+        </Link>
+      </div>
+    </div>
+  )
+}
+
+const GenericOrganizationPage: NextPage = () => {
+  const { app } = useStore()
+  const router = useRouter()
+  const { organizations } = app
+  const { isLoading } = organizations
+
+  const sortedOrganizations = organizations.list()
+  const { routeSlug, ...queryParams } = router.query
+  const queryString =
+    Object.keys(queryParams).length > 0
+      ? new URLSearchParams(queryParams as Record<string, string>).toString()
+      : ''
+
+  const urlRewriterFactory = (slug: string | string[] | undefined) => {
+    return (orgSlug: string) => {
+      if (!Array.isArray(slug)) {
+        return `/org/${orgSlug}/general?${queryString}`
+      } else {
+        const slugPath = slug.reduce((a: string, b: string) => `${a}/${b}`, '').slice(1)
+        return `/org/${orgSlug}/${slugPath}?${queryString}`
+      }
+    }
+  }
+
+  return (
+    <>
+      <Header />
+      <div className="flex flex-col mx-auto w-full max-w-5xl space-y-3">
+        <h3 className="mt-8 text-2xl">Select an organization to continue</h3>
+        <div
+          className="flex-grow py-6 space-y-8 overflow-y-auto"
+          style={{ maxHeight: 'calc(100vh - 49px - 64px)' }}
+        >
+          {isLoading ? (
+            <ul
+              className={[
+                'mx-auto grid grid-cols-1 gap-4',
+                'sm:grid-cols-1 md:grid-cols-1 lg:grid-cols-2 xl:grid-cols-3',
+              ].join(' `')}
+            >
+              <ShimmeringCard />
+              <ShimmeringCard />
+            </ul>
+          ) : sortedOrganizations.length === 0 ? (
+            <div className="col-span-4 space-y-4 rounded-lg border-2 border-dashed border-gray-300 p-6 text-center">
+              <div className="space-y-1">
+                <p>You are not part of any organizations yet</p>
+                <p className="text-sm text-scale-1100">
+                  Get started by creating a new organization.
+                </p>
+              </div>
+              <div>
+                <Link href={`/new`}>
+                  <a>
+                    <Button icon={<IconPlus />}>New organization</Button>
+                  </a>
+                </Link>
+              </div>
+            </div>
+          ) : (
+            <ul
+              className={[
+                'mx-auto grid grid-cols-1 gap-4',
+                'sm:grid-cols-1 md:grid-cols-1 lg:grid-cols-2 xl:grid-cols-3',
+              ].join(' `')}
+            >
+              {sortedOrganizations.map((organization) => (
+                <li key={organization.slug} className="col-span-1">
+                  <CardButton
+                    linkHref={urlRewriterFactory(routeSlug)(organization.slug)}
+                    title={
+                      <div className="flex w-full flex-row justify-between gap-1">
+                        <span className="flex-shrink truncate">{organization.name}</span>
+                      </div>
+                    }
+                    footer={
+                      <div className="flex items-end justify-between">
+                        <span className="text-sm lowercase text-scale-1000">
+                          {organization.slug}
+                        </span>
+                      </div>
+                    }
+                  />
+                </li>
+              ))}
+            </ul>
+          )}
+        </div>
+      </div>
+    </>
+  )
+}
+
+export default withAuth(observer(GenericOrganizationPage))
diff --git a/studio/pages/project/[ref]/api/index.tsx b/studio/pages/project/[ref]/api/index.tsx
index 482494908ff..4a793b45190 100644
--- a/studio/pages/project/[ref]/api/index.tsx
+++ b/studio/pages/project/[ref]/api/index.tsx
@@ -5,14 +5,13 @@ import { FC, createContext, useContext, useEffect, useState } from 'react'
 import { observer, useLocalObservable } from 'mobx-react-lite'
 
 import { NextPageWithLayout } from 'types'
-import { API_URL, IS_PLATFORM } from 'lib/constants'
-import { PROJECT_ENDPOINT_PROTOCOL } from 'pages/api/constants'
 import { checkPermissions, useStore } from 'hooks'
 import { get } from 'lib/common/fetch'
 import { snakeToCamel } from 'lib/helpers'
 import { DocsLayout } from 'components/layouts'
 import { GeneralContent, ResourceContent, RpcContent } from 'components/interfaces/Docs'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
+import { useProjectSettingsQuery } from 'data/config/project-settings-query'
 
 const PageContext = createContext(null)
 
@@ -71,9 +70,11 @@ const DocView: FC<any> = observer(({}) => {
   const [selectedLang, setSelectedLang] = useState<any>('js')
   const [showApiKey, setShowApiKey] = useState<any>(DEFAULT_KEY)
 
-  const { data, error }: any = useSWR(`${API_URL}/props/project/${PageState.projectRef}/api`, get)
-  const API_KEY = data?.autoApiService?.defaultApiKey
-  const swaggerUrl = data?.autoApiService?.restUrl
+  const { data, error } = useProjectSettingsQuery({ projectRef: PageState.projectRef as string })
+  const API_KEY = data?.autoApiService.service_api_keys.find((key: any) => key.tags === 'anon')
+    ? data.autoApiService.defaultApiKey
+    : undefined
+  const swaggerUrl = data?.autoApiService.restUrl
   const headers: any = { apikey: API_KEY }
 
   const canReadServiceKey = checkPermissions(
@@ -81,7 +82,7 @@ const DocView: FC<any> = observer(({}) => {
     'service_api_keys.service_role_key'
   )
 
-  if (API_KEY?.length > 40) headers['Authorization'] = `Bearer ${API_KEY}`
+  if (API_KEY) headers['Authorization'] = `Bearer ${API_KEY}`
 
   const { data: jsonSchema, error: jsonSchemaError } = useSWR(
     () => swaggerUrl,
@@ -117,9 +118,7 @@ const DocView: FC<any> = observer(({}) => {
   // Data Loaded
   const autoApiService = {
     ...data.autoApiService,
-    endpoint: IS_PLATFORM
-      ? `https://${data?.autoApiService?.endpoint}`
-      : `${PROJECT_ENDPOINT_PROTOCOL}://${data.autoApiService.endpoint}`,
+    endpoint: `${data.autoApiService.protocol ?? 'https'}://${data.autoApiService.endpoint ?? '-'}`,
   }
 
   const { query } = router
@@ -175,7 +174,7 @@ const DocView: FC<any> = observer(({}) => {
                           key="anon"
                           onClick={() =>
                             setShowApiKey({
-                              key: autoApiService?.defaultApiKey,
+                              key: API_KEY,
                               name: 'anon (public)',
                             })
                           }
@@ -187,7 +186,7 @@ const DocView: FC<any> = observer(({}) => {
                             key="service"
                             onClick={() =>
                               setShowApiKey({
-                                key: autoApiService?.serviceApiKey,
+                                key: autoApiService.serviceApiKey,
                                 name: 'service_role (secret)',
                               })
                             }
diff --git a/studio/pages/project/[ref]/auth/policies.tsx b/studio/pages/project/[ref]/auth/policies.tsx
index 14fc0d2a805..42562e4bc55 100644
--- a/studio/pages/project/[ref]/auth/policies.tsx
+++ b/studio/pages/project/[ref]/auth/policies.tsx
@@ -1,22 +1,15 @@
-import React, { useState, FC } from 'react'
-import { isEmpty } from 'lodash'
-import { Button, IconSearch, Input, IconHelpCircle, IconExternalLink } from 'ui'
-import { useRouter } from 'next/router'
+import { useState, useEffect } from 'react'
+import { partition } from 'lodash'
+import { Button, Listbox, IconSearch, Input, IconExternalLink, IconLock } from 'ui'
 import { observer } from 'mobx-react-lite'
-import { checkPermissions, useStore } from 'hooks'
-import { AuthLayout } from 'components/layouts'
-import { NextPageWithLayout } from 'types'
-import { PolicyEditorModal, PolicyTableRow } from 'components/interfaces/Auth/Policies'
-import { PostgresRole } from '@supabase/postgres-meta'
 import { PostgresTable, PostgresPolicy } from '@supabase/postgres-meta'
-
-import ConfirmModal from 'components/ui/Dialogs/ConfirmDialog'
-import NoTableState from 'components/ui/States/NoTableState'
-import NoSearchResults from 'components/to-be-cleaned/NoSearchResults'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
+
+import { NextPageWithLayout } from 'types'
+import { checkPermissions, useParams, useStore } from 'hooks'
+import { AuthLayout } from 'components/layouts'
+import { Policies } from 'components/interfaces/Auth/Policies'
 import NoPermission from 'components/ui/NoPermission'
-import ProductEmptyState from 'components/to-be-cleaned/ProductEmptyState'
-import InformationBox from 'components/ui/InformationBox'
 
 /**
  * Filter tables by table name and policy name
@@ -39,13 +32,15 @@ const onFilterTables = (
     const findSearchString = (s: string) => s.toLowerCase().includes(filter)
     // @ts-ignore Type instantiation is excessively deep and possibly infinite
     const filteredPolicies = policies.filter((p: PostgresPolicy) => findSearchString(p.name))
+
     return tables
       .slice()
       .filter((x: PostgresTable) => {
-        const searchTableName = findSearchString(x.name)
-        if (searchTableName) return true
-        const searchPolicyName = filteredPolicies.some((p: PostgresPolicy) => p.table === x.name)
-        return searchPolicyName
+        return (
+          x.name.toLowerCase().includes(filter) ||
+          x.id.toString() === filter ||
+          filteredPolicies.some((p: PostgresPolicy) => p.table === x.name)
+        )
       })
       .sort((a: PostgresTable, b: PostgresTable) => a.name.localeCompare(b.name))
   }
@@ -53,11 +48,26 @@ const onFilterTables = (
 
 const AuthPoliciesPage: NextPageWithLayout = () => {
   const { meta } = useStore()
+  const { search } = useParams()
+  const [selectedSchema, setSelectedSchema] = useState<string>('public')
+  const [searchString, setSearchString] = useState<string>('')
+
+  useEffect(() => {
+    if (search) setSearchString(search)
+  }, [search])
+
+  const schemas = meta.schemas.list()
+  const [protectedSchemas, openSchemas] = partition(schemas, (schema) =>
+    meta.excludedSchemas.includes(schema?.name ?? '')
+  )
+  // @ts-ignore
+  const schema = schemas.find((schema) => schema.name === selectedSchema)
+  const isLocked = protectedSchemas.some((s) => s.id === schema?.id)
 
-  const [policiesFilter, setPoliciesFilter] = useState<string | undefined>(undefined)
-  const publicTables = meta.tables.list((table: { schema: string }) => table.schema === 'public')
   const policies = meta.policies.list()
-  const filteredTables = onFilterTables(publicTables, policies, policiesFilter)
+
+  const tables = meta.tables.list((table: { schema: string }) => table.schema === selectedSchema)
+  const filteredTables = onFilterTables(tables, policies, searchString)
 
   const canReadPolicies = checkPermissions(PermissionAction.TENANT_SQL_ADMIN_READ, 'policies')
 
@@ -67,29 +77,78 @@ const AuthPoliciesPage: NextPageWithLayout = () => {
 
   return (
     <div className="flex flex-col h-full">
-      {(publicTables || []).length > 0 && (
-        <div className="mb-4">
-          <div className="flex items-center justify-between">
+      <div className="mb-4">
+        <div className="flex items-center justify-between">
+          <div className="flex items-center space-x-4">
+            <div className="w-[230px]">
+              <Listbox
+                size="small"
+                value={selectedSchema}
+                onChange={(schema: string) => {
+                  setSelectedSchema(schema)
+                  setSearchString('')
+                }}
+                icon={isLocked && <IconLock size={14} strokeWidth={2} />}
+              >
+                <Listbox.Option
+                  disabled
+                  key="normal-schemas"
+                  value="normal-schemas"
+                  label="Schemas"
+                >
+                  <p className="text-sm">Schemas</p>
+                </Listbox.Option>
+                {/* @ts-ignore */}
+                {openSchemas.map((schema) => (
+                  <Listbox.Option
+                    key={schema.id}
+                    value={schema.name}
+                    label={schema.name}
+                    addOnBefore={() => <span className="text-scale-900">schema</span>}
+                  >
+                    <span className="text-scale-1200 text-sm">{schema.name}</span>
+                  </Listbox.Option>
+                ))}
+                <Listbox.Option
+                  disabled
+                  key="protected-schemas"
+                  value="protected-schemas"
+                  label="Protected schemas"
+                >
+                  <p className="text-sm">Protected schemas</p>
+                </Listbox.Option>
+                {protectedSchemas.map((schema) => (
+                  <Listbox.Option
+                    key={schema.id}
+                    value={schema.name}
+                    label={schema.name}
+                    addOnBefore={() => <span className="text-scale-900">schema</span>}
+                  >
+                    <span className="text-scale-1200 text-sm">{schema.name}</span>
+                  </Listbox.Option>
+                ))}
+              </Listbox>
+            </div>
             <Input
               size="small"
               placeholder="Filter tables and policies"
               className="block w-64 text-sm placeholder-gray-400"
-              value={policiesFilter}
-              onChange={(e) => setPoliciesFilter(e.target.value)}
+              value={searchString}
+              onChange={(e) => setSearchString(e.target.value)}
               icon={<IconSearch size="tiny" />}
             />
-            <Button type="link" icon={<IconExternalLink size={14} strokeWidth={1.5} />}>
-              <a
-                target="_blank"
-                href="https://supabase.com/docs/learn/auth-deep-dive/auth-row-level-security"
-              >
-                What is RLS?
-              </a>
-            </Button>
           </div>
+          <Button type="link" icon={<IconExternalLink size={14} strokeWidth={1.5} />}>
+            <a
+              target="_blank"
+              href="https://supabase.com/docs/learn/auth-deep-dive/auth-row-level-security"
+            >
+              What is RLS?
+            </a>
+          </Button>
         </div>
-      )}
-      <AuthPoliciesTables hasPublicTables={publicTables.length > 0} tables={filteredTables} />
+      </div>
+      <Policies tables={filteredTables} hasTables={tables.length > 0} isLocked={isLocked} />
     </div>
   )
 }
@@ -101,198 +160,3 @@ AuthPoliciesPage.getLayout = (page) => (
 )
 
 export default observer(AuthPoliciesPage)
-
-interface AuthPoliciesTablesProps {
-  hasPublicTables: boolean
-  tables: any[]
-}
-const AuthPoliciesTables: FC<AuthPoliciesTablesProps> = observer(({ tables, hasPublicTables }) => {
-  const router = useRouter()
-  const { ref } = router.query
-
-  const { ui, meta } = useStore()
-  const roles = meta.roles.list((role: PostgresRole) => !meta.roles.systemRoles.includes(role.name))
-
-  const [selectedSchemaAndTable, setSelectedSchemaAndTable] = useState<any>({})
-  const [selectedTableToToggleRLS, setSelectedTableToToggleRLS] = useState<any>({})
-  const [selectedPolicyToEdit, setSelectedPolicyToEdit] = useState<any>({})
-  const [selectedPolicyToDelete, setSelectedPolicyToDelete] = useState<any>({})
-
-  const closePolicyEditorModal = () => {
-    setSelectedPolicyToEdit({})
-    setSelectedSchemaAndTable({})
-  }
-
-  const closeConfirmModal = () => {
-    setSelectedPolicyToDelete({})
-    setSelectedTableToToggleRLS({})
-  }
-
-  const onSelectToggleRLS = (table: any) => {
-    setSelectedTableToToggleRLS(table)
-  }
-
-  const onSelectCreatePolicy = (table: any) => {
-    setSelectedSchemaAndTable({ schema: table.schema, table: table.name })
-  }
-
-  const onSelectEditPolicy = (policy: any) => {
-    setSelectedPolicyToEdit(policy)
-    setSelectedSchemaAndTable({ schema: policy.schema, table: policy.table })
-  }
-
-  const onSelectDeletePolicy = (policy: any) => {
-    setSelectedPolicyToDelete(policy)
-  }
-
-  const onSavePolicySuccess = async () => {
-    ui.setNotification({ category: 'success', message: 'Policy successfully saved!' })
-    closePolicyEditorModal()
-  }
-
-  // Methods that involve some API
-  const onToggleRLS = async () => {
-    const payload = {
-      id: selectedTableToToggleRLS.id,
-      rls_enabled: !selectedTableToToggleRLS.rls_enabled,
-    }
-
-    const res: any = await meta.tables.update(payload.id, payload)
-    if (res.error) {
-      ui.setNotification({
-        category: 'error',
-        message: `Failed to toggle RLS: ${res.error.message}`,
-      })
-    }
-    closeConfirmModal()
-  }
-
-  const onCreatePolicy = async (payload: any) => {
-    const res = await meta.policies.create(payload)
-    if (res.error) {
-      ui.setNotification({
-        category: 'error',
-        message: `Error adding policy: ${res.error.message}`,
-      })
-      return true
-    }
-    return false
-  }
-
-  const onUpdatePolicy = async (payload: any) => {
-    const res = await meta.policies.update(payload.id, payload)
-    if (res.error) {
-      ui.setNotification({
-        category: 'error',
-        message: `Error updating policy: ${res.error.message}`,
-      })
-      return true
-    }
-    return false
-  }
-
-  const onDeletePolicy = async () => {
-    const res = await meta.policies.del(selectedPolicyToDelete.id)
-    if (typeof res !== 'boolean' && res.error) {
-      ui.setNotification({
-        category: 'error',
-        message: `Error deleting policy: ${res.error.message}`,
-      })
-    } else {
-      ui.setNotification({ category: 'success', message: 'Successfully deleted policy!' })
-    }
-    closeConfirmModal()
-  }
-
-  return (
-    <>
-      {tables.length > 0 ? (
-        tables.map((table: any) => (
-          <section key={table.id}>
-            <PolicyTableRow
-              table={table}
-              onSelectToggleRLS={onSelectToggleRLS}
-              onSelectCreatePolicy={onSelectCreatePolicy}
-              onSelectEditPolicy={onSelectEditPolicy}
-              onSelectDeletePolicy={onSelectDeletePolicy}
-            />
-          </section>
-        ))
-      ) : hasPublicTables ? (
-        <NoSearchResults />
-      ) : (
-        <div className="flex-grow">
-          <ProductEmptyState
-            size="large"
-            title="Postgres Policies"
-            ctaButtonLabel="Create a table"
-            infoButtonLabel="What is RLS?"
-            infoButtonUrl="https://supabase.com/docs/guides/auth/row-level-security"
-            onClickCta={() => router.push(`/project/${ref}/editor`)}
-          >
-            <div className="space-y-4">
-              <InformationBox
-                title="What are policies?"
-                icon={<IconHelpCircle strokeWidth={2} />}
-                description={
-                  <div className="space-y-2">
-                    <p className="text-sm">
-                      Policies restrict, on a per-user basis, which rows can be returned by normal
-                      queries, or inserted, updated, or deleted by data modification commands.
-                    </p>
-                    <p className="text-sm">
-                      This is also known as Row-Level Security (RLS). Each policy is attached to a
-                      table, and the policy is executed everytime a time is accessed.
-                    </p>
-                  </div>
-                }
-              />
-              <p className="text-sm text-scale-1100">
-                A table within the public schema is required before you can create a Row-Level
-                Security policy.
-              </p>
-            </div>
-          </ProductEmptyState>
-        </div>
-      )}
-
-      <PolicyEditorModal
-        visible={!isEmpty(selectedSchemaAndTable)}
-        roles={roles}
-        schema={selectedSchemaAndTable.schema}
-        table={selectedSchemaAndTable.table}
-        selectedPolicyToEdit={selectedPolicyToEdit}
-        onSelectCancel={closePolicyEditorModal}
-        // @ts-ignore
-        onCreatePolicy={onCreatePolicy}
-        // @ts-ignore
-        onUpdatePolicy={onUpdatePolicy}
-        onSaveSuccess={onSavePolicySuccess}
-      />
-
-      <ConfirmModal
-        danger
-        visible={!isEmpty(selectedPolicyToDelete)}
-        title="Confirm to delete policy"
-        description={`This is permanent! Are you sure you want to delete the policy "${selectedPolicyToDelete.name}"`}
-        buttonLabel="Delete"
-        buttonLoadingLabel="Deleting"
-        onSelectCancel={closeConfirmModal}
-        onSelectConfirm={onDeletePolicy}
-      />
-
-      <ConfirmModal
-        danger={selectedTableToToggleRLS.rls_enabled}
-        visible={!isEmpty(selectedTableToToggleRLS)}
-        title={`Confirm to ${selectedTableToToggleRLS.rls_enabled ? 'disable' : 'enable'} RLS`}
-        description={`Are you sure you want to ${
-          selectedTableToToggleRLS.rls_enabled ? 'disable' : 'enable'
-        } row level security for the table "${selectedTableToToggleRLS.name}"?`}
-        buttonLabel="Confirm"
-        buttonLoadingLabel="Saving"
-        onSelectCancel={closeConfirmModal}
-        onSelectConfirm={onToggleRLS}
-      />
-    </>
-  )
-})
diff --git a/studio/pages/project/[ref]/database/backups/pitr.tsx b/studio/pages/project/[ref]/database/backups/pitr.tsx
index 2d0468532e2..5f3eb4aadad 100644
--- a/studio/pages/project/[ref]/database/backups/pitr.tsx
+++ b/studio/pages/project/[ref]/database/backups/pitr.tsx
@@ -1,15 +1,13 @@
-import Link from 'next/link'
 import { useRouter } from 'next/router'
 import { observer } from 'mobx-react-lite'
-import { IconAlertCircle, Tabs } from 'ui'
+import { Tabs } from 'ui'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
 
 import { NextPageWithLayout } from 'types'
-import { useStore, checkPermissions, useFlag } from 'hooks'
+import { useStore, checkPermissions } from 'hooks'
 import { DatabaseLayout } from 'components/layouts'
 import Loading from 'components/ui/Loading'
 import NoPermission from 'components/ui/NoPermission'
-import InformationBox from 'components/ui/InformationBox'
 import UpgradeToPro from 'components/ui/UpgradeToPro'
 import { PITRNotice, PITRSelection } from 'components/interfaces/Database/Backups/PITR'
 import BackupsError from 'components/interfaces/Database/Backups/BackupsError'
@@ -55,14 +53,13 @@ const PITR = () => {
   const tier = ui.selectedProject?.subscription_tier
   const isEnabled = configuration.walg_enabled
 
-  const isPITRSelfServeEnabled = useFlag('pitrSelfServe')
   const canReadPhysicalBackups = checkPermissions(PermissionAction.READ, 'physical_backups')
   if (!canReadPhysicalBackups) return <NoPermission resourceText="view PITR backups" />
 
   if (isLoading) return <Loading />
   if (error) return <BackupsError />
-  if (!isEnabled)
-    return isPITRSelfServeEnabled ? (
+  if (!isEnabled) {
+    return (
       <UpgradeToPro
         projectRef={ref}
         primaryText="Point in time recovery is a Pro plan add-on."
@@ -72,26 +69,8 @@ const PITR = () => {
             : 'Please enable the add-on to enable point in time recovery for your project.'
         }
       />
-    ) : (
-      <InformationBox
-        hideCollapse
-        defaultVisibility
-        title={
-          <div>
-            <p>
-              Point in time backups is an Enterprise feature. Reach out to us{' '}
-              <Link
-                href={`/support/new?ref=${ref}&category=sales&subject=Interest%20in%20enabling%20PITR%20for%20my%20project`}
-              >
-                <a className="text-brand-900">here</a>
-              </Link>{' '}
-              if you're interested!
-            </p>
-          </div>
-        }
-        icon={<IconAlertCircle size={18} strokeWidth={2} />}
-      />
     )
+  }
 
   return (
     <>
diff --git a/studio/pages/project/[ref]/database/tables.tsx b/studio/pages/project/[ref]/database/tables.tsx
index 5bdec6ce3d8..fa709fc8e06 100644
--- a/studio/pages/project/[ref]/database/tables.tsx
+++ b/studio/pages/project/[ref]/database/tables.tsx
@@ -1,7 +1,7 @@
 import { useState, useEffect } from 'react'
 import { observer } from 'mobx-react-lite'
 import { isUndefined } from 'lodash'
-import { PostgresColumn, PostgresTable } from '@supabase/postgres-meta'
+import type { PostgresColumn, PostgresTable } from '@supabase/postgres-meta'
 import { Modal } from 'ui'
 
 import { useStore } from 'hooks'
diff --git a/studio/pages/project/[ref]/editor/[id].tsx b/studio/pages/project/[ref]/editor/[id].tsx
index e273343bcd9..cd55132af0e 100644
--- a/studio/pages/project/[ref]/editor/[id].tsx
+++ b/studio/pages/project/[ref]/editor/[id].tsx
@@ -5,19 +5,18 @@ import { useRouter } from 'next/router'
 import { observer } from 'mobx-react-lite'
 import { isUndefined, isNaN } from 'lodash'
 import { Alert, Button, Checkbox, IconExternalLink, Modal } from 'ui'
-import { PostgresTable, PostgresColumn } from '@supabase/postgres-meta'
+import type { PostgresTable, PostgresColumn } from '@supabase/postgres-meta'
 
-import Base64 from 'lib/base64'
-import { tryParseJson } from 'lib/helpers'
-import { useStore, withAuth, useUrlState } from 'hooks'
+import { useStore, withAuth, useUrlState, useParams } from 'hooks'
 import { Dictionary } from 'components/grid'
 import { TableEditorLayout } from 'components/layouts'
 import { TableGridEditor } from 'components/interfaces'
 import ConfirmationModal from 'components/ui/ConfirmationModal'
+import { SchemaView } from 'types'
 
 const TableEditorPage: NextPage = () => {
   const router = useRouter()
-  const { id }: any = router.query
+  const { id } = useParams()
   const [_, setParams] = useUrlState({ arrayKeys: ['filter', 'sort'] })
 
   const { meta, ui } = useStore()
@@ -37,13 +36,17 @@ const TableEditorPage: NextPage = () => {
 
   const projectRef = ui.selectedProject?.ref
   const tables: PostgresTable[] = meta.tables.list()
+  const views: SchemaView[] = meta.views.list()
   const foreignTables: Partial<PostgresTable>[] = meta.foreignTables.list()
 
   const selectedTable = !isNaN(Number(id))
     ? // @ts-ignore
-      tables.concat(foreignTables).find((table) => table.id === Number(id))
-    : id !== undefined
-    ? tryParseJson(Base64.decode(id))
+      tables
+        // @ts-ignore
+        .concat(views)
+        // @ts-ignore
+        .concat(foreignTables)
+        .find((table) => table.id === Number(id))
     : undefined
 
   useEffect(() => {
@@ -140,7 +143,7 @@ const TableEditorPage: NextPage = () => {
       })
 
       await meta.tables.loadById(selectedColumnToDelete!.table_id)
-      if (selectedSchema) await meta.schemas.loadViews(selectedSchema)
+      if (selectedSchema) await meta.views.loadBySchema(selectedSchema)
     } catch (error: any) {
       ui.setNotification({
         category: 'error',
@@ -171,7 +174,7 @@ const TableEditorPage: NextPage = () => {
         category: 'success',
         message: `Successfully deleted table "${selectedTableToDelete.name}"`,
       })
-      if (selectedSchema) await meta.schemas.loadViews(selectedSchema)
+      if (selectedSchema) await meta.views.loadBySchema(selectedSchema)
     } catch (error: any) {
       ui.setNotification({
         error,
diff --git a/studio/pages/project/[ref]/editor/index.tsx b/studio/pages/project/[ref]/editor/index.tsx
index 7532dd7fc3c..74762a22dac 100644
--- a/studio/pages/project/[ref]/editor/index.tsx
+++ b/studio/pages/project/[ref]/editor/index.tsx
@@ -3,7 +3,7 @@ import { NextPage } from 'next'
 import router from 'next/router'
 import { observer } from 'mobx-react-lite'
 import { isUndefined } from 'lodash'
-import { PostgresTable } from '@supabase/postgres-meta'
+import type { PostgresTable } from '@supabase/postgres-meta'
 
 import { useStore, withAuth } from 'hooks'
 import { TableEditorLayout } from 'components/layouts'
@@ -55,7 +55,7 @@ const Editor: NextPage = () => {
         category: 'success',
         message: `Successfully deleted ${selectedTableToDelete!.name}`,
       })
-      await meta.schemas.loadViews(selectedSchema)
+      await meta.views.loadBySchema(selectedSchema)
     } catch (error: any) {
       ui.setNotification({
         category: 'error',
diff --git a/studio/pages/project/[ref]/functions/[id]/details.tsx b/studio/pages/project/[ref]/functions/[id]/details.tsx
index 1f17b634105..248434f9d84 100644
--- a/studio/pages/project/[ref]/functions/[id]/details.tsx
+++ b/studio/pages/project/[ref]/functions/[id]/details.tsx
@@ -6,7 +6,8 @@ import { IconGlobe, IconTerminal } from 'ui'
 import { PermissionAction } from '@supabase/shared-types/out/constants'
 
 import { NextPageWithLayout } from 'types'
-import { checkPermissions, useProjectSettings, useStore } from 'hooks'
+import { useProjectSettingsQuery } from 'data/config/project-settings-query'
+import { checkPermissions, useStore } from 'hooks'
 import FunctionsLayout from 'components/layouts/FunctionsLayout'
 import CommandRender from 'components/interfaces/Functions/CommandRender'
 import NoPermission from 'components/ui/NoPermission'
@@ -95,16 +96,14 @@ const PageLayout: NextPageWithLayout = () => {
     },
   ]
 
-  const { services } = useProjectSettings(ref as string | undefined)
-
-  const API_SERVICE_ID = 1
-
   // Get the API service
-  const apiService = (services ?? []).find((x: any) => x.app.id == API_SERVICE_ID)
-  const apiKeys = apiService?.service_api_keys ?? []
-  const anonKey = apiKeys.find((x: any) => x.name === 'anon key')?.api_key
+  const { data: settings } = useProjectSettingsQuery({ projectRef: ref as string })
+  const apiService = settings?.autoApiService
+  const anonKey = apiService?.service_api_keys.find((x: any) => x.name === 'anon key')
+    ? apiService.defaultApiKey
+    : undefined
 
-  const endpoint = apiService?.app_config.endpoint ?? ''
+  const endpoint = apiService?.endpoint ?? ''
   const endpointSections = endpoint.split('.')
   const functionsEndpoint = [
     ...endpointSections.slice(0, 1),
diff --git a/studio/pages/project/[ref]/settings/billing/update/index.tsx b/studio/pages/project/[ref]/settings/billing/update/index.tsx
index 608bda83c06..9485523c31e 100644
--- a/studio/pages/project/[ref]/settings/billing/update/index.tsx
+++ b/studio/pages/project/[ref]/settings/billing/update/index.tsx
@@ -111,7 +111,9 @@ const BillingUpdate: NextPageWithLayout = () => {
     )
   }
 
-  const teamTierEnabled = useFlag('teamTier')
+  // Team tier is enabled when the flag is turned on OR the user is already on the team tier (manually assigned by us)
+  const userIsOnTeamTier = subscription?.tier?.supabase_prod_id === PRICING_TIER_PRODUCT_IDS.TEAM
+  const teamTierEnabled = userIsOnTeamTier || useFlag('teamTier')
 
   const productTiers = (products?.tiers ?? []).filter(
     (tier) => teamTierEnabled || tier.id !== STRIPE_PRODUCT_IDS.TEAM
diff --git a/studio/pages/project/[ref]/settings/general.tsx b/studio/pages/project/[ref]/settings/general.tsx
index d79e38bf45f..118d21cb6fe 100644
--- a/studio/pages/project/[ref]/settings/general.tsx
+++ b/studio/pages/project/[ref]/settings/general.tsx
@@ -1,18 +1,15 @@
 import { observer } from 'mobx-react-lite'
-import { useFlag } from 'hooks'
 import { NextPageWithLayout } from 'types'
 import { SettingsLayout } from 'components/layouts'
 import { General, Infrastructure, DeleteProjectPanel } from 'components/interfaces/Settings/General'
 import CustomDomainConfig from 'components/interfaces/Settings/General/CustomDomainConfig/CustomDomainConfig'
 
 const ProjectSettings: NextPageWithLayout = () => {
-  const isCustomDomainsEnabled = useFlag('customDomains')
-
   return (
     <div className="1xl:px-28 mx-auto flex flex-col gap-8 px-5 py-6 lg:px-16 xl:px-24 2xl:px-32 ">
       <General />
       <Infrastructure />
-      {isCustomDomainsEnabled && <CustomDomainConfig />}
+      <CustomDomainConfig />
       <DeleteProjectPanel />
     </div>
   )
diff --git a/studio/pages/sign-in.tsx b/studio/pages/sign-in.tsx
index f6d811d6664..c9fbefdb8cc 100644
--- a/studio/pages/sign-in.tsx
+++ b/studio/pages/sign-in.tsx
@@ -1,6 +1,5 @@
 import Link from 'next/link'
 
-import { useFlag } from 'hooks'
 import { NextPageWithLayout } from 'types'
 import SignInForm from 'components/interfaces/SignIn/SignInForm'
 import SignInWithGitHub from 'components/interfaces/SignIn/SignInWithGitHub'
@@ -11,8 +10,6 @@ import { IS_PLATFORM } from 'lib/constants'
 import { useRouter } from 'next/router'
 
 const SignInPage: NextPageWithLayout = () => {
-  const showSsoLogin = useFlag('mfaSso')
-
   const router = useRouter()
   useEffect(() => {
     // if the dashboard is running locally, redirect straight to the projects page
@@ -25,7 +22,7 @@ const SignInPage: NextPageWithLayout = () => {
     <>
       <div className="flex flex-col gap-5">
         <SignInWithGitHub />
-        {showSsoLogin && <SignInWithSSO />}
+        <SignInWithSSO />
 
         <div className="relative">
           <div className="absolute inset-0 flex items-center">
diff --git a/studio/pages/vercel/integrate.tsx b/studio/pages/vercel/integrate.tsx
index 424df36774d..7da27b95c78 100644
--- a/studio/pages/vercel/integrate.tsx
+++ b/studio/pages/vercel/integrate.tsx
@@ -370,8 +370,8 @@ const ProjectLinks: FC = observer(() => {
 
         // Then create env for vercel project with supabase project
         const vercelEnvs = prepareVercelEvns(defaultVercelEnvs, {
-          endpoint: `${IS_PLATFORM ? 'https' : PROJECT_ENDPOINT_PROTOCOL}://${
-            projectDetails.autoApiService.endpoint
+          endpoint: `${projectDetails.apiService.protocol ?? 'https'}://${
+            projectDetails.apiService.endpoint ?? '-'
           }`,
           anon_key: projectDetails.autoApiService.defaultApiKey,
           service_key: projectDetails.autoApiService.serviceApiKey,
diff --git a/studio/stores/common/PostgresMetaInterface.ts b/studio/stores/common/PostgresMetaInterface.ts
index 5345022f277..07445b75e46 100644
--- a/studio/stores/common/PostgresMetaInterface.ts
+++ b/studio/stores/common/PostgresMetaInterface.ts
@@ -15,6 +15,7 @@ export interface IPostgresMetaInterface<T> {
   isInitialized: boolean
 
   load: () => void
+  loadBySchema: (schema: string) => Promise<T[] | { error: ResponseError }>
   create: (payload: any) => Promise<T | { error: ResponseError }>
   update: (id: number | string, updates: any) => Promise<T | { error: ResponseError }>
   del: (id: number | string, cascade?: boolean) => Promise<boolean | { error: ResponseError }>
@@ -116,6 +117,33 @@ export default class PostgresMetaInterface<T> implements IPostgresMetaInterface<
     }
   }
 
+  async loadBySchema(schema: string) {
+    let { LOADING, ERROR, LOADED } = this.STATES
+    try {
+      this.setError(null)
+      this.setState(LOADING)
+
+      const url = this.url.includes('?')
+        ? `${this.url}&included_schemas=${schema}`
+        : `${this.url}?included_schemas=${schema}`
+      const response = await get(url, { headers: this.headers })
+      if (response.error) throw response.error
+
+      const data = response as T[]
+      const formattedData = keyBy(data, this.identifier)
+
+      this.data = { ...this.data, ...formattedData }
+      this.setState(LOADED)
+
+      return data
+    } catch (error: any) {
+      console.error('Error in loadBySchema:', error.message)
+      this.setError(error)
+      this.setState(ERROR)
+      return { error }
+    }
+  }
+
   initialDataArray(value: T[]) {
     if (this.state === this.STATES.INITIAL) {
       this.data = keyBy(value, this.identifier)
diff --git a/studio/stores/pgmeta/ColumnStore.ts b/studio/stores/pgmeta/ColumnStore.ts
index 65d379ec262..572f3e01b9c 100644
--- a/studio/stores/pgmeta/ColumnStore.ts
+++ b/studio/stores/pgmeta/ColumnStore.ts
@@ -1,5 +1,5 @@
 import PostgresMetaInterface from '../common/PostgresMetaInterface'
-import { PostgresColumn } from '@supabase/postgres-meta'
+import type { PostgresColumn } from '@supabase/postgres-meta'
 import { IRootStore } from '../RootStore'
 
 export default class ColumnStore extends PostgresMetaInterface<PostgresColumn> {
diff --git a/studio/stores/pgmeta/ExtensionsStore.ts b/studio/stores/pgmeta/ExtensionsStore.ts
index 9df35a1ab4e..0f557962e0f 100644
--- a/studio/stores/pgmeta/ExtensionsStore.ts
+++ b/studio/stores/pgmeta/ExtensionsStore.ts
@@ -1,5 +1,5 @@
 import PostgresMetaInterface from '../common/PostgresMetaInterface'
-import { PostgresColumn } from '@supabase/postgres-meta'
+import type { PostgresColumn } from '@supabase/postgres-meta'
 import { IRootStore } from '../RootStore'
 
 export default class ExtensionsStore extends PostgresMetaInterface<PostgresColumn> {
@@ -13,4 +13,9 @@ export default class ExtensionsStore extends PostgresMetaInterface<PostgresColum
   ) {
     super(rootStore, dataUrl, headers, options)
   }
+
+  // loadBySchema is not supported in this store
+  async loadBySchema(schema: string) {
+    return []
+  }
 }
diff --git a/studio/stores/pgmeta/ForeignTableStore.ts b/studio/stores/pgmeta/ForeignTableStore.ts
index 53d89bcd9f9..19c0deb4aea 100644
--- a/studio/stores/pgmeta/ForeignTableStore.ts
+++ b/studio/stores/pgmeta/ForeignTableStore.ts
@@ -1,4 +1,4 @@
-import { PostgresTable } from '@supabase/postgres-meta'
+import type { PostgresTable } from '@supabase/postgres-meta'
 import PostgresMetaInterface from '../common/PostgresMetaInterface'
 import { IRootStore } from '../RootStore'
 
@@ -13,4 +13,9 @@ export default class ForeignTableStore extends PostgresMetaInterface<Partial<Pos
   ) {
     super(rootStore, dataUrl, headers, options)
   }
+
+  // loadBySchema is not supported in this store
+  async loadBySchema(schema: string) {
+    return []
+  }
 }
diff --git a/studio/stores/pgmeta/MetaStore.ts b/studio/stores/pgmeta/MetaStore.ts
index eef317f1397..3dcaaeae83e 100644
--- a/studio/stores/pgmeta/MetaStore.ts
+++ b/studio/stores/pgmeta/MetaStore.ts
@@ -1,23 +1,24 @@
 import Papa from 'papaparse'
 import { makeObservable, observable } from 'mobx'
-import { find, isUndefined, isEqual, isEmpty, chunk, values } from 'lodash'
+import { find, isUndefined, isEqual, isEmpty, chunk } from 'lodash'
 import { Query } from 'components/grid/query/Query'
 
-import {
+import type {
   PostgresColumn,
   PostgresTable,
   PostgresRelationship,
   PostgresPrimaryKey,
+  PostgresSchema,
 } from '@supabase/postgres-meta'
 
 import { IS_PLATFORM, API_URL } from 'lib/constants'
 import { post } from 'lib/common/fetch'
 import { timeout } from 'lib/helpers'
-import { ResponseError } from 'types'
+import { ResponseError, SchemaView } from 'types'
 
 import { IRootStore } from '../RootStore'
 import ColumnStore from './ColumnStore'
-import SchemaStore, { ISchemaStore } from './SchemaStore'
+import SchemaStore from './SchemaStore'
 import TableStore, { ITableStore } from './TableStore'
 import OpenApiStore, { IOpenApiStore } from './OpenApiStore'
 import { IPostgresMetaInterface } from '../common/PostgresMetaInterface'
@@ -41,6 +42,7 @@ import HooksStore from './HooksStore'
 import ExtensionsStore from './ExtensionsStore'
 import TypesStore from './TypesStore'
 import ForeignTableStore from './ForeignTableStore'
+import ViewStore from './ViewStore'
 
 const BATCH_SIZE = 1000
 const CHUNK_SIZE = 1024 * 1024 * 0.1 // 0.1MB
@@ -51,7 +53,8 @@ export interface IMetaStore {
   openApi: IOpenApiStore
   tables: ITableStore
   columns: IPostgresMetaInterface<PostgresColumn>
-  schemas: ISchemaStore
+  schemas: IPostgresMetaInterface<PostgresSchema>
+  views: IPostgresMetaInterface<SchemaView>
   foreignTables: IPostgresMetaInterface<Partial<PostgresTable>>
 
   hooks: IPostgresMetaInterface<any>
@@ -132,6 +135,7 @@ export default class MetaStore implements IMetaStore {
   tables: TableStore
   columns: ColumnStore
   schemas: SchemaStore
+  views: ViewStore
   foreignTables: ForeignTableStore
 
   hooks: HooksStore
@@ -184,6 +188,7 @@ export default class MetaStore implements IMetaStore {
     this.tables = new TableStore(this.rootStore, `${this.baseUrl}/tables`, this.headers)
     this.columns = new ColumnStore(this.rootStore, `${this.baseUrl}/columns`, this.headers)
     this.schemas = new SchemaStore(this.rootStore, `${this.baseUrl}/schemas`, this.headers)
+    this.views = new ViewStore(this.rootStore, `${this.baseUrl}/views`, this.headers)
     this.foreignTables = new ForeignTableStore(
       this.rootStore,
       `${this.baseUrl}/foreign-tables`,
@@ -903,6 +908,9 @@ export default class MetaStore implements IMetaStore {
     this.schemas.setUrl(`${this.baseUrl}/schemas`)
     this.schemas.setHeaders(this.headers)
 
+    this.views.setUrl(`${this.baseUrl}/views`)
+    this.views.setHeaders(this.headers)
+
     this.foreignTables.setUrl(`${this.baseUrl}/foreign-tables`)
     this.foreignTables.setHeaders(this.headers)
 
diff --git a/studio/stores/pgmeta/PublicationStore.ts b/studio/stores/pgmeta/PublicationStore.ts
index b892d15057d..86b5cf25642 100644
--- a/studio/stores/pgmeta/PublicationStore.ts
+++ b/studio/stores/pgmeta/PublicationStore.ts
@@ -12,4 +12,9 @@ export default class PublicationStore extends PostgresMetaInterface<any> {
   ) {
     super(rootStore, dataUrl, headers, options)
   }
+
+  // loadBySchema is not supported in this store
+  async loadBySchema(schema: string) {
+    return []
+  }
 }
diff --git a/studio/stores/pgmeta/RolesStore.ts b/studio/stores/pgmeta/RolesStore.ts
index 5bd5d59fc1b..b4bb4d0c055 100644
--- a/studio/stores/pgmeta/RolesStore.ts
+++ b/studio/stores/pgmeta/RolesStore.ts
@@ -28,4 +28,9 @@ export default class RolesStore extends PostgresMetaInterface<any> {
     'pg_read_all_data',
     'pg_write_all_data',
   ]
+
+  // loadBySchema is not supported in this store
+  async loadBySchema(schema: string) {
+    return []
+  }
 }
diff --git a/studio/stores/pgmeta/SchemaStore.ts b/studio/stores/pgmeta/SchemaStore.ts
index 1fd1ff89ac5..2d9a0cc38bf 100644
--- a/studio/stores/pgmeta/SchemaStore.ts
+++ b/studio/stores/pgmeta/SchemaStore.ts
@@ -1,17 +1,8 @@
-import { observable, makeObservable } from 'mobx'
-import { PostgresSchema } from '@supabase/postgres-meta'
-
-import PostgresMetaInterface, { IPostgresMetaInterface } from '../common/PostgresMetaInterface'
+import type { PostgresSchema } from '@supabase/postgres-meta'
+import PostgresMetaInterface from '../common/PostgresMetaInterface'
 import { IRootStore } from '../RootStore'
-import { SchemaView, ResponseError } from 'types'
 
-export interface ISchemaStore extends IPostgresMetaInterface<PostgresSchema> {
-  views: SchemaView[]
-  loadViews: (schema: string) => Promise<any | { error: ResponseError }>
-}
 export default class SchemaStore extends PostgresMetaInterface<PostgresSchema> {
-  views: SchemaView[] = []
-
   constructor(
     rootStore: IRootStore,
     dataUrl: string,
@@ -21,10 +12,6 @@ export default class SchemaStore extends PostgresMetaInterface<PostgresSchema> {
     options?: { identifier: string }
   ) {
     super(rootStore, dataUrl, headers, options)
-    makeObservable(this, {
-      views: observable,
-    })
-    this.views = []
   }
 
   // Dashboard to hide schemas with pg_ prefix
@@ -34,15 +21,4 @@ export default class SchemaStore extends PostgresMetaInterface<PostgresSchema> {
 
     return super.list(schemasFilter)
   }
-
-  async loadViews(schema: string) {
-    const query = `
-      select schemaname as schema, viewname as name from pg_catalog.pg_views
-      where schemaname = '${schema}'
-      order by schemaname, viewname;
-    `
-    const views = await this.rootStore.meta.query(query)
-    this.views = views
-    return views
-  }
 }
diff --git a/studio/stores/pgmeta/TableStore.ts b/studio/stores/pgmeta/TableStore.ts
index bb627c6d5c9..5063db74c65 100644
--- a/studio/stores/pgmeta/TableStore.ts
+++ b/studio/stores/pgmeta/TableStore.ts
@@ -1,5 +1,5 @@
 import { action, makeObservable } from 'mobx'
-import { PostgresTable } from '@supabase/postgres-meta'
+import type { PostgresTable } from '@supabase/postgres-meta'
 
 import PostgresMetaInterface, { IPostgresMetaInterface } from '../common/PostgresMetaInterface'
 import { IRootStore } from '../RootStore'
diff --git a/studio/stores/pgmeta/TypesStore.ts b/studio/stores/pgmeta/TypesStore.ts
index c7057dbc333..1b507f1be03 100644
--- a/studio/stores/pgmeta/TypesStore.ts
+++ b/studio/stores/pgmeta/TypesStore.ts
@@ -1,5 +1,5 @@
 import PostgresMetaInterface from '../common/PostgresMetaInterface'
-import { PostgresType } from '@supabase/postgres-meta'
+import type { PostgresType } from '@supabase/postgres-meta'
 import { IRootStore } from '../RootStore'
 
 export default class TypesStore extends PostgresMetaInterface<PostgresType> {
diff --git a/studio/stores/pgmeta/ViewStore.ts b/studio/stores/pgmeta/ViewStore.ts
new file mode 100644
index 00000000000..63b74701e42
--- /dev/null
+++ b/studio/stores/pgmeta/ViewStore.ts
@@ -0,0 +1,16 @@
+import { SchemaView } from 'types'
+import PostgresMetaInterface from '../common/PostgresMetaInterface'
+import { IRootStore } from '../RootStore'
+
+export default class ViewStore extends PostgresMetaInterface<SchemaView> {
+  constructor(
+    rootStore: IRootStore,
+    dataUrl: string,
+    headers?: {
+      [prop: string]: any
+    },
+    options?: { identifier: string }
+  ) {
+    super(rootStore, dataUrl, headers, options)
+  }
+}
diff --git a/studio/stores/project/VaultStore.ts b/studio/stores/project/VaultStore.ts
index a470a864470..a803ff64dbc 100644
--- a/studio/stores/project/VaultStore.ts
+++ b/studio/stores/project/VaultStore.ts
@@ -1,7 +1,7 @@
-import { PostgresColumn } from '@supabase/postgres-meta'
+import type { PostgresColumn } from '@supabase/postgres-meta'
 import { Query } from 'components/grid'
 import { makeAutoObservable } from 'mobx'
-import { VaultSecret } from 'types'
+import { SchemaView, VaultSecret } from 'types'
 import { IRootStore } from '../RootStore'
 
 export interface IVaultStore {
@@ -211,9 +211,9 @@ export default class VaultStore implements IVaultStore {
   async listEncryptedColumns(schema: string, table: string) {
     if (!table) return []
 
-    await this.rootStore.meta.schemas.loadViews(schema)
-    const decryptedView = this.rootStore.meta.schemas.views.find(
-      (view) => view.name === `decrypted_${table}`
+    await this.rootStore.meta.views.loadBySchema(schema)
+    const decryptedView = this.rootStore.meta.views.find(
+      (view: SchemaView) => view.name === `decrypted_${table}`
     )
     if (!decryptedView) return []
 
diff --git a/studio/styles/contextMenu.scss b/studio/styles/contextMenu.scss
index 88d9680880d..418b2fcd9a0 100644
--- a/studio/styles/contextMenu.scss
+++ b/studio/styles/contextMenu.scss
@@ -4,6 +4,9 @@
     .react-contexify__item__content {
       @apply dark:text-white text-sm;
     }
+    .react-contexify__submenu {
+      @apply dark:bg-gray-300 border;
+    }
   }
   .react-contexify__item:not(.react-contexify__item--disabled):hover
     > .react-contexify__item__content,
diff --git a/studio/tailwind.config.js b/studio/tailwind.config.js
index a8cab68a3f1..21148b6013e 100644
--- a/studio/tailwind.config.js
+++ b/studio/tailwind.config.js
@@ -1,3 +1,4 @@
+const { repeat } = require('lodash')
 const ui = require('./../packages/config/ui.config.js')
 
 const blueGray = {
@@ -120,6 +121,9 @@ module.exports = ui({
       fontSize: {
         grid: '13px',
       },
+      gridTemplateColumns: {
+        billingWithTeam: 'repeat(3, minmax(0, 1fr)) 0.9fr',
+      },
       colors: {
         // gray: { ...gray },
         // green: { ...green },
diff --git a/studio/types/ui.ts b/studio/types/ui.ts
index f8d5308ac25..5e295507e6a 100644
--- a/studio/types/ui.ts
+++ b/studio/types/ui.ts
@@ -1,3 +1,5 @@
+import type { PostgresColumn } from '@supabase/postgres-meta'
+
 export interface Notification {
   category: 'info' | 'error' | 'success' | 'loading'
   message: string // Readable message for users to understand
@@ -33,6 +35,10 @@ export interface VaultSecret {
 }
 
 export interface SchemaView {
+  id: number
   name: string
   schema: string
+  is_updatable: boolean
+  comment?: string
+  columns: PostgresColumn[]
 }
diff --git a/supabase/functions/og-images/component/Docs.tsx b/supabase/functions/og-images/component/Docs.tsx
index eef40786d56..5293a1b4bc2 100644
--- a/supabase/functions/og-images/component/Docs.tsx
+++ b/supabase/functions/og-images/component/Docs.tsx
@@ -42,7 +42,7 @@ const Docs = (props: Props) => {
         </div>
         <div tw="flex flex-col">
           <div tw="flex flex-col absolute left-[64px] top-[154px] w-[1072px]">
-            <h1 tw="my-0 mb-2 text-[60px]">{title}</h1>
+            <h1 tw="my-0 mb-2 text-[60px]">{!title ? 'Supabase' : title.substring(0, 1).toUpperCase() + title.substring(1)}</h1>
             <p tw="my-0 mt-2 text-[40px] text-[#f2fff9] opacity-50">{description}</p>
           </div>
           <div tw="flex flex-row items-center justify-center absolute left-[64px] top-[500px]">
@@ -54,4 +54,4 @@ const Docs = (props: Props) => {
     )
 }
 
-export default Docs
\ No newline at end of file
+export default Docs