From 46ca14ca1c8972d276d804736ae30c987d6de400 Mon Sep 17 00:00:00 2001 From: Jacob Baker-Kretzmar Date: Tue, 20 Feb 2024 17:29:19 -0500 Subject: [PATCH 1/2] Update to Ziggy v2 --- src/Console/InstallCommand.php | 2 +- stubs/inertia/app/Http/Middleware/HandleInertiaRequests.php | 2 +- stubs/inertia/resources/js/app.js | 2 +- stubs/inertia/resources/js/ssr.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php index 883d1f235..5260d6991 100644 --- a/src/Console/InstallCommand.php +++ b/src/Console/InstallCommand.php @@ -345,7 +345,7 @@ protected function livewireRouteDefinition() protected function installInertiaStack() { // Install Inertia... - if (! $this->requireComposerPackages('inertiajs/inertia-laravel:^0.6.8', 'tightenco/ziggy:^1.0')) { + if (! $this->requireComposerPackages('inertiajs/inertia-laravel:^0.6.8', 'tightenco/ziggy:^2.0')) { return false; } diff --git a/stubs/inertia/app/Http/Middleware/HandleInertiaRequests.php b/stubs/inertia/app/Http/Middleware/HandleInertiaRequests.php index dc9b4f577..51a9b0507 100644 --- a/stubs/inertia/app/Http/Middleware/HandleInertiaRequests.php +++ b/stubs/inertia/app/Http/Middleware/HandleInertiaRequests.php @@ -4,7 +4,7 @@ use Illuminate\Http\Request; use Inertia\Middleware; -use Tightenco\Ziggy\Ziggy; +use Tighten\Ziggy\Ziggy; class HandleInertiaRequests extends Middleware { diff --git a/stubs/inertia/resources/js/app.js b/stubs/inertia/resources/js/app.js index 643d1a537..2558db244 100644 --- a/stubs/inertia/resources/js/app.js +++ b/stubs/inertia/resources/js/app.js @@ -4,7 +4,7 @@ import '../css/app.css'; import { createApp, h } from 'vue'; import { createInertiaApp } from '@inertiajs/vue3'; import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers'; -import { ZiggyVue } from '../../vendor/tightenco/ziggy/dist/vue.m'; +import { ZiggyVue } from '../../vendor/tightenco/ziggy/dist'; const appName = import.meta.env.VITE_APP_NAME || 'Laravel'; diff --git a/stubs/inertia/resources/js/ssr.js b/stubs/inertia/resources/js/ssr.js index 5ca5e6997..6f10afae1 100644 --- a/stubs/inertia/resources/js/ssr.js +++ b/stubs/inertia/resources/js/ssr.js @@ -3,7 +3,7 @@ import { renderToString } from '@vue/server-renderer'; import { createInertiaApp } from '@inertiajs/vue3'; import createServer from '@inertiajs/vue3/server'; import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers'; -import { ZiggyVue } from '../../vendor/tightenco/ziggy/dist/vue.m'; +import { ZiggyVue } from '../../vendor/tightenco/ziggy/dist'; const appName = import.meta.env.VITE_APP_NAME || 'Laravel'; From 045157107408fe5388254cc5674b24c51b20dbef Mon Sep 17 00:00:00 2001 From: Jacob Baker-Kretzmar Date: Tue, 20 Feb 2024 18:28:57 -0500 Subject: [PATCH 2/2] Fix paths --- stubs/inertia/resources/js/app.js | 2 +- stubs/inertia/resources/js/ssr.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stubs/inertia/resources/js/app.js b/stubs/inertia/resources/js/app.js index 2558db244..b6f9fb04d 100644 --- a/stubs/inertia/resources/js/app.js +++ b/stubs/inertia/resources/js/app.js @@ -4,7 +4,7 @@ import '../css/app.css'; import { createApp, h } from 'vue'; import { createInertiaApp } from '@inertiajs/vue3'; import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers'; -import { ZiggyVue } from '../../vendor/tightenco/ziggy/dist'; +import { ZiggyVue } from '../../vendor/tightenco/ziggy'; const appName = import.meta.env.VITE_APP_NAME || 'Laravel'; diff --git a/stubs/inertia/resources/js/ssr.js b/stubs/inertia/resources/js/ssr.js index 6f10afae1..2168a8c82 100644 --- a/stubs/inertia/resources/js/ssr.js +++ b/stubs/inertia/resources/js/ssr.js @@ -3,7 +3,7 @@ import { renderToString } from '@vue/server-renderer'; import { createInertiaApp } from '@inertiajs/vue3'; import createServer from '@inertiajs/vue3/server'; import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers'; -import { ZiggyVue } from '../../vendor/tightenco/ziggy/dist'; +import { ZiggyVue } from '../../vendor/tightenco/ziggy'; const appName = import.meta.env.VITE_APP_NAME || 'Laravel';