Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
KasparRosin committed Jan 17, 2025
2 parents e40e226 + c7ef444 commit 78455bb
Show file tree
Hide file tree
Showing 25 changed files with 3,943 additions and 2,564 deletions.
32 changes: 28 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@
],
"license": "MIT",
"require": {
"php": ">=8.0",
"spatie/eloquent-sortable": "^3.10.0|^4.0",
"laravel/nova": "^4.24.0",
"php": ">=8.1",
"spatie/eloquent-sortable": "^4.0",
"laravel/nova": "^5.0",
"outl1ne/nova-translations-loader": "^5.0"
},
"require-dev": {
"laravel/nova-devtool": "^1.0.1"
},
"repositories": [
{
"type": "composer",
Expand All @@ -26,6 +29,13 @@
"Outl1ne\\NovaSortable\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"App\\": "workbench/app/",
"Database\\Factories\\": "workbench/database/factories/",
"Database\\Seeders\\": "workbench/database/seeders/"
}
},
"extra": {
"laravel": {
"providers": [
Expand All @@ -37,5 +47,19 @@
"sort-packages": true
},
"minimum-stability": "dev",
"prefer-stable": true
"prefer-stable": true,
"scripts": {
"post-autoload-dump": [
"@clear",
"@prepare"
],
"clear": "@php vendor/bin/testbench package:purge-skeleton --ansi",
"prepare": "@php vendor/bin/testbench package:discover --ansi",
"build": "@php vendor/bin/testbench workbench:build --ansi",
"serve": [
"Composer\\Config::disableProcessTimeout",
"@build",
"@php vendor/bin/testbench serve --ansi"
]
}
}
2 changes: 1 addition & 1 deletion dist/css/tool.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/js/entry.js

Large diffs are not rendered by default.

38 changes: 0 additions & 38 deletions nova.mix.js

This file was deleted.

Loading

0 comments on commit 78455bb

Please sign in to comment.