mirror of
https://gitlab.com/PronounsPage/PronounsPage.git
synced 2025-09-23 20:54:48 -04:00
Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
ed707a09a9
3
.gitignore
vendored
3
.gitignore
vendored
@ -74,6 +74,9 @@ jspm_packages/
|
|||||||
# TypeScript v1 declaration files
|
# TypeScript v1 declaration files
|
||||||
typings/
|
typings/
|
||||||
|
|
||||||
|
# TypeScript buildinfo
|
||||||
|
tsconfig.tsbuildinfo
|
||||||
|
|
||||||
# Optional npm cache directory
|
# Optional npm cache directory
|
||||||
.npm
|
.npm
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import type { LocaleDescription } from '~~/locale/locales.js';
|
import type { LocaleDescription } from '~~/locale/locales.ts';
|
||||||
|
|
||||||
defineProps<{
|
defineProps<{
|
||||||
locale: LocaleDescription;
|
locale: LocaleDescription;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { PERMISSION_AREAS } from '#shared/helpers.js';
|
import { PERMISSION_AREAS } from '#shared/helpers.ts';
|
||||||
import type { User } from '#shared/user.ts';
|
import type { User } from '#shared/user.ts';
|
||||||
import allLocalesRaw from '~~/locale/locales.ts';
|
import allLocalesRaw from '~~/locale/locales.ts';
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { useNuxtApp } from 'nuxt/app';
|
import { useNuxtApp } from 'nuxt/app';
|
||||||
|
|
||||||
import { getContactLinks, getSocialLinks } from '#shared/contact.js';
|
import { getContactLinks, getSocialLinks } from '#shared/contact.ts';
|
||||||
import { groupBy } from '#shared/helpers.ts';
|
import { groupBy } from '#shared/helpers.ts';
|
||||||
import useConfig from '~/composables/useConfig.ts';
|
import useConfig from '~/composables/useConfig.ts';
|
||||||
import useSimpleHead from '~/composables/useSimpleHead.ts';
|
import useSimpleHead from '~/composables/useSimpleHead.ts';
|
||||||
|
@ -7,11 +7,11 @@ import { ulid } from 'ulid';
|
|||||||
|
|
||||||
import dbConnection from './db.ts';
|
import dbConnection from './db.ts';
|
||||||
import type { Database } from './db.ts';
|
import type { Database } from './db.ts';
|
||||||
import isHighLoadTime from './overload.js';
|
|
||||||
|
|
||||||
import { getLocaleUrls } from '#shared/domain.ts';
|
import { getLocaleUrls } from '#shared/domain.ts';
|
||||||
import { s3, s3Config, s3BucketParams } from '~~/server/cloudServices.ts';
|
import { s3, s3Config, s3BucketParams } from '~~/server/cloudServices.ts';
|
||||||
import jwt from '~~/server/jwt.ts';
|
import jwt from '~~/server/jwt.ts';
|
||||||
|
import isHighLoadTime from '~~/server/overload.js';
|
||||||
|
|
||||||
const urlBases: Record<string, string> = {};
|
const urlBases: Record<string, string> = {};
|
||||||
|
|
||||||
|
@ -1,8 +1,7 @@
|
|||||||
import { getHeader } from 'h3';
|
import { getHeader } from 'h3';
|
||||||
|
|
||||||
import isHighLoadTime from '../overload.js';
|
|
||||||
|
|
||||||
import { getLocale } from '~~/server/data.ts';
|
import { getLocale } from '~~/server/data.ts';
|
||||||
|
import isHighLoadTime from '~~/server/overload.ts';
|
||||||
|
|
||||||
// eslint-disable-next-line @stylistic/max-len
|
// eslint-disable-next-line @stylistic/max-len
|
||||||
const USER_AGENT_BOTS = /bot|crawler|baiduspider|80legs|ia_archiver|voyager|curl|wget|yahoo! slurp|mediapartners-google|facebookexternalhit|twitterbot|whatsapp|php|python|mastodon/;
|
const USER_AGENT_BOTS = /bot|crawler|baiduspider|80legs|ia_archiver|voyager|curl|wget|yahoo! slurp|mediapartners-google|facebookexternalhit|twitterbot|whatsapp|php|python|mastodon/;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user