Merge branch '1.x-splade' into 1.x-splade-l11

protonemedia · Mar 19, 2024 · 1fdcd3f · 1fdcd3f
2 parents 23609d0 + 4b7bbc0
commit 1fdcd3f
Show file tree

Hide file tree

Showing 30 changed files with 46 additions and 49 deletions.
diff --git a/.github/workflows/fix-php-code-style-issues.yml b/.github/workflows/fix-php-code-style-issues.yml
@@ -8,14 +8,14 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
 
       - name: Fix PHP code style issues
-        uses: aglipanci/laravel-pint-action@1.0.0
+        uses: aglipanci/laravel-pint-action@2.3.0
 
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: Fix styling
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -32,7 +32,7 @@ jobs:
         run: rm -rf vendor/laravel/breeze
 
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: "vendor/laravel/breeze"
 

diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: main
 
@@ -21,7 +21,7 @@ jobs:
           release-notes: ${{ github.event.release.body }}
 
       - name: Commit updated CHANGELOG
-        uses: stefanzweifel/git-auto-commit-action@v4
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
           branch: main
           commit_message: Update CHANGELOG

diff --git a/src/Console/InstallsSpladeStack.php b/src/Console/InstallsSpladeStack.php
@@ -33,16 +33,16 @@ protected function installSpladeStack()
         // NPM Packages...
         $this->updateNodePackages(function ($packages) {
             return [
-                '@protonemedia/laravel-splade' => '^1.4.8',
-                '@tailwindcss/forms' => '^0.5.3',
-                '@tailwindcss/typography' => '^0.5.2',
-                '@vitejs/plugin-vue' => '^4.0.0',
-                'autoprefixer' => '^10.4.12',
-                'laravel-vite-plugin' => '^0.7.5',
-                'postcss' => '^8.4.18',
-                'tailwindcss' => '^3.3.0',
-                'vite' => '^4.0.0',
-                'vue' => '^3.2.41',
+                '@protonemedia/laravel-splade' => '^1.4.18',
+                '@tailwindcss/forms'           => '^0.5.7',
+                '@tailwindcss/typography'      => '^0.5.10',
+                '@vitejs/plugin-vue'           => '^5.0',
+                'autoprefixer'                 => '^10.4.16',
+                'laravel-vite-plugin'          => '^1.0',
+                'postcss'                      => '^8.4.32',
+                'tailwindcss'                  => '^3.4',
+                'vite'                         => '^5.0',
+                'vue'                          => '^3.4',
             ] + $packages;
         });
 
@@ -86,9 +86,6 @@ protected function installSpladeStack()
         copy($spladeBreezeStubsDir.'routes/web.php', base_path('routes/web.php'));
         copy($spladeBreezeStubsDir.'routes/auth.php', base_path('routes/auth.php'));
 
-        // "Dashboard" Route...
-        $this->replaceInFile('/home', '/dashboard', app_path('Providers/RouteServiceProvider.php'));
-
         // Tailwind / Vite...
         copy($spladeBaseStubsDir.'tailwind.config.js', base_path('tailwind.config.js'));
         copy($spladeBaseStubsDir.'postcss.config.js', base_path('postcss.config.js'));

diff --git a/stubs/api/app/Http/Controllers/Auth/EmailVerificationNotificationController.php b/stubs/api/app/Http/Controllers/Auth/EmailVerificationNotificationController.php
@@ -16,7 +16,7 @@ class EmailVerificationNotificationController extends Controller
     public function store(Request $request)
     {
         if ($request->user()->hasVerifiedEmail()) {
-            return redirect()->intended(RouteServiceProvider::HOME);
+            return redirect()->intended('/dashboard');
         }
 
         $request->user()->sendEmailVerificationNotification();

diff --git a/stubs/api/app/Http/Controllers/Auth/VerifyEmailController.php b/stubs/api/app/Http/Controllers/Auth/VerifyEmailController.php
@@ -18,7 +18,7 @@ public function __invoke(EmailVerificationRequest $request)
     {
         if ($request->user()->hasVerifiedEmail()) {
             return redirect()->intended(
-                config('app.frontend_url').RouteServiceProvider::HOME.'?verified=1'
+                config('app.frontend_url').'/dashboard?verified=1'
             );
         }
 
@@ -27,7 +27,7 @@ public function __invoke(EmailVerificationRequest $request)
         }
 
         return redirect()->intended(
-            config('app.frontend_url').RouteServiceProvider::HOME.'?verified=1'
+            config('app.frontend_url').'/dashboard?verified=1'
         );
     }
 }
diff --git a/stubs/api/pest-tests/Feature/Auth/EmailVerificationTest.php b/stubs/api/pest-tests/Feature/Auth/EmailVerificationTest.php
@@ -23,7 +23,7 @@
 
     Event::assertDispatched(Verified::class);
     expect($user->fresh()->hasVerifiedEmail())->toBeTrue();
-    $response->assertRedirect(config('app.frontend_url').RouteServiceProvider::HOME.'?verified=1');
+    $response->assertRedirect(config('app.frontend_url').'/dashboard?verified=1');
 });
 
 test('email is not verified with invalid hash', function () {

diff --git a/stubs/api/tests/Feature/Auth/EmailVerificationTest.php b/stubs/api/tests/Feature/Auth/EmailVerificationTest.php
@@ -32,7 +32,7 @@ public function test_email_can_be_verified()
 
         Event::assertDispatched(Verified::class);
         $this->assertTrue($user->fresh()->hasVerifiedEmail());
-        $response->assertRedirect(config('app.frontend_url').RouteServiceProvider::HOME.'?verified=1');
+        $response->assertRedirect(config('app.frontend_url').'/dashboard?verified=1');
     }
 
     public function test_email_is_not_verified_with_invalid_hash()

diff --git a/stubs/default/app/Http/Controllers/Auth/AuthenticatedSessionController.php b/stubs/default/app/Http/Controllers/Auth/AuthenticatedSessionController.php
@@ -31,7 +31,7 @@ public function store(LoginRequest $request)
 
         $request->session()->regenerate();
 
-        return redirect()->intended(RouteServiceProvider::HOME);
+        return redirect()->intended('/dashboard');
     }
 
     /**

diff --git a/stubs/default/app/Http/Controllers/Auth/ConfirmablePasswordController.php b/stubs/default/app/Http/Controllers/Auth/ConfirmablePasswordController.php
@@ -38,6 +38,6 @@ public function store(Request $request)
 
         $request->session()->put('auth.password_confirmed_at', time());
 
-        return redirect()->intended(RouteServiceProvider::HOME);
+        return redirect()->intended('/dashboard');
     }
 }
diff --git a/stubs/default/app/Http/Controllers/Auth/EmailVerificationNotificationController.php b/stubs/default/app/Http/Controllers/Auth/EmailVerificationNotificationController.php
@@ -16,7 +16,7 @@ class EmailVerificationNotificationController extends Controller
     public function store(Request $request)
     {
         if ($request->user()->hasVerifiedEmail()) {
-            return redirect()->intended(RouteServiceProvider::HOME);
+            return redirect()->intended('/dashboard');
         }
 
         $request->user()->sendEmailVerificationNotification();

diff --git a/stubs/default/app/Http/Controllers/Auth/EmailVerificationPromptController.php b/stubs/default/app/Http/Controllers/Auth/EmailVerificationPromptController.php
@@ -16,7 +16,7 @@ class EmailVerificationPromptController extends Controller
     public function __invoke(Request $request)
     {
         return $request->user()->hasVerifiedEmail()
-                    ? redirect()->intended(RouteServiceProvider::HOME)
+                    ? redirect()->intended('/dashboard')
                     : view('auth.verify-email');
     }
 }
diff --git a/stubs/default/app/Http/Controllers/Auth/RegisteredUserController.php b/stubs/default/app/Http/Controllers/Auth/RegisteredUserController.php
@@ -48,6 +48,6 @@ public function store(Request $request)
 
         Auth::login($user);
 
-        return redirect(RouteServiceProvider::HOME);
+        return redirect('/dashboard');
     }
 }
diff --git a/stubs/default/app/Http/Controllers/Auth/VerifyEmailController.php b/stubs/default/app/Http/Controllers/Auth/VerifyEmailController.php
@@ -17,13 +17,13 @@ class VerifyEmailController extends Controller
     public function __invoke(EmailVerificationRequest $request)
     {
         if ($request->user()->hasVerifiedEmail()) {
-            return redirect()->intended(RouteServiceProvider::HOME.'?verified=1');
+            return redirect()->intended('/dashboard?verified=1');
         }
 
         if ($request->user()->markEmailAsVerified()) {
             event(new Verified($request->user()));
         }
 
-        return redirect()->intended(RouteServiceProvider::HOME.'?verified=1');
+        return redirect()->intended('/dashboard?verified=1');
     }
 }
diff --git a/stubs/default/pest-tests/Feature/Auth/AuthenticationTest.php b/stubs/default/pest-tests/Feature/Auth/AuthenticationTest.php
@@ -18,7 +18,7 @@
     ]);
 
     $this->assertAuthenticated();
-    $response->assertRedirect(RouteServiceProvider::HOME);
+    $response->assertRedirect('/dashboard');
 });
 
 test('users can not authenticate with invalid password', function () {

diff --git a/stubs/default/pest-tests/Feature/Auth/EmailVerificationTest.php b/stubs/default/pest-tests/Feature/Auth/EmailVerificationTest.php
@@ -33,7 +33,7 @@
 
     Event::assertDispatched(Verified::class);
     expect($user->fresh()->hasVerifiedEmail())->toBeTrue();
-    $response->assertRedirect(RouteServiceProvider::HOME.'?verified=1');
+    $response->assertRedirect('/dashboard?verified=1');
 });
 
 test('email is not verified with invalid hash', function () {

diff --git a/stubs/default/pest-tests/Feature/Auth/RegistrationTest.php b/stubs/default/pest-tests/Feature/Auth/RegistrationTest.php
@@ -17,5 +17,5 @@
     ]);
 
     $this->assertAuthenticated();
-    $response->assertRedirect(RouteServiceProvider::HOME);
+    $response->assertRedirect('/dashboard');
 });
diff --git a/stubs/default/tests/Feature/Auth/AuthenticationTest.php b/stubs/default/tests/Feature/Auth/AuthenticationTest.php
@@ -28,7 +28,7 @@ public function test_users_can_authenticate_using_the_login_screen()
         ]);
 
         $this->assertAuthenticated();
-        $response->assertRedirect(RouteServiceProvider::HOME);
+        $response->assertRedirect('/dashboard');
     }
 
     public function test_users_can_not_authenticate_with_invalid_password()

diff --git a/stubs/default/tests/Feature/Auth/EmailVerificationTest.php b/stubs/default/tests/Feature/Auth/EmailVerificationTest.php
@@ -43,7 +43,7 @@ public function test_email_can_be_verified()
 
         Event::assertDispatched(Verified::class);
         $this->assertTrue($user->fresh()->hasVerifiedEmail());
-        $response->assertRedirect(RouteServiceProvider::HOME.'?verified=1');
+        $response->assertRedirect('/dashboard?verified=1');
     }
 
     public function test_email_is_not_verified_with_invalid_hash()

diff --git a/stubs/default/tests/Feature/Auth/RegistrationTest.php b/stubs/default/tests/Feature/Auth/RegistrationTest.php
@@ -27,6 +27,6 @@ public function test_new_users_can_register()
         ]);
 
         $this->assertAuthenticated();
-        $response->assertRedirect(RouteServiceProvider::HOME);
+        $response->assertRedirect('/dashboard');
     }
 }
diff --git a/stubs/inertia-common/app/Http/Controllers/Auth/AuthenticatedSessionController.php b/stubs/inertia-common/app/Http/Controllers/Auth/AuthenticatedSessionController.php
@@ -36,7 +36,7 @@ public function store(LoginRequest $request)
 
         $request->session()->regenerate();
 
-        return redirect()->intended(RouteServiceProvider::HOME);
+        return redirect()->intended('/dashboard');
     }
 
     /**

diff --git a/stubs/inertia-common/app/Http/Controllers/Auth/ConfirmablePasswordController.php b/stubs/inertia-common/app/Http/Controllers/Auth/ConfirmablePasswordController.php
@@ -39,6 +39,6 @@ public function store(Request $request)
 
         $request->session()->put('auth.password_confirmed_at', time());
 
-        return redirect()->intended(RouteServiceProvider::HOME);
+        return redirect()->intended('/dashboard');
     }
 }
diff --git a/stubs/inertia-common/app/Http/Controllers/Auth/EmailVerificationNotificationController.php b/stubs/inertia-common/app/Http/Controllers/Auth/EmailVerificationNotificationController.php
@@ -16,7 +16,7 @@ class EmailVerificationNotificationController extends Controller
     public function store(Request $request)
     {
         if ($request->user()->hasVerifiedEmail()) {
-            return redirect()->intended(RouteServiceProvider::HOME);
+            return redirect()->intended('/dashboard');
         }
 
         $request->user()->sendEmailVerificationNotification();

diff --git a/stubs/inertia-common/app/Http/Controllers/Auth/EmailVerificationPromptController.php b/stubs/inertia-common/app/Http/Controllers/Auth/EmailVerificationPromptController.php
@@ -17,7 +17,7 @@ class EmailVerificationPromptController extends Controller
     public function __invoke(Request $request)
     {
         return $request->user()->hasVerifiedEmail()
-                    ? redirect()->intended(RouteServiceProvider::HOME)
+                    ? redirect()->intended('/dashboard')
                     : Inertia::render('Auth/VerifyEmail', ['status' => session('status')]);
     }
 }
diff --git a/stubs/inertia-common/app/Http/Controllers/Auth/RegisteredUserController.php b/stubs/inertia-common/app/Http/Controllers/Auth/RegisteredUserController.php
@@ -49,6 +49,6 @@ public function store(Request $request)
 
         Auth::login($user);
 
-        return redirect(RouteServiceProvider::HOME);
+        return redirect('/dashboard');
     }
 }
diff --git a/stubs/inertia-common/app/Http/Controllers/Auth/VerifyEmailController.php b/stubs/inertia-common/app/Http/Controllers/Auth/VerifyEmailController.php
@@ -17,13 +17,13 @@ class VerifyEmailController extends Controller
     public function __invoke(EmailVerificationRequest $request)
     {
         if ($request->user()->hasVerifiedEmail()) {
-            return redirect()->intended(RouteServiceProvider::HOME.'?verified=1');
+            return redirect()->intended('/dashboard?verified=1');
         }
 
         if ($request->user()->markEmailAsVerified()) {
             event(new Verified($request->user()));
         }
 
-        return redirect()->intended(RouteServiceProvider::HOME.'?verified=1');
+        return redirect()->intended('/dashboard?verified=1');
     }
 }
diff --git a/stubs/splade/dusk-tests/Auth/AuthenticationTest.php b/stubs/splade/dusk-tests/Auth/AuthenticationTest.php
@@ -34,7 +34,7 @@ public function test_users_can_authenticate_using_the_login_screen()
                 ->type('email', $user->email)
                 ->type('password', 'password')
                 ->press('Log in')
-                ->waitForLocation(RouteServiceProvider::HOME)
+                ->waitForLocation('/dashboard')
                 ->assertAuthenticatedAs($user);
         });
     }

diff --git a/stubs/splade/dusk-tests/Auth/EmailVerificationTest.php b/stubs/splade/dusk-tests/Auth/EmailVerificationTest.php
@@ -43,7 +43,7 @@ public function test_email_can_be_verified()
             $browser->loginAs($user)
                 ->visit($verificationUrl)
                 ->waitForText('You\'re logged in!')
-                ->assertPathIs(RouteServiceProvider::HOME)
+                ->assertPathIs('/dashboard')
                 ->assertQueryStringHas('verified', 1);
 
             $this->assertTrue($user->fresh()->hasVerifiedEmail());

diff --git a/stubs/splade/dusk-tests/Auth/PasswordConfirmationTest.php b/stubs/splade/dusk-tests/Auth/PasswordConfirmationTest.php
@@ -34,8 +34,8 @@ public function test_password_can_be_confirmed()
                 ->waitForText('Please confirm your password before continuing.')
                 ->type('password', 'password')
                 ->press('Confirm')
-                ->waitForLocation(RouteServiceProvider::HOME)
-                ->assertPathIs(RouteServiceProvider::HOME);
+                ->waitForLocation('/dashboard')
+                ->assertPathIs('/dashboard');
         });
     }
 

diff --git a/stubs/splade/dusk-tests/Auth/RegistrationTest.php b/stubs/splade/dusk-tests/Auth/RegistrationTest.php
@@ -35,7 +35,7 @@ public function test_new_users_can_register()
                 ->type('password', 'password')
                 ->type('password_confirmation', 'password')
                 ->press('Register')
-                ->waitForLocation(RouteServiceProvider::HOME)
+                ->waitForLocation('/dashboard')
                 ->assertAuthenticated();
         });
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,7 @@ public function store(LoginRequest $request) @@
             $request->session()->regenerate();
-            return redirect()->intended(RouteServiceProvider::HOME);
+            return redirect()->intended('/dashboard');
         }
         /**
@@ Expand Down @@