diff --git a/.vscode/settings.json b/.vscode/settings.json index b1311e3825..62591a835a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -16,6 +16,7 @@ { "rule": "object-shorthand", "severity": "off", "fixable": true } ], "typescript.tsdk": "node_modules/typescript/lib", + "deno.enable": false, // Load .git-blame-ignore-revs file "gitlens.advanced.blame.customArguments": ["--ignore-revs-file", ".git-blame-ignore-revs"], "jestrunner.jestCommand": "pnpm exec cross-env NODE_OPTIONS=\"--no-deprecation\" node 'node_modules/jest/bin/jest.js'", @@ -24,5 +25,14 @@ "runtimeArgs": ["--no-deprecation"] }, // Essentially disables bun test buttons - "bun.test.filePattern": "bun.test.ts" + "bun.test.filePattern": "bun.test.ts", + "files.exclude": { + "**/.git": true, + "**/.svn": true, + "**/.hg": true, + "**/CVS": true, + "**/.DS_Store": true, + "**/Thumbs.db": true + }, + "hide-files.files": [] } diff --git a/examples/form-builder/src/components/Header/index.tsx b/examples/form-builder/src/components/Header/index.tsx index f1b616b007..2ac5766460 100644 --- a/examples/form-builder/src/components/Header/index.tsx +++ b/examples/form-builder/src/components/Header/index.tsx @@ -2,8 +2,6 @@ import { ModalToggler } from '@faceless-ui/modal' import Link from 'next/link' import React from 'react' -import type { MainMenu } from '../../payload-types' - import { getCachedGlobal } from '../../utilities/getGlobals' import { Gutter } from '../Gutter' import { MenuIcon } from '../icons/Menu' @@ -35,7 +33,7 @@ export const HeaderBar: React.FC = ({ children }) => { } export async function Header() { - const header: MainMenu = await getCachedGlobal('main-menu', 1)() + const header = await getCachedGlobal('main-menu', 1)() const navItems = header?.navItems || [] diff --git a/examples/localization/src/globals/Footer/Component.tsx b/examples/localization/src/globals/Footer/Component.tsx index 14d707db91..4ba9c1acc8 100644 --- a/examples/localization/src/globals/Footer/Component.tsx +++ b/examples/localization/src/globals/Footer/Component.tsx @@ -2,14 +2,12 @@ import { getCachedGlobal } from '@/utilities/getGlobals' import Link from 'next/link' import React from 'react' -import type { Footer } from '@/payload-types' - import { ThemeSelector } from '@/providers/Theme/ThemeSelector' import { CMSLink } from '@/components/Link' import { TypedLocale } from 'payload' export async function Footer({ locale }: { locale: TypedLocale }) { - const footer: Footer = await getCachedGlobal('footer', 1, locale)() + const footer = await getCachedGlobal('footer', 1, locale)() const navItems = footer?.navItems || [] diff --git a/examples/localization/src/globals/Header/Component.tsx b/examples/localization/src/globals/Header/Component.tsx index 9855feaaba..543d92f208 100644 --- a/examples/localization/src/globals/Header/Component.tsx +++ b/examples/localization/src/globals/Header/Component.tsx @@ -2,11 +2,10 @@ import { HeaderClient } from './Component.client' import { getCachedGlobal } from '@/utilities/getGlobals' import React from 'react' -import type { Header } from '@/payload-types' import { TypedLocale } from 'payload' export async function Header({ locale }: { locale: TypedLocale }) { - const header: Header = await getCachedGlobal('header', 1, locale)() + const header = await getCachedGlobal('header', 1, locale)() return } diff --git a/templates/website/src/Footer/Component.tsx b/templates/website/src/Footer/Component.tsx index 868908fa8a..737a2955ae 100644 --- a/templates/website/src/Footer/Component.tsx +++ b/templates/website/src/Footer/Component.tsx @@ -2,14 +2,12 @@ import { getCachedGlobal } from '@/utilities/getGlobals' import Link from 'next/link' import React from 'react' -import type { Footer } from '@/payload-types' - import { ThemeSelector } from '@/providers/Theme/ThemeSelector' import { CMSLink } from '@/components/Link' import { Logo } from '@/components/Logo/Logo' export async function Footer() { - const footerData: Footer = await getCachedGlobal('footer', 1)() + const footerData = await getCachedGlobal('footer', 1)() const navItems = footerData?.navItems || [] diff --git a/templates/website/src/Header/Component.tsx b/templates/website/src/Header/Component.tsx index 02d2e64435..e7beeed03f 100644 --- a/templates/website/src/Header/Component.tsx +++ b/templates/website/src/Header/Component.tsx @@ -2,10 +2,8 @@ import { HeaderClient } from './Component.client' import { getCachedGlobal } from '@/utilities/getGlobals' import React from 'react' -import type { Header } from '@/payload-types' - export async function Header() { - const headerData: Header = await getCachedGlobal('header', 1)() + const headerData = await getCachedGlobal('header', 1)() return } diff --git a/templates/with-vercel-website/src/Footer/Component.tsx b/templates/with-vercel-website/src/Footer/Component.tsx index 868908fa8a..737a2955ae 100644 --- a/templates/with-vercel-website/src/Footer/Component.tsx +++ b/templates/with-vercel-website/src/Footer/Component.tsx @@ -2,14 +2,12 @@ import { getCachedGlobal } from '@/utilities/getGlobals' import Link from 'next/link' import React from 'react' -import type { Footer } from '@/payload-types' - import { ThemeSelector } from '@/providers/Theme/ThemeSelector' import { CMSLink } from '@/components/Link' import { Logo } from '@/components/Logo/Logo' export async function Footer() { - const footerData: Footer = await getCachedGlobal('footer', 1)() + const footerData = await getCachedGlobal('footer', 1)() const navItems = footerData?.navItems || [] diff --git a/templates/with-vercel-website/src/Header/Component.tsx b/templates/with-vercel-website/src/Header/Component.tsx index 02d2e64435..e7beeed03f 100644 --- a/templates/with-vercel-website/src/Header/Component.tsx +++ b/templates/with-vercel-website/src/Header/Component.tsx @@ -2,10 +2,8 @@ import { HeaderClient } from './Component.client' import { getCachedGlobal } from '@/utilities/getGlobals' import React from 'react' -import type { Header } from '@/payload-types' - export async function Header() { - const headerData: Header = await getCachedGlobal('header', 1)() + const headerData = await getCachedGlobal('header', 1)() return }