1
0
mirror of https://github.com/cp6/my-idlers.git synced 2024-11-16 15:33:44 +01:00

Merge pull request #85 from Gamerboy59/laravel-10

Laravel 10 update
This commit is contained in:
corbpie 2023-02-19 13:02:42 +11:00 committed by GitHub
commit 6e9591719e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 26245 deletions

View File

@ -17,7 +17,7 @@ class Kernel extends HttpKernel
protected $middleware = [ protected $middleware = [
// \App\Http\Middleware\TrustHosts::class, // \App\Http\Middleware\TrustHosts::class,
\App\Http\Middleware\TrustProxies::class, \App\Http\Middleware\TrustProxies::class,
\Fruitcake\Cors\HandleCors::class, \Illuminate\Http\Middleware\HandleCors::class,
\App\Http\Middleware\PreventRequestsDuringMaintenance::class, \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class, \App\Http\Middleware\TrimStrings::class,

View File

@ -10,24 +10,23 @@
], ],
"license": "MIT", "license": "MIT",
"require": { "require": {
"php": "^8.0", "php": "^8.1",
"fruitcake/laravel-cors": "^2.2", "guzzlehttp/guzzle": "^7.5",
"guzzlehttp/guzzle": "^7.4", "laravel/framework": "^10",
"laravel/framework": "^9", "laravel/tinker": "^2.8",
"laravel/tinker": "^2.7", "laravel/ui": "^4.2",
"laravel/ui": "^3.4", "yajra/laravel-datatables-oracle": "~10.3",
"yajra/laravel-datatables-oracle": "~9.20",
"ext-json": "*", "ext-json": "*",
"doctrine/dbal": "v3.4" "doctrine/dbal": "v3.6"
}, },
"require-dev": { "require-dev": {
"fakerphp/faker": "^1.19.0", "fakerphp/faker": "^1.21",
"laravel/breeze": "^1.9", "laravel/breeze": "^1.19",
"laravel/sail": "^1.14", "laravel/sail": "^1.20",
"mockery/mockery": "^1.5", "mockery/mockery": "^1.5",
"nunomaduro/collision": "^6.2", "nunomaduro/collision": "^7",
"phpunit/phpunit": "^9.5", "phpunit/phpunit": "^10",
"spatie/laravel-ignition": "^1.2" "spatie/laravel-ignition": "^2"
}, },
"config": { "config": {
"optimize-autoloader": true, "optimize-autoloader": true,

8421
composer.lock generated

File diff suppressed because it is too large Load Diff

17803
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -12,21 +12,21 @@
}, },
"devDependencies": { "devDependencies": {
"axios": "^0.21.4", "axios": "^0.21.4",
"bootstrap": "^5.2.2", "bootstrap": "^5.2.3",
"bootstrap-dark-5": "^1.1.3", "bootstrap-dark-5": "^1.1.3",
"bootstrap-data-table": "^1.0.0", "bootstrap-data-table": "^1.0.0",
"datatables": "^1.10.18", "datatables": "^1.10.18",
"datatables.net-bs": "^1.13.1", "datatables.net-bs": "^1.13.2",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
"jquery": "^3.6.1", "jquery": "^3.6.3",
"laravel-mix": "^6.0.41", "laravel-mix": "^6.0.49",
"vue": "^2.7.14", "vue": "^2.7.14",
"vue-loader": "^17.0.1", "vue-loader": "^17.0.1",
"vue-resource": "^1.5.3", "vue-resource": "^1.5.3",
"vue-template-compiler": "^2.7.14" "vue-template-compiler": "^2.7.14"
}, },
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-free": "^6.2.0", "@fortawesome/fontawesome-free": "^6.3.0",
"datatables.net-bs5": "^1.13.1" "datatables.net-bs5": "^1.13.2"
} }
} }