Skip to content

Commit

Permalink
Supports Laravel 12 and Inertia.js 2 (#1564)
Browse files Browse the repository at this point in the history
* Supports Laravel 12

Signed-off-by: Mior Muhammad Zaki <[email protected]>

* Support Inertia.js 2

Signed-off-by: Mior Muhammad Zaki <[email protected]>

---------

Signed-off-by: Mior Muhammad Zaki <[email protected]>
  • Loading branch information
crynobone authored Feb 20, 2025
1 parent 621ff5d commit 6c6bbd0
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: true
matrix:
php: [8.2, 8.3, 8.4]
laravel: [11]
laravel: [11, 12]

name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}

Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
fail-fast: true
matrix:
stack: [inertia, livewire]
laravel: ['11.x-dev']
laravel: ['11.x-dev', 'dev-master']

name: Test Stubs - Laravel ${{ matrix.laravel }} - ${{ matrix.stack }}

Expand All @@ -65,7 +65,7 @@ jobs:

- name: Setup Laravel
run: |
composer create-project laravel/laravel:^${{ matrix.laravel }} .
composer create-project laravel/laravel:${{ matrix.laravel }} .
composer require laravel/jetstream:@dev --no-interaction --no-update
composer config repositories.jetstream '{"type": "path", "url": "jetstream"}' --file composer.json
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@
"require": {
"php": "^8.2.0",
"ext-json": "*",
"illuminate/console": "^11.0",
"illuminate/support": "^11.0",
"illuminate/console": "^11.0|^12.0",
"illuminate/support": "^11.0|^12.0",
"laravel/fortify": "^1.20",
"mobiledetect/mobiledetectlib": "^4.8.08",
"symfony/console": "^7.0"
},
"require-dev": {
"inertiajs/inertia-laravel": "^1.0",
"inertiajs/inertia-laravel": "^2.0",
"laravel/sanctum": "^4.0",
"livewire/livewire": "^3.3",
"mockery/mockery": "^1.0",
"orchestra/testbench": "^9.0",
"orchestra/testbench": "^9.0|^10.0",
"phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^10.4"
"phpunit/phpunit": "^11.0"
},
"autoload": {
"psr-4": {
Expand Down
4 changes: 2 additions & 2 deletions src/Console/InstallCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ protected function livewireRouteDefinition()
protected function installInertiaStack()
{
// Install Inertia...
if (! $this->requireComposerPackages('inertiajs/inertia-laravel:^1.0', 'tightenco/ziggy:^2.0')) {
if (! $this->requireComposerPackages('inertiajs/inertia-laravel:^2.0', 'tightenco/ziggy:^2.0')) {
return false;
}

Expand All @@ -355,7 +355,7 @@ protected function installInertiaStack()
// Install NPM packages...
$this->updateNodePackages(function ($packages) {
return [
'@inertiajs/vue3' => '^1.0.14',
'@inertiajs/vue3' => '^2.0',
'@tailwindcss/forms' => '^0.5.7',
'@tailwindcss/typography' => '^0.5.10',
'@vitejs/plugin-vue' => '^5.0.0',
Expand Down

0 comments on commit 6c6bbd0

Please sign in to comment.