From fa49af8d5e85c7a34c9b1afa99108c708f6c4521 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Fri, 6 Jan 2023 14:30:57 +0100 Subject: [PATCH 1/8] Laravel v10 --- .github/workflows/tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 594b3f8a6..27183c4dd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,6 +17,7 @@ jobs: fail-fast: true matrix: stack: [blade, react, vue, api] + laravel: [9, 10] args: [null, --pest] include: - stack: vue @@ -24,7 +25,7 @@ jobs: - stack: react args: --ssr - name: Test Stubs - ${{ matrix.stack }} ${{ matrix.args }} + name: Test Stubs - Laravel ${{ matrix.stack }} - ${{ matrix.stack }} ${{ matrix.args }} steps: - name: Setup PHP @@ -38,7 +39,7 @@ jobs: - name: Setup Laravel run: | - composer create-project laravel/laravel:^9 . + composer create-project laravel/laravel:^${{ matrix.stack }} . composer require laravel/breeze:* --no-interaction --no-update composer config repositories.breeze '{"type": "path", "url": "breeze"}' --file composer.json From 63b4c92b3068588f49993fbfdc10b81f0d4b5573 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Fri, 6 Jan 2023 14:31:30 +0100 Subject: [PATCH 2/8] Update tests.yml --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 27183c4dd..6444472dc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,7 +25,7 @@ jobs: - stack: react args: --ssr - name: Test Stubs - Laravel ${{ matrix.stack }} - ${{ matrix.stack }} ${{ matrix.args }} + name: Test Stubs - Laravel ${{ matrix.laravel }} - ${{ matrix.stack }} ${{ matrix.args }} steps: - name: Setup PHP @@ -39,7 +39,7 @@ jobs: - name: Setup Laravel run: | - composer create-project laravel/laravel:^${{ matrix.stack }} . + composer create-project laravel/laravel:^${{ matrix.laravel }} . composer require laravel/breeze:* --no-interaction --no-update composer config repositories.breeze '{"type": "path", "url": "breeze"}' --file composer.json From 58cb3a9bfdf5fd8926d4bc2ab27fcc5b04ebc4f5 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Fri, 6 Jan 2023 14:33:13 +0100 Subject: [PATCH 3/8] Update tests.yml --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6444472dc..b024a6dda 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,7 +17,7 @@ jobs: fail-fast: true matrix: stack: [blade, react, vue, api] - laravel: [9, 10] + laravel: [^9, dev-master] args: [null, --pest] include: - stack: vue @@ -39,7 +39,7 @@ jobs: - name: Setup Laravel run: | - composer create-project laravel/laravel:^${{ matrix.laravel }} . + composer create-project laravel/laravel:${{ matrix.laravel }} . composer require laravel/breeze:* --no-interaction --no-update composer config repositories.breeze '{"type": "path", "url": "breeze"}' --file composer.json From a73d98ef9180674032ca65c6baa851b9ffdd802d Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Fri, 6 Jan 2023 14:34:41 +0100 Subject: [PATCH 4/8] Update composer.json --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 3dcd002b3..7f78f7027 100644 --- a/composer.json +++ b/composer.json @@ -15,10 +15,10 @@ ], "require": { "php": "^8.0.2", - "illuminate/console": "^9.21", - "illuminate/filesystem": "^9.21", - "illuminate/support": "^9.21", - "illuminate/validation": "^9.21" + "illuminate/console": "^9.21|^10.0", + "illuminate/filesystem": "^9.21|^10.0", + "illuminate/support": "^9.21|^10.0", + "illuminate/validation": "^9.21|^10.0" }, "conflict": { "laravel/framework": "<9.37.0" From 561b9422742473af805e68ed63b2e62efc024397 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Fri, 6 Jan 2023 14:36:54 +0100 Subject: [PATCH 5/8] Update tests.yml --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b024a6dda..6444472dc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,7 +17,7 @@ jobs: fail-fast: true matrix: stack: [blade, react, vue, api] - laravel: [^9, dev-master] + laravel: [9, 10] args: [null, --pest] include: - stack: vue @@ -39,7 +39,7 @@ jobs: - name: Setup Laravel run: | - composer create-project laravel/laravel:${{ matrix.laravel }} . + composer create-project laravel/laravel:^${{ matrix.laravel }} . composer require laravel/breeze:* --no-interaction --no-update composer config repositories.breeze '{"type": "path", "url": "breeze"}' --file composer.json From fcc18687c0096920700ba0d24a0e9ffe4510420f Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Fri, 13 Jan 2023 17:14:13 +0100 Subject: [PATCH 6/8] Update tests.yml --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6444472dc..febf1deb5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,7 +17,7 @@ jobs: fail-fast: true matrix: stack: [blade, react, vue, api] - laravel: [9, 10] + laravel: [^9, 10.x-dev] args: [null, --pest] include: - stack: vue @@ -39,7 +39,7 @@ jobs: - name: Setup Laravel run: | - composer create-project laravel/laravel:^${{ matrix.laravel }} . + composer create-project laravel/laravel:${{ matrix.laravel }} . composer require laravel/breeze:* --no-interaction --no-update composer config repositories.breeze '{"type": "path", "url": "breeze"}' --file composer.json From 20807e5d5cab8e5fdc2a2ae99490bd72efceded2 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 16 Jan 2023 11:28:38 +0100 Subject: [PATCH 7/8] wip --- src/Console/InstallCommand.php | 4 ++-- src/Console/InstallsInertiaStacks.php | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php index be09ca38b..029ac14e6 100644 --- a/src/Console/InstallCommand.php +++ b/src/Console/InstallCommand.php @@ -111,7 +111,7 @@ protected function installMiddlewareAfter($after, $name, $group = 'web') * Installs the given Composer Packages into the application. * * @param mixed $packages - * @return void + * @return bool */ protected function requireComposerPackages($packages) { @@ -126,7 +126,7 @@ protected function requireComposerPackages($packages) is_array($packages) ? $packages : func_get_args() ); - (new Process($command, base_path(), ['COMPOSER_MEMORY_LIMIT' => '-1'])) + return ! (new Process($command, base_path(), ['COMPOSER_MEMORY_LIMIT' => '-1'])) ->setTimeout(null) ->run(function ($type, $output) { $this->output->write($output); diff --git a/src/Console/InstallsInertiaStacks.php b/src/Console/InstallsInertiaStacks.php index d3693e3cc..0f0471c7c 100644 --- a/src/Console/InstallsInertiaStacks.php +++ b/src/Console/InstallsInertiaStacks.php @@ -11,12 +11,14 @@ trait InstallsInertiaStacks /** * Install the Inertia Vue Breeze stack. * - * @return void + * @return int|null */ protected function installInertiaVueStack() { // Install Inertia... - $this->requireComposerPackages('inertiajs/inertia-laravel:^0.6.3', 'laravel/sanctum:^2.8', 'tightenco/ziggy:^1.0'); + if (! $this->requireComposerPackages('inertiajs/inertia-laravel:^0.6.3', 'laravel/sanctum:^2.8', 'tightenco/ziggy:^1.0')) { + return 1; + } // NPM Packages... $this->updateNodePackages(function ($packages) { @@ -136,12 +138,14 @@ protected function installInertiaVueSsrStack() /** * Install the Inertia React Breeze stack. * - * @return void + * @return int|null */ protected function installInertiaReactStack() { // Install Inertia... - $this->requireComposerPackages('inertiajs/inertia-laravel:^0.6.3', 'laravel/sanctum:^2.8', 'tightenco/ziggy:^1.0'); + if (! $this->requireComposerPackages('inertiajs/inertia-laravel:^0.6.3', 'laravel/sanctum:^2.8', 'tightenco/ziggy:^1.0')) { + return 1; + } // NPM Packages... $this->updateNodePackages(function ($packages) { From 0675bc6b5a19b5fe124c910087951251fbba4894 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 16 Jan 2023 11:43:56 +0100 Subject: [PATCH 8/8] wip --- src/Console/InstallsInertiaStacks.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Console/InstallsInertiaStacks.php b/src/Console/InstallsInertiaStacks.php index 0f0471c7c..4cbb00d62 100644 --- a/src/Console/InstallsInertiaStacks.php +++ b/src/Console/InstallsInertiaStacks.php @@ -16,7 +16,7 @@ trait InstallsInertiaStacks protected function installInertiaVueStack() { // Install Inertia... - if (! $this->requireComposerPackages('inertiajs/inertia-laravel:^0.6.3', 'laravel/sanctum:^2.8', 'tightenco/ziggy:^1.0')) { + if (! $this->requireComposerPackages('inertiajs/inertia-laravel:^0.6.3', 'laravel/sanctum:^3.2', 'tightenco/ziggy:^1.0')) { return 1; } @@ -143,7 +143,7 @@ protected function installInertiaVueSsrStack() protected function installInertiaReactStack() { // Install Inertia... - if (! $this->requireComposerPackages('inertiajs/inertia-laravel:^0.6.3', 'laravel/sanctum:^2.8', 'tightenco/ziggy:^1.0')) { + if (! $this->requireComposerPackages('inertiajs/inertia-laravel:^0.6.3', 'laravel/sanctum:^3.2', 'tightenco/ziggy:^1.0')) { return 1; }