Merge branch 'main' into workos

taylorotwell · taylorotwell · commit 0a64b148a5c1 · 2025-07-04T07:17:04.000-05:00
diff --git a/resources/css/app.css b/resources/css/app.css
@@ -127,7 +127,7 @@
     --card: hsl(0 0% 3.9%);
     --card-foreground: hsl(0 0% 98%);
     --popover: hsl(0 0% 3.9%);
-    --popover-foreground: 0 0% 98%;
+    --popover-foreground: hsl(0 0% 98%);
     --primary: hsl(0 0% 98%);
     --primary-foreground: hsl(0 0% 9%);
     --secondary: hsl(0 0% 14.9%);
diff --git a/resources/js/layouts/app/AppSidebarLayout.vue b/resources/js/layouts/app/AppSidebarLayout.vue
@@ -17,7 +17,7 @@ withDefaults(defineProps<Props>(), {
 <template>
     <AppShell variant="sidebar">
         <AppSidebar />
-        <AppContent variant="sidebar">
+        <AppContent variant="sidebar" class="overflow-x-hidden">
             <AppSidebarHeader :breadcrumbs="breadcrumbs" />
             <slot />
         </AppContent>
diff --git a/resources/js/pages/Dashboard.vue b/resources/js/pages/Dashboard.vue
@@ -16,7 +16,7 @@ const breadcrumbs: BreadcrumbItem[] = [
     <Head title="Dashboard" />
 
     <AppLayout :breadcrumbs="breadcrumbs">
-        <div class="flex h-full flex-1 flex-col gap-4 rounded-xl p-4">
+        <div class="flex h-full flex-1 flex-col gap-4 rounded-xl p-4 overflow-x-auto">
             <div class="grid auto-rows-min gap-4 md:grid-cols-3">
                 <div class="relative aspect-video overflow-hidden rounded-xl border border-sidebar-border/70 dark:border-sidebar-border">
                     <PlaceholderPattern />
diff --git a/resources/js/pages/settings/Profile.vue b/resources/js/pages/settings/Profile.vue
@@ -17,7 +17,7 @@ interface Props {
 
 defineProps<Props>();
 
-const breadcrumbs: BreadcrumbItem[] = [
+const breadcrumbItems: BreadcrumbItem[] = [
     {
         title: 'Profile settings',
         href: '/settings/profile',
@@ -40,7 +40,7 @@ const submit = () => {
 </script>
 
 <template>
-    <AppLayout :breadcrumbs="breadcrumbs">
+    <AppLayout :breadcrumbs="breadcrumbItems">
         <Head title="Profile settings" />
 
         <SettingsLayout>
diff --git a/resources/js/ssr.ts b/resources/js/ssr.ts
@@ -11,7 +11,7 @@ createServer((page) =>
     createInertiaApp({
         page,
         render: renderToString,
-        title: (title) => `${title} - ${appName}`,
+        title: (title) => title ? `${title} - ${appName}` : appName,
         resolve: resolvePage,
         setup: ({ App, props, plugin }) =>
             createSSRApp({ render: () => h(App, props) })
diff --git a/resources/js/types/globals.d.ts b/resources/js/types/globals.d.ts
@@ -17,7 +17,7 @@ declare module '@inertiajs/core' {
     interface PageProps extends InertiaPageProps, AppPageProps {}
 }
 
-declare module '@vue/runtime-core' {
+declare module 'vue' {
     interface ComponentCustomProperties {
         $inertia: typeof Router;
         $page: Page;
diff --git a/resources/js/types/ziggy.d.ts b/resources/js/types/ziggy.d.ts
@@ -4,7 +4,7 @@ declare global {
     let route: typeof route;
 }
 
-declare module '@vue/runtime-core' {
+declare module 'vue' {
     interface ComponentCustomProperties {
         route: typeof route;
     }
diff --git a/vite.config.ts b/vite.config.ts
@@ -1,6 +1,5 @@
 import vue from '@vitejs/plugin-vue';
 import laravel from 'laravel-vite-plugin';
-import path from 'path';
 import tailwindcss from '@tailwindcss/vite';
 import { defineConfig } from 'vite';
 
@@ -21,9 +20,4 @@ export default defineConfig({
             },
         }),
     ],
-    resolve: {
-        alias: {
-            '@': path.resolve(__dirname, './resources/js'),
-        },
-    },
 });

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ declare module '@inertiajs/core' {`
`17`	`17`	`interface PageProps extends InertiaPageProps, AppPageProps {}`
`18`	`18`	`}`
`19`	`19`
`20`		`-declare module '@vue/runtime-core' {`
	`20`	`+declare module 'vue' {`
`21`	`21`	`interface ComponentCustomProperties {`
`22`	`22`	`$inertia: typeof Router;`
`23`	`23`	`$page: Page;`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ declare global {`
`4`	`4`	`let route: typeof route;`
`5`	`5`	`}`
`6`	`6`
`7`		`-declare module '@vue/runtime-core' {`
	`7`	`+declare module 'vue' {`
`8`	`8`	`interface ComponentCustomProperties {`
`9`	`9`	`route: typeof route;`
`10`	`10`	`}`