Merge branch 'master' into dev

Author: KaelWD

lerna.json

@@ -14,4 +14,4 @@
   },
   "npmClient": "pnpm",
   "version": "3.9.0-beta.1"
-}
+}

packages/docs/package.json

@@ -26,7 +26,7 @@
     "@vue/compiler-dom": "^3.5.13",
     "@vuelidate/core": "^2.0.3",
     "@vuelidate/validators": "^2.0.4",
-    "@vuetify/one": "^2.2.4",
+    "@vuetify/one": "^2.3.0",
     "algoliasearch": "^4.24.0",
     "fflate": "^0.8.2",
     "isomorphic-fetch": "^3.0.0",

packages/docs/src/App.vue

@@ -70,7 +70,7 @@
 
     auth.verify()
 
-    watch(() => user.theme, val => {
+    watch(() => user.one.theme, val => {
       if (val === 'system') {
         media = getMatchMedia()!
         media.addEventListener('change', onThemeChange)
@@ -85,7 +85,7 @@
 
     watchEffect(() => {
       theme.global.name.value = (
-        user.theme === 'system' ? systemTheme.value : user.theme
+        user.one.theme === 'system' ? systemTheme.value : user.one.theme
       )
     })
 

packages/docs/src/components/PageFeatures.vue

@@ -14,7 +14,7 @@
     </page-feature-chip>
 
     <page-feature-chip
-      v-if="one.isSubscriber && user.pins"
+      v-if="one.isSubscriber && user.ecosystem.docs.pins.enabled"
       :prepend-icon="`mdi-pin${!pinned ? '-outline' : ''}`"
       text="Pin"
       @click="onClickPin"

packages/docs/src/components/api/ApiTable.vue

@@ -28,7 +28,7 @@
             }"
           />
 
-          <tr v-if="item.description || (user.dev && item.source)">
+          <tr v-if="item.description || (user.one.devmode && item.source)">
             <td class="text-mono pt-4" colspan="3">
               <template v-if="item.description">
                 <AppMarkdown
@@ -39,9 +39,9 @@
                 <span v-else>{{ item.description }}</span>
               </template>
 
-              <p v-if="user.dev && item.source">
+              <p v-if="user.one.devmode && item.source">
                 <strong>source: {{ item.source }}</strong>
-                <template v-if="user.dev && item.descriptionSource && item.source !== item.descriptionSource">
+                <template v-if="user.one.devmode && item.descriptionSource && item.source !== item.descriptionSource">
                   <br>
                   <strong>description source: {{ item.descriptionSource }}</strong>
                 </template>
@@ -82,7 +82,7 @@
 
   const filtered = computed(() => {
     const items = props.items.filter((item: any) => {
-      return user.dev || item.description !== '**FOR INTERNAL USE ONLY**'
+      return user.one.devmode || item.description !== '**FOR INTERNAL USE ONLY**'
     })
     if (!appStore.apiSearch) return items
 

packages/docs/src/components/api/DirectiveTable.vue

@@ -9,9 +9,9 @@
     />
     <span v-else>{{ item.description }}</span>
 
-    <p v-if="user.dev && item.source">
+    <p v-if="user.one.devmode && item.source">
       <strong>source: {{ item.source }}</strong>
-      <template v-if="user.dev && item.descriptionSource && item.source !== item.descriptionSource">
+      <template v-if="user.one.devmode && item.descriptionSource && item.source !== item.descriptionSource">
         <br>
         <strong>description source: {{ item.descriptionSource }}</strong>
       </template>

packages/docs/src/components/api/Inline.vue

@@ -1,6 +1,6 @@
 <template>
   <border-chip
-    :prepend-icon="user.api === 'inline' ? 'mdi-flask-outline' : 'mdi-flask-empty-outline'"
+    :prepend-icon="user.ecosystem.docs.api === 'inline' ? 'mdi-flask-outline' : 'mdi-flask-empty-outline'"
     :text="t('toggle', [`${t('inline')} ${t('api')}`])"
     class="mb-2"
     @click="onClick"
@@ -57,13 +57,13 @@
     return pageToApi[path as keyof typeof pageToApi]
   })
 
-  const showInline = computed(() => user.api === 'inline')
+  const showInline = computed(() => user.ecosystem.docs.api === 'inline')
 
   onBeforeMount(() => {
     name.value = components.value?.[0] ?? ''
   })
 
   function onClick () {
-    user.api = user.api === 'inline' ? 'link-only' : 'inline'
+    user.ecosystem.docs.api = user.ecosystem.docs.api === 'inline' ? 'link-only' : 'inline'
   }
 </script>

packages/docs/src/components/app/Markup.vue

@@ -3,9 +3,9 @@
     <v-sheet
       v-bind="{ ...hoverProps, ...$attrs }"
       ref="root"
-      :color="theme.name.value === 'light' && !user.mixedTheme ? 'surface-bright' : undefined"
+      :color="theme.name.value === 'light' && !user.ecosystem.docs.mixedTheme ? 'surface-bright' : undefined"
       :rounded="rounded"
-      :theme="theme.name.value === 'light' && user.mixedTheme ? 'dark' : theme.name.value"
+      :theme="theme.name.value === 'light' && user.ecosystem.docs.mixedTheme ? 'dark' : theme.name.value"
       class="app-markup overflow-hidden"
       dir="ltr"
     >

packages/docs/src/components/app/Toc.vue

@@ -103,7 +103,7 @@
           </v-col>
 
           <v-col
-            v-if="spot.spot && (!user.disableAds || (user.showHouseAds && spot.spot.sponsor === 'Vuetify'))"
+            v-if="spot.spot && (user.one.ads.enabled || (user.one.ads.house && spot.spot.sponsor === 'Vuetify'))"
             cols="12"
           >
             <a

packages/docs/src/components/app/V2Banner.vue

@@ -38,9 +38,9 @@
 <script setup>
   const user = useUserStore()
 
-  const showBanner = computed(() => !user.notifications.last.v2banner)
+  const showBanner = computed(() => !user.one.banners.last)
 
   function onClose () {
-    user.notifications.last.v2banner = Date.now()
+    user.one.banners.last = Date.now()
   }
 </script>