Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: laravel/jetstream
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.2.2
Choose a base ref
...
head repository: laravel/jetstream
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v4.3.0
Choose a head ref
  • 9 commits
  • 9 files changed
  • 6 contributors

Commits on Jan 17, 2024

  1. Update CHANGELOG

    taylorotwell authored and github-actions[bot] committed Jan 17, 2024
    Copy the full SHA
    76ccdc7 View commit details

Commits on Jan 26, 2024

  1. Copy the full SHA
    c0e9c8e View commit details
  2. Update 1_Bug_report.yml

    driesvints authored Jan 26, 2024
    Copy the full SHA
    5bbb533 View commit details
  3. Update 1_Bug_report.yml

    driesvints authored Jan 26, 2024
    Copy the full SHA
    e17dd96 View commit details
  4. Update 1_Bug_report.yml

    driesvints authored Jan 26, 2024
    Copy the full SHA
    7aeafb3 View commit details
  5. Update 1_Bug_report.yml

    driesvints authored Jan 26, 2024
    Copy the full SHA
    9f0db25 View commit details

Commits on Feb 13, 2024

  1. remove sponsor link

    taylorotwell committed Feb 13, 2024
    Copy the full SHA
    4121a25 View commit details

Commits on Feb 21, 2024

  1. Update to Ziggy v2 (#1442)

    * Update to Ziggy v2
    
    * Fix paths
    bakerkretzmar authored Feb 21, 2024
    Copy the full SHA
    e8335d0 View commit details

Commits on Feb 23, 2024

  1. [4.x] Change Inertia Modal.vue component to use a native <dialog> (#1431

    )
    
    * Change Modal to use native <dialog> instead of Vue Teleport and div
    
    * changed overflow to happen earlier, to more closely match existing behavior and seem more responsive
    
    * updated livewire modal to use <dialog>
    
    * added preventDefault to allow the regular close animation to fire nicely
    
    * reverted <dialog> implementation
    
    * added second ref for showing the slot to stop content from appearing and disappearing, preventing modal size shifting
    Smef authored Feb 23, 2024
    Copy the full SHA
    c0e19ca View commit details
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/1_Bug_report.yml
Original file line number Diff line number Diff line change
@@ -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
28 changes: 1 addition & 27 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
@@ -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
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion src/Console/InstallCommand.php
Original file line number Diff line number Diff line change
@@ -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;
}

Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

use Illuminate\Http\Request;
use Inertia\Middleware;
use Tightenco\Ziggy\Ziggy;
use Tighten\Ziggy\Ziggy;

class HandleInertiaRequests extends Middleware
{
69 changes: 38 additions & 31 deletions stubs/inertia/resources/js/Components/Modal.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup>
import { computed, onMounted, onUnmounted, watch } from 'vue';
import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
const props = defineProps({
show: {
@@ -17,18 +17,27 @@ const props = defineProps({
});
const emit = defineEmits(['close']);
const dialog = ref();
const showSlot = ref(props.show);
watch(() => props.show, () => {
if (props.show) {
document.body.style.overflow = 'hidden';
showSlot.value = true;
dialog.value?.showModal();
} else {
document.body.style.overflow = null;
setTimeout(() => {
dialog.value?.close();
showSlot.value = false;
}, 200);
}
});
const close = () => {
if (props.closeable) {
emit('close');
e.preventDefault();
}
};
@@ -57,35 +66,33 @@ const maxWidthClass = computed(() => {
</script>
<template>
<teleport to="body">
<transition leave-active-class="duration-200">
<div v-show="show" class="fixed inset-0 overflow-y-auto px-4 py-6 sm:px-0 z-50" scroll-region>
<transition
enter-active-class="ease-out duration-300"
enter-from-class="opacity-0"
enter-to-class="opacity-100"
leave-active-class="ease-in duration-200"
leave-from-class="opacity-100"
leave-to-class="opacity-0"
>
<div v-show="show" class="fixed inset-0 transform transition-all" @click="close">
<div class="absolute inset-0 bg-gray-500 dark:bg-gray-900 opacity-75" />
</div>
</transition>
<dialog class="z-50 m-0 min-h-full min-w-full overflow-y-auto bg-transparent backdrop:bg-transparent" ref="dialog">
<div class="fixed inset-0 overflow-y-auto px-4 py-6 sm:px-0 z-50" scroll-region>
<transition
enter-active-class="ease-out duration-300"
enter-from-class="opacity-0"
enter-to-class="opacity-100"
leave-active-class="ease-in duration-200"
leave-from-class="opacity-100"
leave-to-class="opacity-0"
>
<div v-show="show" class="fixed inset-0 transform transition-all" @click="close">
<div class="absolute inset-0 bg-gray-500 dark:bg-gray-900 opacity-75" />
</div>
</transition>
<transition
enter-active-class="ease-out duration-300"
enter-from-class="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
enter-to-class="opacity-100 translate-y-0 sm:scale-100"
leave-active-class="ease-in duration-200"
leave-from-class="opacity-100 translate-y-0 sm:scale-100"
leave-to-class="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
>
<div v-show="show" class="mb-6 bg-white dark:bg-gray-800 rounded-lg overflow-hidden shadow-xl transform transition-all sm:w-full sm:mx-auto" :class="maxWidthClass">
<slot v-if="show" />
</div>
</transition>
</div>
</transition>
</teleport>
<transition
enter-active-class="ease-out duration-300"
enter-from-class="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
enter-to-class="opacity-100 translate-y-0 sm:scale-100"
leave-active-class="ease-in duration-200"
leave-from-class="opacity-100 translate-y-0 sm:scale-100"
leave-to-class="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
>
<div v-show="show" class="mb-6 bg-white dark:bg-gray-800 rounded-lg overflow-hidden shadow-xl transform transition-all sm:w-full sm:mx-auto" :class="maxWidthClass">
<slot v-if="showSlot"/>
</div>
</transition>
</div>
</dialog>
</template>
13 changes: 3 additions & 10 deletions stubs/inertia/resources/js/Pages/Welcome.vue
Original file line number Diff line number Diff line change
@@ -111,18 +111,11 @@ defineProps({
</div>

<div class="flex justify-center mt-16 px-6 sm:items-center sm:justify-between">
<div class="text-center text-sm text-gray-500 dark:text-gray-400 sm:text-start">
<div class="flex items-center gap-4">
<a href="https://github.com/sponsors/taylorotwell" class="group inline-flex items-center hover:text-gray-700 dark:hover:text-white focus:outline focus:outline-2 focus:rounded-sm focus:outline-red-500">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" class="-mt-px me-1 w-5 h-5 stroke-gray-400 dark:stroke-gray-600 group-hover:stroke-gray-600 dark:group-hover:stroke-gray-400">
<path stroke-linecap="round" stroke-linejoin="round" d="M21 8.25c0-2.485-2.099-4.5-4.688-4.5-1.935 0-3.597 1.126-4.312 2.733-.715-1.607-2.377-2.733-4.313-2.733C5.1 3.75 3 5.765 3 8.25c0 7.22 9 12 9 12s9-4.78 9-12z" />
</svg>
Sponsor
</a>
</div>
<div class="text-center text-sm sm:text-start">
&nbsp;
</div>

<div class="ms-4 text-center text-sm text-gray-500 dark:text-gray-400 sm:text-end sm:ms-0">
<div class="text-center text-sm text-gray-500 dark:text-gray-400 sm:text-end sm:ms-0">
Laravel v{{ laravelVersion }} (PHP v{{ phpVersion }})
</div>
</div>
2 changes: 1 addition & 1 deletion stubs/inertia/resources/js/app.js
Original file line number Diff line number Diff line change
@@ -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';

2 changes: 1 addition & 1 deletion stubs/inertia/resources/js/ssr.js
Original file line number Diff line number Diff line change
@@ -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';