Skip to content

Commit c4a96b6

Browse files
committed
Merge remote-tracking branch 'origin/main' into ai-68-how-can-we-work-around-requiring-absolute-paths-needed-for
2 parents 1bd69aa + 731e498 commit c4a96b6

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

.ai/laravel/11/core.blade.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
- Use the `search-docs` tool to get version specific documentation.
44
@if (file_exists(base_path('app/Http/Kernel.php')))
5-
{{-- Migrated from Laravel 10 to Laravel 11, but did't migrate to the new Laravel 11 Structure --}}
65
- This project upgraded from Laravel 10 without migrating to the new streamlined Laravel 11 file structure.
76
- This is **perfectly fine** and recommended by Laravel. Follow the existing structure from Laravel 10. We do not to need migrate to the Laravel 11 structure unless the user explicitly requests that.
87

@@ -14,7 +13,6 @@
1413
- Console commands and schedule registration is in `app/Console/Kernel.php`
1514
- Rate limits likely exist in `RouteServiceProvider` or `app/Http/Kernel.php`
1615
@else
17-
{{-- New Laravel 11 project, or upgraded from Laravel 10 and migrated structure --}}
1816
- Laravel 11 brought a new streamlined file structure which this project now uses.
1917

2018
### Laravel 11 Structure

.ai/laravel/12/core.blade.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
- Use the `search-docs` tool to get version specific documentation.
44
@if (file_exists(base_path('app/Http/Kernel.php')))
5-
{{-- Migrated from Laravel 10 to Laravel 12, but did't migrate to the new Laravel 11 Structure --}}
65
- This project upgraded from Laravel 10 without migrating to the new streamlined Laravel file structure.
76
- This is **perfectly fine** and recommended by Laravel. Follow the existing structure from Laravel 10. We do not to need migrate to the new Laravel structure unless the user explicitly requests that.
87

@@ -14,7 +13,6 @@
1413
- Console commands and schedule register in `app/Console/Kernel.php`
1514
- Rate limits likely exist in `RouteServiceProvider` or `app/Http/Kernel.php`
1615
@else
17-
{{-- New Laravel 12 project, or upgraded from Laravel 10 and migrated structure --}}
1816
- Since Laravel 11, Laravel has a new streamlined file structure which this project uses.
1917

2018
### Laravel 12 Structure

config/boost.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
/*
88
|--------------------------------------------------------------------------
9-
| Boost Browser Logs Watcher Switch
9+
| Boost Browser Logs Watcher
1010
|--------------------------------------------------------------------------
1111
|
12-
| The following option may be used to enable or disable browser logs watcher
13-
| functionality which simply provides a single and convenient way to
14-
| enable or disable browser logs functionality in Boost.
12+
| The following option may be used to enable or disable the browser logs
13+
| watcher feature within Laravel Boost. The log watcher will read any
14+
| errors within the browser's console to give Boost better context.
1515
*/
1616

1717
'browser_logs_watcher' => env('BOOST_BROWSER_LOGS_WATCHER', true),

src/Install/GuidelineComposer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public static function composeGuidelines(Collection $guidelines): string
5252
{
5353
return trim($guidelines
5454
->filter(fn ($content) => ! empty(trim($content)))
55-
->map(fn ($content, $key) => "\n=== {$key} rules ===\n\n{$content}")
55+
->map(fn ($content, $key) => "\n=== {$key} rules ===\n\n".trim($content))
5656
->join("\n\n"));
5757
}
5858

0 commit comments

Comments
 (0)