Merge branch '2.x'

# Conflicts:
#	CHANGELOG.md
#	stubs/livewire/resources/views/auth/forgot-password.blade.php
#	stubs/livewire/resources/views/auth/login.blade.php
#	stubs/livewire/resources/views/auth/register.blade.php
#	stubs/livewire/resources/views/auth/reset-password.blade.php
#	stubs/livewire/resources/views/components/confirms-password.blade.php
#	stubs/livewire/resources/views/profile/delete-user-form.blade.php
#	stubs/livewire/resources/views/profile/logout-other-browser-sessions-form.blade.php
#	stubs/livewire/resources/views/profile/update-profile-information-form.blade.php

Author: driesvints

.github/workflows/tests.yml

@@ -43,7 +43,7 @@ jobs:
           composer update --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests
-        run: vendor/bin/phpunit --verbose
+        run: vendor/bin/phpunit
 
   stub-tests:
     runs-on: ubuntu-22.04
@@ -79,7 +79,7 @@ jobs:
       - name: Install Jetstream
         run: |
           composer update "laravel/jetstream" --prefer-dist --no-interaction --no-progress -W
-          php artisan jetstream:install ${{ matrix.stack }} --teams --api --verification
+          php artisan jetstream:install ${{ matrix.stack }} --teams --api --verification --pest
 
       - name: Install NPM dependencies
         run: npm i
@@ -88,7 +88,7 @@ jobs:
         run: npm run build
 
       - name: Execute tests
-        run: vendor/bin/phpunit --verbose
+        run: vendor/bin/pest
         env:
           DB_CONNECTION: sqlite
           DB_DATABASE: ":memory:"

CHANGELOG.md

@@ -1,6 +1,15 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/jetstream/compare/v2.16.0...master)
+## [Unreleased](https://github.com/laravel/jetstream/compare/v2.16.1...master)
+
+## [v2.16.1](https://github.com/laravel/jetstream/compare/v2.16.0...v2.16.1) - 2023-02-03
+
+### Fixed
+
+- Fix typo by @nhedger in https://github.com/laravel/jetstream/pull/1230
+- Fixed not redirecting after deleting the user by @JakyeRU in https://github.com/laravel/jetstream/pull/1236
+- Use autocomplete for all fields for password manager compatibility by @lukearmstrong in https://github.com/laravel/jetstream/pull/1239
+- Fixes Pest stubs files by @nunomaduro in https://github.com/laravel/jetstream/pull/1240
 
 ## [v2.16.0](https://github.com/laravel/jetstream/compare/v2.15.0...v2.16.0) - 2023-01-18
 

src/Console/InstallCommand.php

@@ -101,7 +101,9 @@ public function handle()
         $stubs = $this->getTestStubsPath();
 
         if ($this->option('pest')) {
-            if ($this->requireComposerDevPackages('pestphp/pest:^1.16', 'pestphp/pest-plugin-laravel:^1.1')) {
+            $this->removeComposerDevPackages(['nunomaduro/collision', 'phpunit/phpunit']);
+
+            if (! $this->requireComposerDevPackages(['nunomaduro/collision:^6.4', 'pestphp/pest:^1.22', 'pestphp/pest-plugin-laravel:^1.2'])) {
                 return 1;
             }
 
@@ -670,6 +672,32 @@ protected function requireComposerPackages($packages)
             });
     }
 
+    /**
+     * Removes the given Composer Packages as "dev" dependencies.
+     *
+     * @param  mixed  $packages
+     * @return bool
+     */
+    protected function removeComposerDevPackages($packages)
+    {
+        $composer = $this->option('composer');
+
+        if ($composer !== 'global') {
+            $command = [$this->phpBinary(), $composer, 'remove', '--dev'];
+        }
+
+        $command = array_merge(
+            $command ?? ['composer', 'remove', '--dev'],
+            is_array($packages) ? $packages : func_get_args()
+        );
+
+        return (new Process($command, base_path(), ['COMPOSER_MEMORY_LIMIT' => '-1']))
+            ->setTimeout(null)
+            ->run(function ($type, $output) {
+                $this->output->write($output);
+            }) === 0;
+    }
+
     /**
      * Install the given Composer Packages as "dev" dependencies.
      *
@@ -689,11 +717,11 @@ protected function requireComposerDevPackages($packages)
             is_array($packages) ? $packages : func_get_args()
         );
 
-        return ! (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);
-            });
+            }) === 0;
     }
 
     /**

stubs/inertia/resources/js/Components/ConfirmsPassword.vue

@@ -91,6 +91,7 @@ const closeModal = () => {
                         type="password"
                         class="mt-1 block w-3/4"
                         placeholder="Password"
+                        autocomplete="current-password"
                         @keyup.enter="confirmPassword"
                     />
 

stubs/inertia/resources/js/Pages/Auth/ForgotPassword.vue

@@ -46,6 +46,7 @@ const submit = () => {
                     class="mt-1 block w-full"
                     required
                     autofocus
+                    autocomplete="username"
                 />
                 <InputError class="mt-2" :message="form.errors.email" />
             </div>

stubs/inertia/resources/js/Pages/Auth/Login.vue

@@ -51,6 +51,7 @@ const submit = () => {
                     class="mt-1 block w-full"
                     required
                     autofocus
+                    autocomplete="username"
                 />
                 <InputError class="mt-2" :message="form.errors.email" />
             </div>

stubs/inertia/resources/js/Pages/Auth/Register.vue

@@ -54,6 +54,7 @@ const submit = () => {
                     type="email"
                     class="mt-1 block w-full"
                     required
+                    autocomplete="username"
                 />
                 <InputError class="mt-2" :message="form.errors.email" />
             </div>

stubs/inertia/resources/js/Pages/Auth/ResetPassword.vue

@@ -44,6 +44,7 @@ const submit = () => {
                     class="mt-1 block w-full"
                     required
                     autofocus
+                    autocomplete="username"
                 />
                 <InputError class="mt-2" :message="form.errors.email" />
             </div>

stubs/inertia/resources/js/Pages/Profile/Partials/DeleteUserForm.vue

@@ -74,6 +74,7 @@ const closeModal = () => {
                             type="password"
                             class="mt-1 block w-3/4"
                             placeholder="Password"
+                            autocomplete="current-password"
                             @keyup.enter="deleteUser"
                         />
 

stubs/inertia/resources/js/Pages/Profile/Partials/LogoutOtherBrowserSessionsForm.vue

@@ -113,6 +113,7 @@ const closeModal = () => {
                             type="password"
                             class="mt-1 block w-3/4"
                             placeholder="Password"
+                            autocomplete="current-password"
                             @keyup.enter="logoutOtherBrowserSessions"
                         />
 

stubs/inertia/resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue

@@ -148,6 +148,7 @@ const clearPhotoFileInput = () => {
                     v-model="form.email"
                     type="email"
                     class="mt-1 block w-full"
+                    autocomplete="username"
                 />
                 <InputError :message="form.errors.email" class="mt-2" />
 

stubs/livewire/resources/views/auth/forgot-password.blade.php

@@ -21,7 +21,7 @@
 
             <div class="block">
                 <x-label for="email" value="{{ __('Email') }}" />
-                <x-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email')" required autofocus />
+                <x-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email')" required autofocus autocomplete="username" />
             </div>
 
             <div class="flex items-center justify-end mt-4">

stubs/livewire/resources/views/auth/login.blade.php

@@ -17,7 +17,7 @@
 
             <div>
                 <x-label for="email" value="{{ __('Email') }}" />
-                <x-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email')" required autofocus />
+                <x-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email')" required autofocus autocomplete="username" />
             </div>
 
             <div class="mt-4">

stubs/livewire/resources/views/auth/register.blade.php

@@ -16,7 +16,7 @@
 
             <div class="mt-4">
                 <x-label for="email" value="{{ __('Email') }}" />
-                <x-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email')" required />
+                <x-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email')" required autocomplete="username" />
             </div>
 
             <div class="mt-4">

stubs/livewire/resources/views/auth/reset-password.blade.php

@@ -13,7 +13,7 @@
 
             <div class="block">
                 <x-label for="email" value="{{ __('Email') }}" />
-                <x-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email', $request->email)" required autofocus />
+                <x-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email', $request->email)" required autofocus autocomplete="username" />
             </div>
 
             <div class="mt-4">

stubs/livewire/resources/views/components/confirms-password.blade.php

@@ -24,7 +24,7 @@
         {{ $content }}
 
         <div class="mt-4" x-data="{}" x-on:confirming-password.window="setTimeout(() => $refs.confirmable_password.focus(), 250)">
-            <x-input type="password" class="mt-1 block w-3/4" placeholder="{{ __('Password') }}"
+            <x-input type="password" class="mt-1 block w-3/4" placeholder="{{ __('Password') }}" autocomplete="current-password"
                         x-ref="confirmable_password"
                         wire:model.defer="confirmablePassword"
                         wire:keydown.enter="confirmPassword" />

stubs/livewire/resources/views/profile/delete-user-form.blade.php

@@ -29,6 +29,7 @@
 
                 <div class="mt-4" x-data="{}" x-on:confirming-delete-user.window="setTimeout(() => $refs.password.focus(), 250)">
                     <x-input type="password" class="mt-1 block w-3/4"
+                                autocomplete="current-password"
                                 placeholder="{{ __('Password') }}"
                                 x-ref="password"
                                 wire:model.defer="password"

stubs/livewire/resources/views/profile/logout-other-browser-sessions-form.blade.php

@@ -72,6 +72,7 @@
 
                 <div class="mt-4" x-data="{}" x-on:confirming-logout-other-browser-sessions.window="setTimeout(() => $refs.password.focus(), 250)">
                     <x-input type="password" class="mt-1 block w-3/4"
+                                autocomplete="current-password"
                                 placeholder="{{ __('Password') }}"
                                 x-ref="password"
                                 wire:model.defer="password"

stubs/livewire/resources/views/profile/update-profile-information-form.blade.php

@@ -62,7 +62,7 @@
         <!-- Email -->
         <div class="col-span-6 sm:col-span-4">
             <x-label for="email" value="{{ __('Email') }}" />
-            <x-input id="email" type="email" class="mt-1 block w-full" wire:model.defer="state.email" />
+            <x-input id="email" type="email" class="mt-1 block w-full" wire:model.defer="state.email" autocomplete="username" />
             <x-input-error for="email" class="mt-2" />
 
             @if (Laravel\Fortify\Features::enabled(Laravel\Fortify\Features::emailVerification()) && ! $this->user->hasVerifiedEmail())