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 844c10dc2a4..3975ab33dcf 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
@@ -66,7 +66,27 @@ export default defineNuxtConfig({
 
 Let's set up a Vue component to manage logins and sign ups. We'll use Magic Links, so users can sign in with their email without using passwords.
 
-```html title=/components/Auth.vue
+```vue title=/components/Auth.vue
+<script setup>
+const supabase = useSupabaseClient()
+
+const loading = ref(false)
+const email = ref('')
+
+const handleLogin = async () => {
+  try {
+    loading.value = true
+    const { error } = await supabase.auth.signInWithOtp({ email: email.value })
+    if (error) throw error
+    alert('Check your email for the login link!')
+  } catch (error) {
+    alert(error.error_description || error.message)
+  } finally {
+    loading.value = false
+  }
+}
+</script>
+
 <template>
   <form class="row flex-center flex" @submit.prevent="handleLogin">
     <div class="col-6 form-widget">
@@ -86,25 +106,6 @@ Let's set up a Vue component to manage logins and sign ups. We'll use Magic Link
     </div>
   </form>
 </template>
-
-<script setup>
-  const supabase = useSupabaseClient()
-
-  const loading = ref(false)
-  const email = ref('')
-  const handleLogin = async () => {
-    try {
-      loading.value = true
-      const { error } = await supabase.auth.signInWithOtp({ email: email.value })
-      if (error) throw error
-      alert('Check your email for the login link!')
-    } catch (error) {
-      alert(error.error_description || error.message)
-    } finally {
-      loading.value = false
-    }
-  }
-</script>
 ```
 
 ### User state
@@ -116,7 +117,70 @@ To access the user information, use the composable [useSupabaseUser](https://sup
 After a user is signed in we can allow them to edit their profile details and manage their account.
 Let's create a new component for that called `Account.vue`.
 
-```html title=components/Account.vue
+```vue title=components/Account.vue
+<script setup>
+const supabase = useSupabaseClient()
+
+const loading = ref(true)
+const username = ref('')
+const website = ref('')
+const avatar_path = ref('')
+
+loading.value = true
+const user = useSupabaseUser()
+
+let { data } = await supabase
+  .from('profiles')
+  .select(`username, website, avatar_url`)
+  .eq('id', user.value.id)
+  .single()
+
+if (data) {
+  username.value = data.username
+  website.value = data.website
+  avatar_path.value = data.avatar_url
+}
+
+loading.value = false
+
+async function updateProfile() {
+  try {
+    loading.value = true
+    const user = useSupabaseUser()
+
+    const updates = {
+      id: user.value.id,
+      username: username.value,
+      website: website.value,
+      avatar_url: avatar_path.value,
+      updated_at: new Date(),
+    }
+
+    let { error } = await supabase.from('profiles').upsert(updates, {
+      returning: 'minimal', // Don't return the value after inserting
+    })
+    if (error) throw error
+  } catch (error) {
+    alert(error.message)
+  } finally {
+    loading.value = false
+  }
+}
+
+async function signOut() {
+  try {
+    loading.value = true
+    let { error } = await supabase.auth.signOut()
+    if (error) throw error
+    user.value = null
+  } catch (error) {
+    alert(error.message)
+  } finally {
+    loading.value = false
+  }
+}
+</script>
+
 <template>
   <form class="form-widget" @submit.prevent="updateProfile">
     <div>
@@ -146,82 +210,23 @@ Let's create a new component for that called `Account.vue`.
     </div>
   </form>
 </template>
-
-<script setup>
-  const supabase = useSupabaseClient()
-
-  const loading = ref(true)
-  const username = ref('')
-  const website = ref('')
-  const avatar_path = ref('')
-
-
-  loading.value = true
-  const user = useSupabaseUser();
-  let { data } = await supabase
-      .from('profiles')
-      .select(`username, website, avatar_url`)
-      .eq('id', user.value.id)
-      .single()
-  if (data) {
-      username.value = data.username
-      website.value = data.website
-      avatar_path.value = data.avatar_url
-  }
-  loading.value = false
-
-  async function updateProfile() {
-      try {
-          loading.value = true
-          const user = useSupabaseUser();
-          const updates = {
-              id: user.value.id,
-              username: username.value,
-              website: website.value,
-              avatar_url: avatar_path.value,
-              updated_at: new Date(),
-          }
-          let { error } = await supabase.from('profiles').upsert(updates, {
-              returning: 'minimal', // Don't return the value after inserting
-          })
-          if (error) throw error
-      } catch (error) {
-          alert(error.message)
-      } finally {
-          loading.value = false
-      }
-  }
-
-  async function signOut() {
-      try {
-          loading.value = true
-          let { error } = await supabase.auth.signOut()
-          if (error) throw error
-          user.value = null
-      } catch (error) {
-          alert(error.message)
-      } finally {
-          loading.value = false
-      }
-  }
-</script>
 ```
 
 ### Launch!
 
 Now that we have all the components in place, let's update `app.vue`:
 
-```html title=app.vue
+```vue title=app.vue
+<script setup>
+const user = useSupabaseUser()
+</script>
+
 <template>
   <div class="container" style="padding: 50px 0 100px 0">
     <Account v-if="user" />
     <Auth v-else />
   </div>
 </template>
-
-<script setup>
-  const user = useSupabaseUser()
-</script>
 ```
 
 Once that's done, run this in a terminal window:
@@ -242,7 +247,65 @@ Every Supabase project is configured with [Storage](/docs/guides/storage) for ma
 
 Let's create an avatar for the user so that they can upload a profile photo. We can start by creating a new component:
 
-```html title=components/Avatar.vue
+```vue title=components/Avatar.vue
+<script setup>
+const props = defineProps(['path'])
+const { path } = toRefs(props)
+
+const emit = defineEmits(['update:path', 'upload'])
+
+const supabase = useSupabaseClient()
+
+const uploading = ref(false)
+const src = ref('')
+const files = ref()
+
+const downloadImage = async () => {
+  try {
+    const { data, error } = await supabase.storage.from('avatars').download(path.value)
+    if (error) throw error
+    src.value = URL.createObjectURL(data)
+  } catch (error) {
+    console.error('Error downloading image: ', error.message)
+  }
+}
+
+const uploadAvatar = async (evt) => {
+  files.value = evt.target.files
+  try {
+    uploading.value = true
+
+    if (!files.value || files.value.length === 0) {
+      throw new Error('You must select an image to upload.')
+    }
+
+    const file = files.value[0]
+    const fileExt = file.name.split('.').pop()
+    const fileName = `${Math.random()}.${fileExt}`
+    const filePath = `${fileName}`
+
+    let { error: uploadError } = await supabase.storage.from('avatars').upload(filePath, file)
+
+    if (uploadError) throw uploadError
+
+    emit('update:path', filePath)
+    emit('upload')
+  } catch (error) {
+    alert(error.message)
+  } finally {
+    uploading.value = false
+  }
+}
+
+downloadImage()
+
+watch(path, () => {
+  if (path.value) {
+    downloadImage()
+  }
+})
+</script>
+
 <template>
   <div>
     <img
@@ -256,7 +319,7 @@ Let's create an avatar for the user so that they can upload a profile photo. We
 
     <div style="width: 10em; position: relative;">
       <label class="button primary block" for="single">
-        {{ uploading ? "Uploading ..." : "Upload" }}
+        {{ uploading ? 'Uploading ...' : 'Upload' }}
       </label>
       <input
         style="position: absolute; visibility: hidden;"
@@ -269,65 +332,76 @@ Let's create an avatar for the user so that they can upload a profile photo. We
     </div>
   </div>
 </template>
-
-<script setup>
-  const props = defineProps(['path'])
-  const { path } = toRefs(props)
-
-  const emit = defineEmits(['update:path', 'upload'])
-
-  const supabase = useSupabaseClient()
-
-  const uploading = ref(false)
-  const src = ref('')
-  const files = ref()
-  const downloadImage = async () => {
-    try {
-      const { data, error } = await supabase.storage.from('avatars').download(path.value)
-      if (error) throw error
-      src.value = URL.createObjectURL(data)
-    } catch (error) {
-      console.error('Error downloading image: ', error.message)
-    }
-  }
-
-  const uploadAvatar = async (evt) => {
-    files.value = evt.target.files
-    try {
-      uploading.value = true
-      if (!files.value || files.value.length === 0) {
-        throw new Error('You must select an image to upload.')
-      }
-      const file = files.value[0]
-      const fileExt = file.name.split('.').pop()
-      const fileName = `${Math.random()}.${fileExt}`
-      const filePath = `${fileName}`
-      let { error: uploadError } = await supabase.storage.from('avatars').upload(filePath, file)
-      if (uploadError) throw uploadError
-      emit('update:path', filePath)
-      emit('upload')
-    } catch (error) {
-      alert(error.message)
-    } finally {
-      uploading.value = false
-    }
-  }
-
-  downloadImage()
-
-  watch(path, () => {
-    if (path.value) {
-      downloadImage()
-    }
-  })
-</script>
 ```
 
 ### Add the new widget
 
 And then we can add the widget to the Account page:
 
-```html title=components/Account.vue
+```vue title=components/Account.vue
+<script setup>
+const supabase = useSupabaseClient()
+
+const loading = ref(true)
+const username = ref('')
+const website = ref('')
+const avatar_path = ref('')
+
+loading.value = true
+const user = useSupabaseUser()
+
+let { data } = await supabase
+  .from('profiles')
+  .select(`username, website, avatar_url`)
+  .eq('id', user.value.id)
+  .single()
+
+if (data) {
+  username.value = data.username
+  website.value = data.website
+  avatar_path.value = data.avatar_url
+}
+
+loading.value = false
+
+async function updateProfile() {
+  try {
+    loading.value = true
+    const user = useSupabaseUser()
+
+    const updates = {
+      id: user.value.id,
+      username: username.value,
+      website: website.value,
+      avatar_url: avatar_path.value,
+      updated_at: new Date(),
+    }
+
+    let { error } = await supabase.from('profiles').upsert(updates, {
+      returning: 'minimal', // Don't return the value after inserting
+    })
+
+    if (error) throw error
+  } catch (error) {
+    alert(error.message)
+  } finally {
+    loading.value = false
+  }
+}
+
+async function signOut() {
+  try {
+    loading.value = true
+    let { error } = await supabase.auth.signOut()
+    if (error) throw error
+  } catch (error) {
+    alert(error.message)
+  } finally {
+    loading.value = false
+  }
+}
+</script>
+
 <template>
   <form class="form-widget" @submit.prevent="updateProfile">
     <Avatar v-model:path="avatar_path" @upload="updateProfile" />
@@ -358,64 +432,6 @@ And then we can add the widget to the Account page:
     </div>
   </form>
 </template>
-
-<script setup>
-  const supabase = useSupabaseClient()
-
-  const loading = ref(true)
-  const username = ref('')
-  const website = ref('')
-  const avatar_path = ref('')
-
-
-  loading.value = true
-  const user = useSupabaseUser();
-  let { data } = await supabase
-      .from('profiles')
-      .select(`username, website, avatar_url`)
-      .eq('id', user.value.id)
-      .single()
-  if (data) {
-      username.value = data.username
-      website.value = data.website
-      avatar_path.value = data.avatar_url
-  }
-  loading.value = false
-
-  async function updateProfile() {
-      try {
-          loading.value = true
-          const user = useSupabaseUser();
-          const updates = {
-              id: user.value.id,
-              username: username.value,
-              website: website.value,
-              avatar_url: avatar_path.value,
-              updated_at: new Date(),
-          }
-          let { error } = await supabase.from('profiles').upsert(updates, {
-              returning: 'minimal', // Don't return the value after inserting
-          })
-          if (error) throw error
-      } catch (error) {
-          alert(error.message)
-      } finally {
-          loading.value = false
-      }
-  }
-
-  async function signOut() {
-      try {
-          loading.value = true
-          let { error } = await supabase.auth.signOut()
-          if (error) throw error
-      } catch (error) {
-          alert(error.message)
-      } finally {
-          loading.value = false
-      }
-  }
-</script>
 ```
 
 That is it! You should now be able to upload a profile photo to Supabase Storage.
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 b40659546fe..0420638cb95 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
@@ -68,30 +68,30 @@ Optionally, update [src/style.css](https://raw.githubusercontent.com/supabase/su
 
 Set up an `src/components/Auth.vue` component to manage logins and sign ups. We'll use Magic Links, so users can sign in with their email without using passwords. 
 
-```html title=/src/components/Auth.vue
+```vue title=/src/components/Auth.vue
 <script setup>
-  import { ref } from 'vue'
-  import { supabase } from '../supabase'
+import { ref } from 'vue'
+import { supabase } from '../supabase'
 
-  const loading = ref(false)
-  const email = ref('')
+const loading = ref(false)
+const email = ref('')
 
-  const handleLogin = async () => {
-    try {
-      loading.value = true
-      const { error } = await supabase.auth.signInWithOtp({
-        email: email.value,
-      })
-      if (error) throw error
-      alert('Check your email for the login link!')
-    } catch (error) {
-      if (error instanceof Error) {
-        alert(error.message)
-      }
-    } finally {
-      loading.value = false
+const handleLogin = async () => {
+  try {
+    loading.value = true
+    const { error } = await supabase.auth.signInWithOtp({
+      email: email.value,
+    })
+    if (error) throw error
+    alert('Check your email for the login link!')
+  } catch (error) {
+    if (error instanceof Error) {
+      alert(error.message)
     }
+  } finally {
+    loading.value = false
   }
+}
 </script>
 
 <template>
@@ -120,82 +120,82 @@ Set up an `src/components/Auth.vue` component to manage logins and sign ups. We'
 After a user is signed in we can allow them to edit their profile details and manage their account.
 Create a new `src/components/Account.vue` component to handle this.
 
-```html title=src/components/Account.vue
+```vue title=src/components/Account.vue
 <script setup>
-  import { supabase } from '../supabase'
-  import { onMounted, ref, toRefs } from 'vue'
+import { supabase } from '../supabase'
+import { onMounted, ref, toRefs } from 'vue'
 
-  const props = defineProps(['session'])
-  const { session } = toRefs(props)
+const props = defineProps(['session'])
+const { session } = toRefs(props)
 
-  const loading = ref(true)
-  const username = ref('')
-  const website = ref('')
-  const avatar_url = ref('')
+const loading = ref(true)
+const username = ref('')
+const website = ref('')
+const avatar_url = ref('')
 
-  onMounted(() => {
-    getProfile()
-  })
+onMounted(() => {
+  getProfile()
+})
 
-  async function getProfile() {
-    try {
-      loading.value = true
-      const { user } = session.value
+async function getProfile() {
+  try {
+    loading.value = true
+    const { user } = session.value
 
-      let { data, error, status } = await supabase
-        .from('profiles')
-        .select(`username, website, avatar_url`)
-        .eq('id', user.id)
-        .single()
+    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 (error && status !== 406) throw error
 
-      if (data) {
-        username.value = data.username
-        website.value = data.website
-        avatar_url.value = data.avatar_url
-      }
-    } catch (error) {
-      alert(error.message)
-    } finally {
-      loading.value = false
+    if (data) {
+      username.value = data.username
+      website.value = data.website
+      avatar_url.value = data.avatar_url
     }
+  } catch (error) {
+    alert(error.message)
+  } finally {
+    loading.value = false
   }
+}
 
-  async function updateProfile() {
-    try {
-      loading.value = true
-      const { user } = session.value
+async function updateProfile() {
+  try {
+    loading.value = true
+    const { user } = session.value
 
-      const updates = {
-        id: user.id,
-        username: username.value,
-        website: website.value,
-        avatar_url: avatar_url.value,
-        updated_at: new Date(),
-      }
-
-      let { error } = await supabase.from('profiles').upsert(updates)
-
-      if (error) throw error
-    } catch (error) {
-      alert(error.message)
-    } finally {
-      loading.value = false
+    const updates = {
+      id: user.id,
+      username: username.value,
+      website: website.value,
+      avatar_url: avatar_url.value,
+      updated_at: new Date(),
     }
-  }
 
-  async function signOut() {
-    try {
-      loading.value = true
-      let { error } = await supabase.auth.signOut()
-      if (error) throw error
-    } catch (error) {
-      alert(error.message)
-    } finally {
-      loading.value = false
-    }
+    let { error } = await supabase.from('profiles').upsert(updates)
+
+    if (error) throw error
+  } catch (error) {
+    alert(error.message)
+  } finally {
+    loading.value = false
   }
+}
+
+async function signOut() {
+  try {
+    loading.value = true
+    let { error } = await supabase.auth.signOut()
+    if (error) throw error
+  } catch (error) {
+    alert(error.message)
+  } finally {
+    loading.value = false
+  }
+}
 </script>
 
 <template>
@@ -233,24 +233,24 @@ Create a new `src/components/Account.vue` component to handle this.
 
 Now that we have all the components in place, let's update `App.vue`:
 
-```html title=src/App.vue
+```vue title=src/App.vue
 <script setup>
-  import { onMounted, ref } from 'vue'
-  import Account from './components/Account.vue'
-  import Auth from './components/Auth.vue'
-  import { supabase } from './supabase'
+import { onMounted, ref } from 'vue'
+import Account from './components/Account.vue'
+import Auth from './components/Auth.vue'
+import { supabase } from './supabase'
 
-  const session = ref()
+const session = ref()
 
-  onMounted(() => {
-    supabase.auth.getSession().then(({ data }) => {
-      session.value = data.session
-    })
-
-    supabase.auth.onAuthStateChange((_, _session) => {
-      session.value = _session
-    })
+onMounted(() => {
+  supabase.auth.getSession().then(({ data }) => {
+    session.value = data.session
   })
+
+  supabase.auth.onAuthStateChange((_, _session) => {
+    session.value = _session
+  })
+})
 </script>
 
 <template>
@@ -279,56 +279,56 @@ Every Supabase project is configured with [Storage](/docs/guides/storage) for ma
 
 Create a new `src/components/Avatar.vue` component that allows users to upload profile photos:
 
-```html title=src/components/Avatar.vue
+```vue title=src/components/Avatar.vue
 <script setup>
-  import { ref, toRefs, watch } from 'vue'
-  import { supabase } from '../supabase'
+import { ref, toRefs, watch } from 'vue'
+import { supabase } from '../supabase'
 
-  const prop = defineProps(['path', 'size'])
-  const { path, size } = toRefs(prop)
+const prop = defineProps(['path', 'size'])
+const { path, size } = toRefs(prop)
 
-  const emit = defineEmits(['upload', 'update:path'])
-  const uploading = ref(false)
-  const src = ref('')
-  const files = ref()
+const emit = defineEmits(['upload', 'update:path'])
+const uploading = ref(false)
+const src = ref('')
+const files = ref()
 
-  const downloadImage = async () => {
-    try {
-      const { data, error } = await supabase.storage.from('avatars').download(path.value)
-      if (error) throw error
-      src.value = URL.createObjectURL(data)
-    } catch (error) {
-      console.error('Error downloading image: ', error.message)
-    }
+const downloadImage = async () => {
+  try {
+    const { data, error } = await supabase.storage.from('avatars').download(path.value)
+    if (error) throw error
+    src.value = URL.createObjectURL(data)
+  } catch (error) {
+    console.error('Error downloading image: ', error.message)
   }
+}
 
-  const uploadAvatar = async (evt) => {
-    files.value = evt.target.files
-    try {
-      uploading.value = true
-      if (!files.value || files.value.length === 0) {
-        throw new Error('You must select an image to upload.')
-      }
-
-      const file = files.value[0]
-      const fileExt = file.name.split('.').pop()
-      const filePath = `${Math.random()}.${fileExt}`
-
-      let { error: uploadError } = await supabase.storage.from('avatars').upload(filePath, file)
-
-      if (uploadError) throw uploadError
-      emit('update:path', filePath)
-      emit('upload')
-    } catch (error) {
-      alert(error.message)
-    } finally {
-      uploading.value = false
+const uploadAvatar = async (evt) => {
+  files.value = evt.target.files
+  try {
+    uploading.value = true
+    if (!files.value || files.value.length === 0) {
+      throw new Error('You must select an image to upload.')
     }
-  }
 
-  watch(path, () => {
-    if (path.value) downloadImage()
-  })
+    const file = files.value[0]
+    const fileExt = file.name.split('.').pop()
+    const filePath = `${Math.random()}.${fileExt}`
+
+    let { error: uploadError } = await supabase.storage.from('avatars').upload(filePath, file)
+
+    if (uploadError) throw uploadError
+    emit('update:path', filePath)
+    emit('upload')
+  } catch (error) {
+    alert(error.message)
+  } finally {
+    uploading.value = false
+  }
+}
+
+watch(path, () => {
+  if (path.value) downloadImage()
+})
 </script>
 
 <template>
@@ -344,7 +344,7 @@ Create a new `src/components/Avatar.vue` component that allows users to upload p
 
     <div :style="{ width: size + 'em' }">
       <label class="button primary block" for="single">
-        {{ uploading ? "Uploading ..." : "Upload" }}
+        {{ uploading ? 'Uploading ...' : 'Upload' }}
       </label>
       <input
         style="visibility: hidden; position: absolute"
@@ -363,10 +363,10 @@ Create a new `src/components/Avatar.vue` component that allows users to upload p
 
 And then we can add the widget to the Account page in `src/components/Account.vue`:
 
-```html title=src/components/Account.vue
+```vue title=src/components/Account.vue
 <script>
-  // Import the new component
-  import Avatar from './Avatar.vue'
+// Import the new component
+import Avatar from './Avatar.vue'
 </script>
 
 <template>