Merge branch 'next' into dependabot/npm_and_yarn/micromatch-4.0.8

This commit is contained in:
Andras Bacsai 2024-08-30 21:27:07 +02:00 committed by GitHub
commit 887f21acdd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 412 additions and 406 deletions

View File

@ -14,7 +14,7 @@
"guzzlehttp/guzzle": "^7.5.0", "guzzlehttp/guzzle": "^7.5.0",
"laravel/fortify": "^v1.16.0", "laravel/fortify": "^v1.16.0",
"laravel/framework": "^v11", "laravel/framework": "^v11",
"laravel/horizon": "^5.23.1", "laravel/horizon": "^5.27.1",
"laravel/prompts": "^0.1.6", "laravel/prompts": "^0.1.6",
"laravel/sanctum": "^v4.0", "laravel/sanctum": "^v4.0",
"laravel/socialite": "^v5.14.0", "laravel/socialite": "^v5.14.0",
@ -95,7 +95,7 @@
"extra": { "extra": {
"laravel": { "laravel": {
"dont-discover": [ "dont-discover": [
"laravel/telescope" "laravel/telescope"
] ]
} }
}, },

797
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -186,7 +186,7 @@
'balance' => env('HORIZON_BALANCE', 'auto'), 'balance' => env('HORIZON_BALANCE', 'auto'),
'maxTime' => 0, 'maxTime' => 0,
'maxJobs' => 0, 'maxJobs' => 0,
'memory' => 128, 'memory' => 64,
'tries' => 1, 'tries' => 1,
'timeout' => 3560, 'timeout' => 3560,
'nice' => 0, 'nice' => 0,

9
package-lock.json generated
View File

@ -14,7 +14,7 @@
"devDependencies": { "devDependencies": {
"@vitejs/plugin-vue": "4.5.1", "@vitejs/plugin-vue": "4.5.1",
"autoprefixer": "10.4.19", "autoprefixer": "10.4.19",
"axios": "1.7.2", "axios": "1.7.5",
"laravel-echo": "1.16.1", "laravel-echo": "1.16.1",
"laravel-vite-plugin": "0.8.1", "laravel-vite-plugin": "0.8.1",
"postcss": "8.4.38", "postcss": "8.4.38",
@ -766,10 +766,11 @@
} }
}, },
"node_modules/axios": { "node_modules/axios": {
"version": "1.7.2", "version": "1.7.5",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz", "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.5.tgz",
"integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==", "integrity": "sha512-fZu86yCo+svH3uqJ/yTdQ0QHpQu5oL+/QE+QPSv6BZSkDAoky9vytxp7u5qk83OJFS3kEBcesWni9WTZAv3tSw==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"follow-redirects": "^1.15.6", "follow-redirects": "^1.15.6",
"form-data": "^4.0.0", "form-data": "^4.0.0",

View File

@ -8,7 +8,7 @@
"devDependencies": { "devDependencies": {
"@vitejs/plugin-vue": "4.5.1", "@vitejs/plugin-vue": "4.5.1",
"autoprefixer": "10.4.19", "autoprefixer": "10.4.19",
"axios": "1.7.2", "axios": "1.7.5",
"laravel-echo": "1.16.1", "laravel-echo": "1.16.1",
"laravel-vite-plugin": "0.8.1", "laravel-vite-plugin": "0.8.1",
"postcss": "8.4.38", "postcss": "8.4.38",