diff --git a/.github/ISSUE_TEMPLATE/1_Bug_report.yml b/.github/ISSUE_TEMPLATE/1_Bug_report.yml index d654eaf54..e10c5d4ad 100644 --- a/.github/ISSUE_TEMPLATE/1_Bug_report.yml +++ b/.github/ISSUE_TEMPLATE/1_Bug_report.yml @@ -1,9 +1,9 @@ name: Bug Report -description: "Report a general library issue." +description: "Report something that's broken." body: - type: markdown attributes: - value: "Before submitting your report, [please ensure your Laravel version is still supported](https://laravel.com/docs/releases#support-policy)." + value: "Please read [our full contribution guide](https://laravel.com/docs/contributions#bug-reports) before submitting bug reports. If you notice improper DocBlock, PHPStan, or IDE warnings while using Laravel, do not create a GitHub issue. Instead, please submit a pull request to fix the problem." - type: input attributes: label: Jetstream Version @@ -22,7 +22,7 @@ body: - type: input attributes: label: Laravel Version - description: Provide the Laravel version that you are using. + description: Provide the Laravel version that you are using. [Please ensure it is still supported.](https://laravel.com/docs/releases#support-policy) placeholder: 10.4.1 validations: required: true diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index efea805e1..368c18587 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -12,30 +12,4 @@ permissions: jobs: tests: - runs-on: ubuntu-22.04 - - strategy: - fail-fast: true - - name: Static Analysis - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.2 - tools: composer:v2 - coverage: none - - - name: Install dependencies - uses: nick-fields/retry@v2 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress - - - name: Execute type checking - run: vendor/bin/phpstan + uses: laravel/.github/.github/workflows/static-analysis.yml@main diff --git a/CHANGELOG.md b/CHANGELOG.md index 35c859ed0..20148680f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Release Notes -## [Unreleased](https://github.com/laravel/jetstream/compare/v4.2.1...4.x) +## [Unreleased](https://github.com/laravel/jetstream/compare/v4.2.2...4.x) + +## [v4.2.2](https://github.com/laravel/jetstream/compare/v4.2.1...v4.2.2) - 2024-01-17 + +* [4.x] Fix home route by [@jessarcher](https://github.com/jessarcher) in https://github.com/laravel/jetstream/pull/1432 ## [v4.2.1](https://github.com/laravel/jetstream/compare/v4.2.0...v4.2.1) - 2023-12-27 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/Components/Modal.vue b/stubs/inertia/resources/js/Components/Modal.vue index b1c9414ae..6e4a5385e 100644 --- a/stubs/inertia/resources/js/Components/Modal.vue +++ b/stubs/inertia/resources/js/Components/Modal.vue @@ -1,5 +1,5 @@ diff --git a/stubs/inertia/resources/js/Pages/Welcome.vue b/stubs/inertia/resources/js/Pages/Welcome.vue index 7357d4640..35da5bac4 100644 --- a/stubs/inertia/resources/js/Pages/Welcome.vue +++ b/stubs/inertia/resources/js/Pages/Welcome.vue @@ -111,18 +111,11 @@ defineProps({
-
-
- - - - - Sponsor - -
+
+  
-
+
Laravel v{{ laravelVersion }} (PHP v{{ phpVersion }})
diff --git a/stubs/inertia/resources/js/app.js b/stubs/inertia/resources/js/app.js index 643d1a537..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/vue.m'; +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 5ca5e6997..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/vue.m'; +import { ZiggyVue } from '../../vendor/tightenco/ziggy'; const appName = import.meta.env.VITE_APP_NAME || 'Laravel';