Skip to content

Commit be5ed7c

Browse files
laravelwebdevlaravelwebdev
committed
5.3.2
1 parent 1c1d6dc commit be5ed7c

File tree

10 files changed

+220
-127
lines changed

10 files changed

+220
-127
lines changed

‎composer.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"php": "^8.1",
1717
"ext-json": "*",
1818
"brick/money": "^0.8|^0.9|^0.10",
19-
"illuminate/filesystem": "^10.48.23|^11.35|^12.0",
20-
"illuminate/support": "^10.48.23|^11.35|^12.0",
19+
"illuminate/filesystem": "^10.48.23|^11.44.1|^12.1.1",
20+
"illuminate/support": "^10.48.23|^11.44.1|^12.1.1",
2121
"inertiajs/inertia-laravel": "^1.3.2|^2.0",
2222
"laravel/fortify": "^1.25.4",
2323
"nesbot/carbon": "^2.62.1|^3.4",
@@ -36,10 +36,10 @@
3636
"larastan/larastan": "^2.9.14|^3.1",
3737
"laravel/pint": "^1.20",
3838
"laravel/scout": "^10.12.2",
39-
"orchestra/testbench-core": "^8.30|^9.7|^10.0",
40-
"orchestra/testbench-dusk": "^8.32|^9.10|^10.0",
41-
"orchestra/workbench": "^8.13|^9.9|^10.0",
42-
"phpstan/phpstan": "^1.12.17|^2.1",
39+
"orchestra/testbench-core": "^8.35|^9.12|^10.1",
40+
"orchestra/testbench-dusk": "^8.36|^9.15|^10.1",
41+
"orchestra/workbench": "^8.17.3|^9.13.3|^10.0.1",
42+
"phpstan/phpstan": "^1.12.20|^2.1.7",
4343
"phpunit/phpunit": "^10.5.35|^11.3.5",
4444
"predis/predis": "^2.3",
4545
"spatie/laravel-ray": "^1.39.1"
@@ -162,5 +162,5 @@
162162
},
163163
"minimum-stability": "dev",
164164
"prefer-stable": true,
165-
"version": "5.3.1"
165+
"version": "5.3.2"
166166
}

‎package-lock.json‎

Lines changed: 189 additions & 102 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
},
1414
"devDependencies": {
1515
"@babel/preset-env": "^7.26.7",
16+
"@tailwindcss/container-queries": "^0.1.1",
17+
"@tailwindcss/typography": "^0.5.16",
1618
"@types/lodash": "^4.17.15",
1719
"@vue/babel-plugin-jsx": "^1.2.5",
1820
"@vue/babel-preset-jsx": "^1.4.0",
@@ -33,6 +35,7 @@
3335
"prettier": "^3.4.2",
3436
"prettier-plugin-organize-imports": "^3.2.4",
3537
"prettier-plugin-tailwindcss": "^0.5.14",
38+
"tailwindcss": "^3.4.17",
3639
"ts-loader": "^9.5.2",
3740
"typescript": "^5.7.3",
3841
"vue-loader": "^17.4.2"
@@ -43,8 +46,6 @@
4346
"@heroicons/vue": "^2.2.0",
4447
"@inertiajs/vue3": "^2.0.4",
4548
"@popperjs/core": "^2.11.8",
46-
"@tailwindcss/container-queries": "^0.1.1",
47-
"@tailwindcss/typography": "^0.5.16",
4849
"@vue/compat": "^3.5.13",
4950
"@vueuse/core": "^10.11.1",
5051
"@vueuse/integrations": "^10.11.1",
@@ -67,10 +68,9 @@
6768
"numbro": "^2.5.0",
6869
"pusher-js": "^7.6.0",
6970
"slugify": "^1.6.6",
70-
"tailwindcss": "^3.4.17",
7171
"tiny-emitter": "^2.1.0",
7272
"toastedjs": "0.0.2",
73-
"trix": "^2.1.12",
73+
"trix": "^2.1.13",
7474
"uid": "^2.0.2",
7575
"vue": "^3.5.13",
7676
"vuex": "^4.1.0"

‎public/app.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/mix-manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"/app.js": "/app.js?id=743b2055c9f33e7f0bcc8baae41de516",
2+
"/app.js": "/app.js?id=c063635517bd8af4b510120b3d0b5cac",
33
"/ui.js": "/ui.js?id=592866a715b1c20b43fff6ca7980b279",
44
"/manifest.js": "/manifest.js?id=3267e5c99fd7b729e2f38ec55b50397d",
55
"/app.css": "/app.css?id=e6e32c23966698900f862c22cfc1651d",

‎resources/js/components/Repeater/RepeaterRow.vue‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,15 @@
4343
<div
4444
class="grid grid-cols-full divide-y divide-gray-100 dark:divide-gray-700"
4545
>
46-
<div v-for="(field, fieldIndex) in item.fields" :key="field.uniqueKey">
46+
<div
47+
v-for="(nestedField, nestedFieldIndex) in item.fields"
48+
:key="nestedField.uniqueKey"
49+
>
4750
<component
48-
:ref="fieldRefs[`fields.${field.attribute}`]"
49-
:is="'form-' + field.component"
50-
:field="field"
51-
:index="fieldIndex"
51+
:ref="fieldRefs[`fields.${nestedField.attribute}`]"
52+
:is="`form-${nestedField.component}`"
53+
:field="nestedField"
54+
:index="nestedFieldIndex"
5255
:errors="errors"
5356
:show-help-text="true"
5457
@file-deleted="$emit('file-deleted')"

‎src/Fields/Field.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
use Stringable;
1616

1717
/**
18-
* @phpstan-type TFieldValidationRules \Stringable|string|\Illuminate\Contracts\Validation\ValidationRule|\Illuminate\Contracts\Validation\Rule|\Illuminate\Contracts\Validation\InvokableRule|callable
19-
* @phpstan-type TValidationRules array<int, TFieldValidationRules>|\Stringable|string|(callable(string, mixed, \Closure):(void))
18+
* @phpstan-type TFieldValidationRules \Stringable|string|\Illuminate\Contracts\Validation\ValidationRule|\Illuminate\Contracts\Validation\Rule|\Illuminate\Contracts\Validation\InvokableRule|(callable(string, mixed, \Closure):(void))
19+
* @phpstan-type TValidationRules array<int, TFieldValidationRules>|TFieldValidationRules
2020
*
2121
* @method static static make(mixed $name, string|callable|object|null $attribute = null, callable|null $resolveCallback = null)
2222
*/

‎src/Http/Controllers/ResourceAttachController.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ public function __invoke(NovaRequest $request): Response
5050
)
5151
);
5252

53+
tap(new $resourceClass($model), static function ($resource) use ($request) {
54+
abort_unless($resource->authorizedToAttach($request, $request->findRelatedModelOrFail()), 401);
55+
});
56+
5357
DB::transaction(function () use ($request, $model, $pivot) {
5458
Nova::usingActionEvent(function ($actionEvent) use ($request, $model, $pivot) {
5559
$this->actionEvent = $actionEvent->forAttachedResource($request, $model, $pivot);
@@ -84,10 +88,6 @@ protected function validate(NovaRequest $request, $model, string $resourceClass)
8488

8589
$resourceClass::validateForAttachment($request);
8690
});
87-
88-
tap(new $resourceClass($model), static function ($resource) use ($request) {
89-
abort_unless($resource->authorizedToAttach($request, $request->findRelatedModelOrFail()), 401);
90-
});
9191
}
9292

9393
/**

‎src/NovaCoreServiceProvider.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ protected function registerAboutCommand(): void
119119
'Notification Polling' => AboutCommand::format(Nova::$notificationPollingInterval, console: static fn ($value) => "{$value}s"),
120120

121121
'Authentication' => AboutCommand::format(Nova::routes()->withAuthentication, console: $formatEnabledStatus),
122-
'Authentication Guard' => AboutCommand::format(config('nova.guard'), console: static fn ($value) => $value ?? 'null'),
122+
'Authentication Guard' => AboutCommand::format(Util::userGuard(), console: static fn ($value) => $value ?? 'null'),
123+
'Authentication User' => static fn () => Util::userModel(),
123124

124125
'Password Reset' => AboutCommand::format(Nova::routes()->withPasswordReset, console: $formatEnabledStatus),
125126
'Password Reset Broker' => AboutCommand::format(config('nova.passwords'), console: static fn ($value) => $value ?? 'null'),

‎webpack.mix.js.dist‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ let tailwindcss = require('tailwindcss')
44
let path = require('path')
55
let postcssImport = require('postcss-import')
66
let postcssRtlcss = require('postcss-rtlcss')
7+
let packages = require('./package.json')
78

89
/*
910
|--------------------------------------------------------------------------
@@ -21,6 +22,7 @@ mix
2122
.ts('resources/ui/ui.js', 'public/ui.js')
2223
.vue({ version: 3 })
2324
// .sourceMaps()
25+
// .extract(Object.keys(packages.dependencies))
2426
.extract()
2527
.setPublicPath('public')
2628
.postCss('resources/css/app.css', 'public', [

0 commit comments

Comments
 (0)