Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Mike Cao 2023-07-10 09:55:09 -07:00
commit bd1195ed1d
2 changed files with 4 additions and 3 deletions

View File

@ -167,7 +167,8 @@ export const EVENT_COLORS = [
]; ];
export const DOMAIN_REGEX = export const DOMAIN_REGEX =
/^(localhost(:[1-9]\d{0,4})?|((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63})$/; /^(localhost(:[1-9]\d{0,4})?|((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9-]+(-[a-z0-9-]+)*\.)+(xn--)?[a-z0-9-]{2,63})$/;
export const SHARE_ID_REGEX = /^[a-zA-Z0-9]{16}$/; export const SHARE_ID_REGEX = /^[a-zA-Z0-9]{16}$/;

View File

@ -105,7 +105,7 @@
"react-use-measure": "^2.0.4", "react-use-measure": "^2.0.4",
"react-window": "^1.8.6", "react-window": "^1.8.6",
"request-ip": "^3.3.0", "request-ip": "^3.3.0",
"semver": "^7.3.6", "semver": "^7.5.2",
"thenby": "^1.3.4", "thenby": "^1.3.4",
"timezone-support": "^2.0.2", "timezone-support": "^2.0.2",
"uuid": "^8.3.2", "uuid": "^8.3.2",