From 647c9bc29e7ff2dd5d3455e925c33445c8400b79 Mon Sep 17 00:00:00 2001 From: Tim MacDonald Date: Wed, 20 Dec 2023 01:44:37 +1100 Subject: [PATCH 1/6] Update version requirement (#6292) --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e9319dfebb0..fe1122a83d4 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ }, "devDependencies": { "axios": "^1.6.1", - "laravel-vite-plugin": "^0.8.0", - "vite": "^4.0.0" + "laravel-vite-plugin": "^1.0.0", + "vite": "^5.0.0" } } From 07fdfbc8d8d88440634bd1c42075653dbb5df402 Mon Sep 17 00:00:00 2001 From: driesvints Date: Tue, 19 Dec 2023 15:18:17 +0000 Subject: [PATCH 2/6] Update CHANGELOG --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61700d13d44..39481a20ef1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Release Notes -## [Unreleased](https://github.com/laravel/laravel/compare/v10.2.10...10.x) +## [Unreleased](https://github.com/laravel/laravel/compare/v10.3.0...10.x) + +## [v10.3.0](https://github.com/laravel/laravel/compare/v10.2.10...v10.3.0) - 2023-12-19 + +* [10.x] Use `assertOk()` instead of `assertStatus(200)` in tests by [@TENIOS](https://github.com/TENIOS) in https://github.com/laravel/laravel/pull/6287 +* [10.x] Vite 5 by [@timacdonald](https://github.com/timacdonald) in https://github.com/laravel/laravel/pull/6292 ## [v10.2.10](https://github.com/laravel/laravel/compare/v10.2.9...v10.2.10) - 2023-11-30 From 890835b7a13213d09c9f005d06be614204c2ef59 Mon Sep 17 00:00:00 2001 From: Ahmed shamim Date: Sat, 23 Dec 2023 21:57:06 +0600 Subject: [PATCH 3/6] [10.x] Add roundrobin transport driver config (#6301) * add roundrobin transport driver config * Update mail.php --------- Co-authored-by: Taylor Otwell --- config/mail.php | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/config/mail.php b/config/mail.php index d7416b15261..e894b2e5f8d 100644 --- a/config/mail.php +++ b/config/mail.php @@ -29,7 +29,7 @@ | mailers below. You are free to add additional mailers as required. | | Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2", - | "postmark", "log", "array", "failover" + | "postmark", "log", "array", "failover", "roundrobin" | */ @@ -50,16 +50,16 @@ 'transport' => 'ses', ], - 'mailgun' => [ - 'transport' => 'mailgun', + 'postmark' => [ + 'transport' => 'postmark', + // 'message_stream_id' => null, // 'client' => [ // 'timeout' => 5, // ], ], - 'postmark' => [ - 'transport' => 'postmark', - // 'message_stream_id' => null, + 'mailgun' => [ + 'transport' => 'mailgun', // 'client' => [ // 'timeout' => 5, // ], @@ -86,6 +86,14 @@ 'log', ], ], + + 'roundrobin' => [ + 'transport' => 'roundrobin', + 'mailers' => [ + 'ses', + 'postmark', + ], + ], ], /* From 705f97c5c8a093b520e8ae5c50501ea6528c0be2 Mon Sep 17 00:00:00 2001 From: driesvints Date: Wed, 27 Dec 2023 14:41:58 +0000 Subject: [PATCH 4/6] Update CHANGELOG --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39481a20ef1..d34e77f5eb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Release Notes -## [Unreleased](https://github.com/laravel/laravel/compare/v10.3.0...10.x) +## [Unreleased](https://github.com/laravel/laravel/compare/v10.3.1...10.x) + +## [v10.3.1](https://github.com/laravel/laravel/compare/v10.3.0...v10.3.1) - 2023-12-23 + +* [10.x] Add roundrobin transport driver config by [@me-shaon](https://github.com/me-shaon) in https://github.com/laravel/laravel/pull/6301 ## [v10.3.0](https://github.com/laravel/laravel/compare/v10.2.10...v10.3.0) - 2023-12-19 From 0c8372a2e66595c7a8b9977cc9c145b9ce1df7ac Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Wed, 27 Dec 2023 16:47:30 +0000 Subject: [PATCH 5/6] Reverts `assertOk` change (#6303) --- tests/Feature/ExampleTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php index 2a4a09eef14..8364a84e2b7 100644 --- a/tests/Feature/ExampleTest.php +++ b/tests/Feature/ExampleTest.php @@ -14,6 +14,6 @@ public function test_the_application_returns_a_successful_response(): void { $response = $this->get('/'); - $response->assertOk(); + $response->assertStatus(200); } } From 6f6cfb020414bb084eaffeb910ac013095949e22 Mon Sep 17 00:00:00 2001 From: Jonathan Goode Date: Thu, 28 Dec 2023 16:37:47 +0000 Subject: [PATCH 6/6] Update Axios to latest version (#6306) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fe1122a83d4..faced380463 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "build": "vite build" }, "devDependencies": { - "axios": "^1.6.1", + "axios": "^1.6.3", "laravel-vite-plugin": "^1.0.0", "vite": "^5.0.0" }