5.1.7

laravelwebdev · laravelwebdev · commit ace379697ce4 · 2025-01-26T12:43:56.000+08:00
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     "illuminate/filesystem": "^10.48.23|^11.35",
     "illuminate/support": "^10.48.23|^11.35",
     "inertiajs/inertia-laravel": "^1.3.2|^2.0",
-    "laravel/fortify": "^1.25.2",
+    "laravel/fortify": "^1.25.3",
     "nesbot/carbon": "^2.62.1|^3.4",
     "rap2hpoutre/fast-excel": "^5.4",
     "spatie/once": "^3.0",
@@ -162,5 +162,5 @@
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
-  "version": "5.1.5"
+  "version": "5.1.7"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/app.css b/public/app.css
diff --git a/public/app.js b/public/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,8 +1,8 @@
 {
-    "/app.js": "/app.js?id=88cd4d0cd991a90987eca35d7375ac9e",
+    "/app.js": "/app.js?id=7d717946e7f8c89b5d805d44aedaf2ca",
     "/ui.js": "/ui.js?id=592866a715b1c20b43fff6ca7980b279",
     "/manifest.js": "/manifest.js?id=3267e5c99fd7b729e2f38ec55b50397d",
-    "/app.css": "/app.css?id=4979b631c5ac542d792aa697845f8e1d",
+    "/app.css": "/app.css?id=5be2f220306cc89d3f1400a1b2b7bb98",
     "/vendor.js": "/vendor.js?id=7ea02f3d5fdd3c4b567217ae68db7376",
     "/fonts/snunitosansv11pe01mimslybiv1o4x1m8cce4g1pty10iurt9w6fk2a.woff2": "/fonts/snunitosansv11pe01mimslybiv1o4x1m8cce4g1pty10iurt9w6fk2a.woff2?id=c8390e146be0a3c8a5498355dec892ae",
     "/fonts/snunitosansv11pe01mimslybiv1o4x1m8cce4g1pty14iurt9w6fk2a.woff2": "/fonts/snunitosansv11pe01mimslybiv1o4x1m8cce4g1pty14iurt9w6fk2a.woff2?id=b0735c7dd6126471acbaf9d6e9f5e41a",
diff --git a/resources/css/form.css b/resources/css/form.css
@@ -17,8 +17,9 @@
 }
 
 .form-control[data-disabled],
-.form-control:disabled {
-  @apply bg-gray-50 dark:bg-gray-800 text-gray-400 outline-none;
+.form-control:disabled,
+.form-control:read-only {
+  @apply bg-gray-50 dark:bg-gray-800 text-gray-400 outline-none focus:outline-none;
 }
 
 /* Form Inputs
diff --git a/resources/js/fields/Form/TextareaField.vue b/resources/js/fields/Form/TextareaField.vue
@@ -15,6 +15,7 @@
           @input="handleChange"
           class="w-full h-auto py-3 block form-control form-input form-control-bordered"
           :dusk="field.attribute"
+          :disabled="currentlyIsReadonly"
         />
 
         <CharacterCounter
diff --git a/resources/js/mixins/Filterable.js b/resources/js/mixins/Filterable.js
@@ -5,14 +5,37 @@ export default {
   data: () => ({
     filterHasLoaded: false,
     filterIsActive: false,
+    filtersAreApplied: false,
   }),
 
   watch: {
-    encodedFilters(value) {
-      Nova.$emit('filter-changed', [value])
+    encodedFilters(newValue, oldValue) {
+      if (
+        this.filterHasLoaded == false ||
+        newValue === this.initialEncodedFilters ||
+        ('' === this.initialEncodedFilters && this.filtersAreApplied === false)
+      ) {
+        return
+      }
+
+      Nova.$emit('filter-changed', [newValue])
+
+      const query = {
+        [this.filterParameter]: this.encodedFilters,
+      }
+
+      if (newValue !== oldValue) {
+        query[this.pageParameter] = 1
+      }
+
+      this.pushAfterUpdatingQueryString(query)
     },
   },
 
+  created() {
+    this.filterCurrentEncoded = this.encodedFilters
+  },
+
   methods: {
     /**
      * Clear filters and reset the resource table.
@@ -43,15 +66,11 @@ export default {
      * Handle a filter state change.
      */
     filterChanged() {
-      let filtersAreApplied =
+      this.filtersAreApplied =
         this.$store.getters[`${this.resourceName}/filtersAreApplied`]
 
-      if (filtersAreApplied || this.filterIsActive) {
+      if (this.filtersAreApplied || this.filterIsActive) {
         this.filterIsActive = true
-        this.pushAfterUpdatingQueryString({
-          [this.pageParameter]: 1,
-          [this.filterParameter]: this.encodedFilters,
-        })
       }
     },
 
diff --git a/src/Console/asset-stubs/composer.json b/src/Console/asset-stubs/composer.json
@@ -12,7 +12,7 @@
     },
     "require-dev": {
         "laravel/nova": "^5.0",
-        "laravel/nova-devtool": "^1.2"
+        "laravel/nova-devtool": "^1.4.2"
     },
     "repositories": [
         { "type": "composer", "url": "https://nova.laravel.com" }
diff --git a/src/Console/card-stubs/composer.json b/src/Console/card-stubs/composer.json
@@ -12,7 +12,7 @@
     },
     "require-dev": {
         "laravel/nova": "^5.0",
-        "laravel/nova-devtool": "^1.2"
+        "laravel/nova-devtool": "^1.4.2"
     },
     "repositories": [
         { "type": "composer", "url": "https://nova.laravel.com" }
diff --git a/src/Console/field-stubs/composer.json b/src/Console/field-stubs/composer.json
@@ -12,7 +12,7 @@
     },
     "require-dev": {
         "laravel/nova": "^5.0",
-        "laravel/nova-devtool": "^1.2"
+        "laravel/nova-devtool": "^1.4.2"
     },
     "repositories": [
         { "type": "composer", "url": "https://nova.laravel.com" }
diff --git a/src/Console/filter-stubs/composer.json b/src/Console/filter-stubs/composer.json
@@ -12,7 +12,7 @@
     },
     "require-dev": {
         "laravel/nova": "^5.0",
-        "laravel/nova-devtool": "^1.2"
+        "laravel/nova-devtool": "^1.4.2"
     },
     "repositories": [
         { "type": "composer", "url": "https://nova.laravel.com" }
diff --git a/src/Console/resource-tool-stubs/composer.json b/src/Console/resource-tool-stubs/composer.json
@@ -12,7 +12,7 @@
     },
     "require-dev": {
         "laravel/nova": "^5.0",
-        "laravel/nova-devtool": "^1.2"
+        "laravel/nova-devtool": "^1.4.2"
     },
     "repositories": [
         { "type": "composer", "url": "https://nova.laravel.com" }
diff --git a/src/Console/tool-stubs/composer.json b/src/Console/tool-stubs/composer.json
@@ -12,7 +12,7 @@
     },
     "require-dev": {
         "laravel/nova": "^5.0",
-        "laravel/nova-devtool": "^1.2"
+        "laravel/nova-devtool": "^1.4.2"
     },
     "repositories": [
         { "type": "composer", "url": "https://nova.laravel.com" }
diff --git a/src/Metrics/Trend.php b/src/Metrics/Trend.php
@@ -405,7 +405,9 @@ protected function aggregate(
             $possibleDateResults,
             $results->mapWithKeys(fn ($result) => [
                 $this->formatAggregateResultDate(
-                    $result->date_result, $unit, $request->twelveHourTime === 'true'
+                    $result->date_result, // @phpstan-ignore property.notFound
+                    $unit,
+                    $request->twelveHourTime === 'true'
                 ) => round($result->aggregate ?? 0, $this->roundingPrecision, $this->roundingMode),
             ])->reject(fn ($value, $key) => ! in_array($key, $possibleDateKeys))
             ->all()
diff --git a/src/Nova.php b/src/Nova.php
@@ -7,6 +7,7 @@
 use Carbon\CarbonInterval;
 use Closure;
 use Illuminate\Console\Command;
+use Illuminate\Contracts\Auth\Access\Gate as GateContract;
 use Illuminate\Http\Client\Response as ClientResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
@@ -212,7 +213,7 @@ public static function version(): string
 
             $version = $manifest['version'] ?? '4.x';
 
-            return $version;
+            return $version.' (Silver Surfer)';
         });
     }
 
@@ -409,21 +410,29 @@ public static function resourcesIn(string $directory): void
     {
         $namespace = app()->getNamespace();
 
+        /** @var array<int, class-string<\Laravel\Nova\Resource>> $resources */
         $resources = [];
 
+        $gate = app(GateContract::class);
+
         foreach ((new Finder)->in($directory)->files() as $resource) {
-            $resource = $namespace.str_replace(
+            /** @var class-string<\Laravel\Nova\Resource> $resourceClass */
+            $resourceClass = $namespace.str_replace(
                 ['/', '.php'],
                 ['\\', ''],
                 Str::after($resource->getPathname(), app_path().DIRECTORY_SEPARATOR)
             );
 
             if (
-                is_subclass_of($resource, Resource::class) &&
-                ! (new ReflectionClass($resource))->isAbstract() &&
-                ! is_subclass_of($resource, ActionResource::class)
+                is_subclass_of($resourceClass, Resource::class) &&
+                ! (new ReflectionClass($resourceClass))->isAbstract() &&
+                ! is_subclass_of($resourceClass, ActionResource::class)
             ) {
-                $resources[] = $resource;
+                $resources[] = $resourceClass;
+            }
+
+            if (property_exists($resourceClass, 'policy') && ! is_null($resourceClass::$policy)) {
+                $gate->policy($resourceClass, $resourceClass::$policy);
             }
         }
 
diff --git a/src/Util.php b/src/Util.php
@@ -177,7 +177,7 @@ public static function sessionAuthGuardForModel($model): ?string
     }
 
     /**
-     * Resolve the model/resoruce for policy.
+     * Resolve the model/resource for policy.
      *
      * @param  \Laravel\Nova\Resource  $resource
      * @return \Laravel\Nova\Resource|\Illuminate\Database\Eloquent\Model
diff --git a/webpack.mix.js.dist b/webpack.mix.js.dist
@@ -0,0 +1,58 @@
+let mix = require('laravel-mix')
+let webpack = require('webpack')
+let tailwindcss = require('tailwindcss')
+let path = require('path')
+let postcssImport = require('postcss-import')
+let postcssRtlcss = require('postcss-rtlcss')
+
+/*
+ |--------------------------------------------------------------------------
+ | Mix Asset Management
+ |--------------------------------------------------------------------------
+ |
+ | Mix provides a clean, fluent API for defining some Webpack build steps
+ | for your Laravel application. By default, we are compiling the Sass
+ | file for the application as well as bundling up all the JS files.
+ |
+ */
+
+mix
+  .js('resources/js/app.js', 'public')
+  .ts('resources/ui/ui.js', 'public/ui.js')
+  .vue({ version: 3 })
+  // .sourceMaps()
+  .extract()
+  .setPublicPath('public')
+  .postCss('resources/css/app.css', 'public', [
+    postcssImport(),
+    tailwindcss('tailwind.config.js'),
+    postcssRtlcss(),
+  ])
+  .copy('resources/fonts/', 'public/fonts')
+  .alias({ '@': path.join(__dirname, 'resources/js/') })
+  .webpackConfig({
+    externals: {
+      'laravel-nova-ui': 'LaravelNovaUi',
+    },
+    plugins: [
+      new webpack.DefinePlugin({
+        // Temporary fixes: https://github.com/vuejs/vue-cli/pull/7443
+        __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: 'false',
+      })
+    ],
+    resolve: {
+      symlinks: false,
+      alias: { vue: path.resolve("./node_modules/vue") }
+    },
+    output: { uniqueName: 'laravel/nova' }
+  })
+  .options({
+    vue: {
+      exposeFilename: true,
+      compilerOptions: {
+        isCustomElement: tag => tag.startsWith('trix-'),
+      },
+    },
+    processCssUrls: false,
+  })
+  .version()

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,9 @@`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`.form-control[data-disabled],`
`20`		`-.form-control:disabled {`
`21`		`- @apply bg-gray-50 dark:bg-gray-800 text-gray-400 outline-none;`
	`20`	`+.form-control:disabled,`
	`21`	`+.form-control:read-only {`
	`22`	`+ @apply bg-gray-50 dark:bg-gray-800 text-gray-400 outline-none focus:outline-none;`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`/* Form Inputs`