Merge branch 'master' into fix/analytics-self-hosted

.github/dependabot.yml

@@ -4,3 +4,7 @@ updates:
     directory: '/'
     schedule:
       interval: 'weekly'
+    ignore:
+      - dependency-name: '*'
+        update-types:
+          - 'version-update:semver-major'

apps/docs/components/AppleSecretGenerator/AppleSecretGenerator.tsx

@@ -104,7 +104,7 @@ const AppleSecretGenerator = () => {
   const [error, setError] = useState('')
 
   return (
-    <>
+    <div className="flex flex-col gap-3">
       <Input
         label="Account ID"
         labelOptional="required"
@@ -186,7 +186,7 @@ const AppleSecretGenerator = () => {
           />
         </>
       )}
-    </>
+    </div>
   )
 }
 

apps/docs/public/humans.txt

@@ -8,6 +8,7 @@ Alaister Young
 Alan De Los Santos
 Aleksi Immonen
 Alexander Korotkov
+Ali Waseem
 Amy Q
 Andrew Valleteau
 Andrey A

apps/studio/data/profile/profile-identities-query.ts

@@ -5,11 +5,16 @@ import { auth } from 'lib/gotrue'
 import { profileKeys } from './keys'
 
 export async function getProfileIdentities() {
-  const { error, data } = await auth.getUser()
+  // getSession() uses a cached user object, which is almost never stale as the
+  // session refresh logic keeps it fresh. If there are claims of data not being
+  // fresh, it's because it was modified on another device / browser and the
+  // session hasn't been refreshed yet.
+  const { error, data } = await auth.getSession()
 
   if (error) throw error
+  if (!data.session) throw new Error('Session not found with getSession()')
 
-  const { identities = [], new_email, email_change_sent_at } = data.user
+  const { identities = [], new_email, email_change_sent_at } = data.session.user
   return { identities, new_email, email_change_sent_at }
 }
 

apps/www/pages/careers.tsx

@@ -313,7 +313,7 @@ const CareerPage = ({ jobs, placeholderJob, contributors }: CareersPageProps) =>
             <SectionContainer className="!pb-0">
               <div className="text-center">
                 <h2 className="text-2xl sm:text-3xl xl:text-4xl max-w-[300px] xl:max-w-none mx-auto tracking-[-1px]">
-                  1,000+ Contributors building Supabase
+                  1,500+ Contributors building Supabase
                 </h2>
                 <p className="text-foreground-light text-sm lg:text-base sm:max-w-lg lg:max-w-2xl mx-auto pt-3">
                   We're building a community of communities, bringing together developers from many

packages/ui/src/lib/Layout/FormLayout/FormLayout.tsx

@@ -116,7 +116,7 @@ export function FormLayout({
 
   // console.log('error', error)
 
-  const renderError = (
+  const renderError = error && (
     <p
       data-state={error ? 'show' : 'hide'}
       className={[__styles.error.base, __styles.error.size[size]].join(' ')}