1
1
mirror of https://github.com/pterodactyl/panel.git synced 2024-11-22 09:02:28 +01:00

Correctly update dependencies for release

This commit is contained in:
DaneEveritt 2022-06-26 17:31:47 -04:00
parent 13bdb66ff0
commit 80ae600fe1
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
6 changed files with 178 additions and 1259 deletions

View File

@ -20,7 +20,7 @@
"aws/aws-sdk-php": "^3.171", "aws/aws-sdk-php": "^3.171",
"doctrine/dbal": "~2.13.9", "doctrine/dbal": "~2.13.9",
"fruitcake/laravel-cors": "~3.0.0", "fruitcake/laravel-cors": "~3.0.0",
"guzzlehttp/guzzle": "~7.4.2", "guzzlehttp/guzzle": "~7.4.4",
"hashids/hashids": "~4.1.0", "hashids/hashids": "~4.1.0",
"laracasts/utilities": "~3.2.1", "laracasts/utilities": "~3.2.1",
"laravel/framework": "^8.83", "laravel/framework": "^8.83",

14
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "3bd4e0acecbf871892a813141facfaea", "content-hash": "29f7542c6f23a5941c840e1335923cc2",
"packages": [ "packages": [
{ {
"name": "aws/aws-crt-php", "name": "aws/aws-crt-php",
@ -1131,16 +1131,16 @@
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
"version": "7.4.3", "version": "7.4.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/guzzle.git", "url": "https://github.com/guzzle/guzzle.git",
"reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab" "reference": "e3ff079b22820c2029d4c2a87796b6a0b8716ad8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/74a8602c6faec9ef74b7a9391ac82c5e65b1cdab", "url": "https://api.github.com/repos/guzzle/guzzle/zipball/e3ff079b22820c2029d4c2a87796b6a0b8716ad8",
"reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab", "reference": "e3ff079b22820c2029d4c2a87796b6a0b8716ad8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1235,7 +1235,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/guzzle/issues", "issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/7.4.3" "source": "https://github.com/guzzle/guzzle/tree/7.4.4"
}, },
"funding": [ "funding": [
{ {
@ -1251,7 +1251,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-05-25T13:24:33+00:00" "time": "2022-06-09T21:39:15+00:00"
}, },
{ {
"name": "guzzlehttp/promises", "name": "guzzlehttp/promises",

View File

@ -10,12 +10,12 @@
"@hot-loader/react-dom": "^16.14.0", "@hot-loader/react-dom": "^16.14.0",
"@tailwindcss/forms": "^0.5.2", "@tailwindcss/forms": "^0.5.2",
"@tailwindcss/line-clamp": "^0.4.0", "@tailwindcss/line-clamp": "^0.4.0",
"axios": "^0.21.1", "axios": "^0.27.2",
"boring-avatars": "^1.7.0", "boring-avatars": "^1.7.0",
"chart.js": "^3.8.0", "chart.js": "^3.8.0",
"classnames": "^2.3.1", "classnames": "^2.3.1",
"codemirror": "^5.57.0", "codemirror": "^5.57.0",
"date-fns": "^2.16.1", "date-fns": "^2.28.0",
"debounce": "^1.2.0", "debounce": "^1.2.0",
"deepmerge-ts": "^4.2.1", "deepmerge-ts": "^4.2.1",
"easy-peasy": "^4.0.1", "easy-peasy": "^4.0.1",
@ -42,7 +42,7 @@
"swr": "^0.2.3", "swr": "^0.2.3",
"tailwindcss": "^3.0.24", "tailwindcss": "^3.0.24",
"use-fit-text": "^2.4.0", "use-fit-text": "^2.4.0",
"uuid": "^3.3.2", "uuid": "^8.3.2",
"xterm": "^4.15.0", "xterm": "^4.15.0",
"xterm-addon-attach": "^0.6.0", "xterm-addon-attach": "^0.6.0",
"xterm-addon-fit": "^0.4.0", "xterm-addon-fit": "^0.4.0",

View File

@ -7,7 +7,9 @@ export const setupInterceptors = (history: History) => {
(resp) => resp, (resp) => resp,
(error: AxiosError) => { (error: AxiosError) => {
if (error.response?.status === 400) { if (error.response?.status === 400) {
if (error.response?.data.errors?.[0].code === 'TwoFactorAuthRequiredException') { if (
(error.response?.data as Record<string, any>).errors?.[0].code === 'TwoFactorAuthRequiredException'
) {
if (!window.location.pathname.startsWith('/account')) { if (!window.location.pathname.startsWith('/account')) {
history.replace('/account', { twoFactorRedirect: true }); history.replace('/account', { twoFactorRedirect: true });
} }

View File

@ -1,6 +1,6 @@
import React, { useMemo } from 'react'; import React, { useMemo } from 'react';
import styled from 'styled-components/macro'; import styled from 'styled-components/macro';
import v4 from 'uuid/v4'; import { v4 } from 'uuid';
import tw from 'twin.macro'; import tw from 'twin.macro';
import Label from '@/components/elements/Label'; import Label from '@/components/elements/Label';
import Input from '@/components/elements/Input'; import Input from '@/components/elements/Input';

1409
yarn.lock

File diff suppressed because it is too large Load Diff