Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use App\Models\User;
use Illuminate\Http\Resources\Json\JsonResource;
use Illuminate\Support\Facades\Vite;
use Illuminate\Support\ServiceProvider;
use Laravel\Pulse\Facades\Pulse;

Expand All @@ -13,6 +14,8 @@ public function boot(): void
{
JsonResource::withoutWrapping();

Vite::prefetch(concurrency: 3);

// @codeCoverageIgnoreStart
Pulse::users(function ($ids) {
return User::findMany($ids)->map(fn ($user) => [
Expand Down
Binary file modified bun.lockb
Binary file not shown.
144 changes: 73 additions & 71 deletions composer.lock

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"devDependencies": {
"@heroicons/vue": "^2.1.5",
"@inertiajs/vue3": "^1.2.0",
"@sentry/vue": "^8.30.0",
"@tailwindcss/forms": "^0.5.9",
"@vitejs/plugin-vue": "^5.1.4",
"autoprefixer": "^10.4.20",
Expand All @@ -16,8 +17,6 @@
"sass": "^1.79.1",
"tailwindcss": "^3.4.12",
"vite": "^5.4.6",
"vite-svg-loader": "^5.1.0",
"vue": "^3.5.6",
"@sentry/vue": "^8.30.0"
"vue": "^3.5.6"
}
}
7 changes: 3 additions & 4 deletions resources/js/Layouts/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@
</template>

<script setup>
import { computed } from "vue";
import { computed, defineAsyncComponent } from "vue";
import { usePage } from '@inertiajs/vue3'

import Header from "@js/Components/Header.vue";
import Footer from "@js/Components/Footer.vue";
import Notice from "@js/Components/Notice.vue";
const Header = defineAsyncComponent(() => import("@js/Components/Header.vue"));
const Footer = defineAsyncComponent(() => import("@js/Components/Footer.vue"));

const page = usePage();

Expand Down
2 changes: 0 additions & 2 deletions resources/js/Pages/EmailVerification/Show.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
import { ref } from "vue";
import { router } from "@inertiajs/vue3";

import PageTitle from "@js/Components/PageTitle.vue";

const title = ref("Verify Your Email");

const resend = () => {
Expand Down
2 changes: 0 additions & 2 deletions resources/js/Pages/Login/Show.vue
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,6 @@
import { ref } from "vue";
import { useForm } from "@inertiajs/vue3";

import PageTitle from "@js/Components/PageTitle.vue";

const props = defineProps({
email: String,
password: String,
Expand Down
2 changes: 0 additions & 2 deletions resources/js/Pages/Register/Show.vue
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@
import { ref } from "vue";
import { useForm } from "@inertiajs/vue3";

import PageTitle from "@js/Components/PageTitle.vue";

const props = defineProps({
first_name: String,
last_name: String,
Expand Down
2 changes: 0 additions & 2 deletions resources/js/Pages/ResetPassword/Edit.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@
import { ref } from "vue";
import { useForm } from "@inertiajs/vue3";

import PageTitle from "@js/Components/PageTitle.vue";

const props = defineProps({
email: String,
token: String,
Expand Down
2 changes: 0 additions & 2 deletions resources/js/Pages/ResetPassword/Show.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@
import { ref } from "vue";
import { useForm } from "@inertiajs/vue3";

import PageTitle from "@js/Components/PageTitle.vue";

const title = ref("Forgot Password");
const forgotPasswordForm = useForm({
email: "",
Expand Down
11 changes: 5 additions & 6 deletions resources/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ import * as Sentry from "@sentry/vue";

import { route, ZiggyVue } from 'ziggy-js';

import { createApp, h } from 'vue';
import { createApp, defineAsyncComponent, h } from 'vue';
import { createInertiaApp, Link, Head } from '@inertiajs/vue3';

import { userCan } from "@js/utilities/permissions.js";

import {
Bars3Icon,
XMarkIcon,
Expand All @@ -16,9 +14,9 @@ import {
ExclamationCircleIcon,
} from '@heroicons/vue/24/outline';

import AppLayout from "@js/Layouts/App.vue";
import { userCan } from "@js/utilities/permissions.js";

import Notice from "@js/Components/Notice.vue";
const AppLayout = defineAsyncComponent(() => import('@js/Layouts/App.vue'));

createInertiaApp({
resolve: name => {
Expand Down Expand Up @@ -53,7 +51,8 @@ createInertiaApp({

VueApp.component('Head', Head)
.component('Link', Link)
.component('Notice', Notice);
.component('PageTitle', defineAsyncComponent(() => import('@js/Components/PageTitle.vue')))
.component('Notice', defineAsyncComponent(() => import('@js/Components/Notice.vue')));

VueApp.mount(el);
},
Expand Down
23 changes: 12 additions & 11 deletions vite.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { defineConfig } from 'vite';
import laravel from 'laravel-vite-plugin';
import vue from '@vitejs/plugin-vue';
import svgLoader from 'vite-svg-loader';

export default defineConfig({
plugins: [
Expand All @@ -21,35 +20,37 @@ export default defineConfig({
},
},
}),

svgLoader({
svgoConfig: {
multipass: true,
},
}),
],

resolve: {
alias: {
// 'ziggy': '/vendor/tightenco/ziggy/src/js',
// 'ziggy-vue': '/vendor/tightenco/ziggy/src/js/vue',
'ziggy-js': '/vendor/tightenco/ziggy',
'@': '/resources',
'@fonts': '/public/fonts',
'@img': '/public/img',
'@js': '/resources/js',
'@scss': '/resources/scss',
},
},

css: {
preprocessorOptions: {
scss: {
api: 'modern',
},
},
},

build: {
sourcemap: false,
rollupOptions: {
output: {
manualChunks(id) {
manualChunks: (id) => {
if (id.includes('node_modules')) {
return 'vendor';
}

if (id.includes('resources')) {
if (id.includes('resources/js')) {
return 'app';
}
},
Expand Down