Skip to content

Commit 09e88e3

Browse files
Merge pull request #1 from laravelwebdev/v5
V5
2 parents 306af49 + 33c9afa commit 09e88e3

File tree

1,329 files changed

+30677
-21316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,329 files changed

+30677
-21316
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

bun.lockb

-464 KB
Binary file not shown.

composer.json

Lines changed: 86 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,34 @@
1313
}
1414
],
1515
"require": {
16-
"php": "^7.3|^8.0",
17-
"brick/money": "^0.5|^0.6|^0.7|^0.8|^0.9|^0.10",
18-
"doctrine/dbal": "^2.13.3|^3.1.2|^4.0",
19-
"illuminate/support": "^8.83.4|^9.3.1|^10.0|^11.0",
20-
"inertiajs/inertia-laravel": "^0.4.5|^0.5.2|^0.6.0|^1.0",
21-
"laravel/ui": "^3.3|^4.0",
22-
"nesbot/carbon": "^2.53.1|^3.0",
23-
"rap2hpoutre/fast-excel": "^3.2|^4.1|^5.0",
24-
"spatie/once": "^1.1|^2.0|^3.0",
25-
"symfony/console": "^5.4|^6.0|^7.0",
26-
"symfony/finder": "^5.4|^6.0|^7.0",
27-
"symfony/polyfill-intl-icu": "^1.22.1",
28-
"symfony/process": "^5.4|^6.0|^7.0",
29-
"ext-json": "*"
16+
"php": "^8.1",
17+
"ext-json": "*",
18+
"brick/money": "^0.8|^0.9|^0.10",
19+
"illuminate/support": "^10.48.23|^11.35",
20+
"inertiajs/inertia-laravel": "^1.3.2|^2.0",
21+
"laravel/fortify": "^1.24.5",
22+
"nesbot/carbon": "^2.62.1|^3.4",
23+
"rap2hpoutre/fast-excel": "^5.4",
24+
"spatie/once": "^3.0",
25+
"symfony/console": "^6.4.14|^7.0.3",
26+
"symfony/finder": "^6.4.13|^7.0.3",
27+
"symfony/polyfill-intl-icu": "^1.31",
28+
"symfony/polyfill-php83": "^1.31",
29+
"symfony/polyfill-php84": "^1.31",
30+
"symfony/process": "^6.4.14|^7.0.3"
3031
},
3132
"require-dev": {
32-
"larastan/larastan": "^1.0.1|^2.5.1",
33-
"laravel/nova-dusk-suite": "8.4.x-dev|9.4.x-dev|10.4.x-dev|11.4.x-dev",
34-
"laravel/pint": "^1.6",
35-
"laravel/scout": "^9.8|^10.0",
36-
"mockery/mockery": "^1.4.4",
37-
"orchestra/testbench-dusk": "^6.44|^7.40|^8.22|^9.0",
38-
"phpunit/phpunit": "^9.6|^10.5",
39-
"predis/predis": "^1.1.9|^2.0.2"
33+
"doctrine/dbal": "^3.5.1|^4.0",
34+
"larastan/larastan": "^2.5.1",
35+
"laravel/pint": "^1.17",
36+
"laravel/scout": "^10.11",
37+
"orchestra/testbench-core": "^8.30|^9.7",
38+
"orchestra/testbench-dusk": "^8.32|^9.10",
39+
"orchestra/workbench": "^8.13|^9.9",
40+
"phpstan/phpstan": "^1.12",
41+
"phpunit/phpunit": "^10.5.35|^11.3.5",
42+
"predis/predis": "^2.3",
43+
"spatie/laravel-ray": "^1.39"
4044
},
4145
"autoload": {
4246
"psr-4": {
@@ -45,13 +49,23 @@
4549
},
4650
"autoload-dev": {
4751
"psr-4": {
48-
"Laravel\\Nova\\Tests\\": "tests/"
49-
}
52+
"Laravel\\Nova\\Tests\\": "tests/",
53+
"App\\": "workbench/app/",
54+
"Database\\Factories\\": "workbench/database/factories/",
55+
"Database\\Seeders\\": "workbench/database/seeders/",
56+
"NovaComponents\\CustomField\\": "workbench/nova-components/CustomField/src/",
57+
"NovaComponents\\IconsViewer\\": "workbench/nova-components/IconsViewer/src/",
58+
"NovaComponents\\RememberTokenCopier\\": "workbench/nova-components/RememberTokenCopier/src/",
59+
"NovaComponents\\ResourceTool\\": "workbench/nova-components/ResourceTool/src/",
60+
"NovaComponents\\SidebarTool\\": "workbench/nova-components/SidebarTool/src/",
61+
"Testbench\\App\\": "tests/laravel/app/",
62+
"Testbench\\Database\\Factories\\": "tests/laravel/database/factories/"
63+
},
64+
"files": [
65+
"workbench/app/functions.php"
66+
]
5067
},
5168
"extra": {
52-
"branch-alias": {
53-
"dev-master": "3.x-dev"
54-
},
5569
"laravel": {
5670
"providers": [
5771
"Laravel\\Nova\\NovaCoreServiceProvider"
@@ -73,55 +87,75 @@
7387
"sort-packages": true
7488
},
7589
"scripts": {
76-
"post-autoload-dump": [
77-
"@clear",
90+
"post-update-cmd": [
7891
"@php vendor/bin/dusk-updater detect --auto-update --ansi",
79-
"@php vendor/bin/testbench-dusk package:discover --ansi"
92+
"@dusk:prepare",
93+
"@sync"
8094
],
8195
"clear": [
8296
"@php vendor/bin/testbench-dusk package:purge-skeleton --ansi",
8397
"@php vendor/bin/testbench-dusk package:dusk-purge --ansi"
8498
],
85-
"dusk:prepare": [
86-
"@php -r \"file_exists('phpunit.dusk.xml') || copy('phpunit.dusk.xml.dist', 'phpunit.dusk.xml'); \"",
87-
"@php -r \"if (file_exists('workbench/.env.dusk')) { copy('workbench/.env.dusk', 'vendor/laravel/nova-dusk-suite/.env'); } else { copy('workbench/.env.dusk.example', 'vendor/laravel/nova-dusk-suite/.env'); }\""
88-
],
89-
"dusk:dev-assets": [
99+
"build:dev-assets": [
90100
"TAILWIND_MODE=build npm run dev",
91-
"@php vendor/bin/testbench-dusk nova:publish --force --ansi"
101+
"@sync"
92102
],
93-
"dusk:assets": [
103+
"build:assets": [
94104
"TAILWIND_MODE=build npm run prod",
105+
"@sync"
106+
],
107+
"sync": [
108+
"@php vendor/bin/testbench-dusk package:sync-skeleton --ansi",
109+
"@php vendor/bin/testbench-dusk package:discover --ansi",
95110
"@php vendor/bin/testbench-dusk nova:publish --force --ansi"
96111
],
97-
"dusk:test": [
112+
"dusk:prepare": [
113+
"@clear",
114+
"@php vendor/bin/testbench workbench:drop-sqlite-db --ansi",
115+
"@php -r \"file_exists('phpunit.dusk.xml') || copy('phpunit.dusk.xml.dist', 'phpunit.dusk.xml'); \"",
98116
"@php vendor/bin/testbench-dusk package:dusk-purge --ansi",
99-
"@php vendor/bin/phpunit -c phpunit.dusk.xml --stop-on-failure --stop-on-error"
117+
"@php vendor/bin/testbench-dusk workbench:build --ansi"
100118
],
101-
"dusk:filter": [
102-
"./vendor/bin/testbench-dusk package:dusk-purge --ansi && ./vendor/bin/phpunit -c phpunit.dusk.xml --filter"
119+
"test": [
120+
"@clear",
121+
"@php vendor/bin/testbench workbench:drop-sqlite-db --ansi",
122+
"@php vendor/bin/testbench workbench:build --ansi",
123+
"@php vendor/bin/phpunit"
124+
],
125+
"dusk:test": [
126+
"@dusk:prepare",
127+
"@php vendor/bin/phpunit -c phpunit.dusk.xml --stop-on-failure --stop-on-error"
103128
],
104129
"test:local": [
105-
"@php vendor/bin/phpunit -c phpunit.xml --group date-field,datetime-field,external-network --testdox",
130+
"@dusk:prepare",
131+
"@php vendor/bin/phpunit --group date-field,datetime-field,external-network --testdox",
106132
"@php vendor/bin/phpunit -c phpunit.dusk.xml --group date-field,datetime-field,external-network --testdox"
107133
],
134+
"lint": [
135+
"@php vendor/bin/pint src --config=pint.json",
136+
"@php vendor/bin/pint workbench --config=pint.json",
137+
"@php vendor/bin/pint tests --config=tests/pint.json",
138+
"@php vendor/bin/pint types --config=tests/pint.json",
139+
"@php vendor/bin/phpstan analyse --verbose"
140+
],
108141
"serve": [
109142
"@clear",
110-
"@php vendor/bin/testbench package:discover --ansi",
111-
"@php vendor/bin/testbench workbench:build --ansi",
112-
"@php vendor/bin/testbench serve"
143+
"@php vendor/bin/testbench-dusk package:discover --ansi",
144+
"@php vendor/bin/testbench-dusk workbench:build --ansi",
145+
"@putenv PHP_CLI_SERVER_WORKERS=5",
146+
"@php vendor/bin/testbench-dusk serve --ansi"
147+
],
148+
"herd": [
149+
"@clear",
150+
"@sync",
151+
"@php vendor/bin/testbench-dusk workbench:build --ansi",
152+
"APP_URL=http://laravel-nova.test herd open laravel-nova"
113153
]
114154
},
115155
"suggest": {
116156
"ext-intl": "Required to format Currency field"
117157
},
118-
"repositories": [
119-
{
120-
"type": "vcs",
121-
"url": "https://github.com/laravel/nova-dusk-suite"
122-
}
123-
],
124158
"minimum-stability": "dev",
125159
"prefer-stable": true,
126-
"version": "4.35.5"
160+
"version": "5.0.2"
127161
}

config/nova.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Laravel\Nova\Http\Middleware\Authorize;
66
use Laravel\Nova\Http\Middleware\BootTools;
77
use Laravel\Nova\Http\Middleware\DispatchServingNovaEvent;
8+
// use Laravel\Nova\Http\Middleware\EnsureEmailIsVerified;
89
use Laravel\Nova\Http\Middleware\HandleInertiaRequests;
910

1011
return [
@@ -108,6 +109,7 @@
108109
'api_middleware' => [
109110
'nova',
110111
Authenticate::class,
112+
// EnsureEmailIsVerified::class,
111113
Authorize::class,
112114
],
113115

0 commit comments

Comments
 (0)