From a512cd04b5f3a29b1aed5b10b27328e15851bb8a Mon Sep 17 00:00:00 2001 From: Michael Zetterberg Date: Thu, 18 Apr 2024 18:08:04 +0200 Subject: [PATCH 1/3] fix: lint --- .../MyProfile/Profile/Edit/Form/Content.tsx | 2 +- .../TempDesignSystem/Form/Country/index.tsx | 11 ++------ .../Form/Date/Select/index.tsx | 11 ++------ .../TempDesignSystem/Form/Phone/index.tsx | 27 +++++++++---------- 4 files changed, 17 insertions(+), 34 deletions(-) diff --git a/components/MyProfile/Profile/Edit/Form/Content.tsx b/components/MyProfile/Profile/Edit/Form/Content.tsx index a852cb972..508c3bd4d 100644 --- a/components/MyProfile/Profile/Edit/Form/Content.tsx +++ b/components/MyProfile/Profile/Edit/Form/Content.tsx @@ -27,7 +27,7 @@ export default function FormContent({ control }: EditFormContentProps) { useEffect(() => { setIsPending(pending) - }, [pending]) + }, [pending, setIsPending]) return ( <> diff --git a/components/TempDesignSystem/Form/Country/index.tsx b/components/TempDesignSystem/Form/Country/index.tsx index e30e175d0..aa6be29d6 100644 --- a/components/TempDesignSystem/Form/Country/index.tsx +++ b/components/TempDesignSystem/Form/Country/index.tsx @@ -1,6 +1,6 @@ "use client" import { useController, useFormContext } from "react-hook-form" -import { useEffect, useRef, useState } from "react" +import { useRef } from "react" import { _ } from "@/lib/translation" import { countries } from "./countries" @@ -28,7 +28,6 @@ export default function CountrySelect({ registerOptions, }: CountryProps) { const divRef = useRef(null) - const [divElement, setDivElement] = useState(divRef.current) const { control, setValue } = useFormContext() const { field } = useController({ control, @@ -40,12 +39,6 @@ export default function CountrySelect({ setValue(name, country) } - useEffect(() => { - if (divRef.current) { - setDivElement(divRef.current) - } - }, [divRef.current]) - return (
{countries.map((country, idx) => ( diff --git a/components/TempDesignSystem/Form/Date/Select/index.tsx b/components/TempDesignSystem/Form/Date/Select/index.tsx index fa58473e3..da3ea795a 100644 --- a/components/TempDesignSystem/Form/Date/Select/index.tsx +++ b/components/TempDesignSystem/Form/Date/Select/index.tsx @@ -1,5 +1,5 @@ "use client" -import { useEffect, useRef, useState, type FocusEvent } from "react" +import { useRef } from "react" import { Button, @@ -27,18 +27,11 @@ export default function Select({ value, }: SelectProps) { const divRef = useRef(null) - const [divElement, setDivElement] = useState(divRef.current) function handleOnSelect(key: Key) { onSelect(key, name) } - useEffect(() => { - if (divRef.current) { - setDivElement(divRef.current) - } - }, [divRef.current]) - return (
{items.map((item) => ( diff --git a/components/TempDesignSystem/Form/Phone/index.tsx b/components/TempDesignSystem/Form/Phone/index.tsx index 981939060..beb5ca02f 100644 --- a/components/TempDesignSystem/Form/Phone/index.tsx +++ b/components/TempDesignSystem/Form/Phone/index.tsx @@ -41,21 +41,18 @@ export default function Phone({ rules: registerOptions, }) - const handleCountrySelectForPhone = useCallback( - (country: string) => { - const selectedCountry = getCountry({ - countries: defaultCountries, - field: "iso2", - value: country.toLowerCase(), - }) + const handleCountrySelectForPhone = useCallback((country: string) => { + const selectedCountry = getCountry({ + countries: defaultCountries, + field: "iso2", + value: country.toLowerCase(), + }) - if (selectedCountry) { - phoneRef.current?.setCountry(selectedCountry.iso2) - prevSelectedCountry.current = country.toLowerCase() - } - }, - [phoneRef.current, prevSelectedCountry.current] - ) + if (selectedCountry) { + phoneRef.current?.setCountry(selectedCountry.iso2) + prevSelectedCountry.current = country.toLowerCase() + } + }, []) useEffect(() => { if (countryValue) { @@ -80,7 +77,7 @@ export default function Phone({ handleCountrySelectForPhone(countryValue) } } - }, [countryValue, prevSelectedCountry.current]) + }, [countryValue, field.value, handleCountrySelectForPhone]) return (
From abdc48f57f028261e39c66c3993212e8dad4ba64 Mon Sep 17 00:00:00 2001 From: Michael Zetterberg Date: Thu, 18 Apr 2024 18:09:24 +0200 Subject: [PATCH 2/3] feat: run 'next lint' in lint-staged --- lint-staged.config.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lint-staged.config.js b/lint-staged.config.js index 1a3d57566..1d431eb02 100644 --- a/lint-staged.config.js +++ b/lint-staged.config.js @@ -1,4 +1,13 @@ +import path from "node:path" + +// https://nextjs.org/docs/app/building-your-application/configuring/eslint#lint-staged +const buildEslintCommand = (filenames) => + `next lint --max-warnings 0 --file ${filenames + .map((f) => path.relative(process.cwd(), f)) + .join(" --file ")}` + const config = { + "*.{js,jsx,ts,tsx}": [buildEslintCommand], "*.{ts,tsx}": () => "tsc -p tsconfig.json --noEmit", "*": "prettier --write", } From 14e93eba7ca491cfaaea967349f4fa6ffcb5f2be Mon Sep 17 00:00:00 2001 From: Michael Zetterberg Date: Mon, 22 Apr 2024 06:58:50 +0200 Subject: [PATCH 3/3] chore: lint fix --- .eslintrc.json | 55 ++++++++++++++++++- app/[lang]/(live)/(protected)/logout/route.ts | 3 +- .../my-pages/@breadcrumbs/benefits/page.tsx | 2 +- .../my-pages/@breadcrumbs/overview/page.tsx | 2 +- .../profile/[...catchAll]/page.tsx | 2 +- .../my-pages/@breadcrumbs/profile/page.tsx | 2 +- .../my-pages/@breadcrumbs/stays/page.tsx | 2 +- .../(protected)/my-pages/benefits/page.tsx | 5 +- .../(live)/(protected)/my-pages/layout.tsx | 1 - .../(protected)/my-pages/overview/page.tsx | 2 +- .../my-pages/profile/@edit/edit/page.tsx | 2 +- .../my-pages/profile/@view/page.tsx | 2 +- .../my-pages/profile/edit/page.tsx | 1 + .../(protected)/my-pages/stays/page.tsx | 2 +- app/[lang]/(live)/(public)/login/route.ts | 3 +- app/[lang]/(live)/layout.tsx | 15 ++--- .../current-content-page/page.tsx | 4 +- app/[lang]/(live-current)/layout.tsx | 4 +- app/[lang]/(preview)/layout.tsx | 1 + app/[lang]/(preview-current)/layout.tsx | 6 +- .../preview-current/page.tsx | 10 ++-- app/[lang]/(test)/layout.tsx | 1 + app/[lang]/webview/layout.tsx | 1 + app/api/web/revalidate/route.ts | 4 +- components/Current/AdobeScript.tsx | 4 +- components/Current/Aside/Contacts/Contact.tsx | 5 +- components/Current/Aside/Puff/index.tsx | 6 +- .../Current/Aside/Puff/renderOptions.tsx | 5 +- components/Current/Aside/index.tsx | 15 ++--- components/Current/Blocks/List/ListItem.tsx | 3 +- components/Current/Blocks/index.tsx | 4 +- components/Current/Footer/index.tsx | 14 +++-- components/Current/Header/MainMenu/index.tsx | 1 + components/Current/Header/index.tsx | 8 +-- components/Current/LangPopup/index.tsx | 3 +- components/Current/LivePreview/index.tsx | 2 +- components/Current/Preamble/index.tsx | 4 +- components/Current/Preamble/renderOptions.tsx | 5 +- components/Current/Tracking.tsx | 5 +- components/Image/index.tsx | 4 +- components/JsonToHtml/renderOptions.tsx | 16 +++--- components/JsonToHtml/utils.tsx | 11 ++-- .../Blocks/Benefits/CurrentLevel/index.tsx | 9 ++- .../Blocks/Benefits/NextLevel/index.tsx | 5 +- .../Blocks/Overview/Buttons/CopyButton.tsx | 2 +- .../Overview/Buttons/MembershipCardButton.tsx | 2 +- .../Blocks/Overview/Stats/Progress/index.tsx | 1 + .../Overview/Stats/TotalPoints/index.tsx | 1 + .../Blocks/Overview/UpcomingStays/index.tsx | 5 +- components/MyPages/Blocks/Overview/index.tsx | 3 +- components/MyPages/Blocks/Shortcuts/index.tsx | 3 +- .../Blocks/Stays/EmptyPreviousStays/index.tsx | 1 + .../Blocks/Stays/EmptyUpcomingStays/index.tsx | 4 +- .../MyPages/Blocks/Stays/StayCard/index.tsx | 3 +- .../MyPages/Blocks/Stays/StayList/index.tsx | 1 + .../MyPages/Header/LanguageSwitcher/index.tsx | 1 + components/MyPages/Header/Logo/index.tsx | 5 +- components/MyPages/Header/User/index.tsx | 1 + components/MyPages/Sidebar/helpers.ts | 2 +- components/MyPages/Sidebar/index.tsx | 16 ++++-- components/MyProfile/Profile/Container.tsx | 2 +- .../MyProfile/Profile/Edit/Form/Content.tsx | 2 +- .../MyProfile/Profile/Edit/Form/index.tsx | 11 ++-- .../MyProfile/Profile/Edit/Form/schema.ts | 1 + components/MyProfile/Profile/index.tsx | 10 ++-- .../TempDesignSystem/Form/Country/index.tsx | 14 ++--- .../Form/Date/Select/index.tsx | 4 +- components/TempDesignSystem/Form/Date/date.ts | 1 + .../TempDesignSystem/Form/Date/index.tsx | 18 +++--- .../Form/ErrorMessage/errorMessage.ts | 2 +- .../TempDesignSystem/Form/Input/index.tsx | 2 +- .../TempDesignSystem/Form/Input/input.ts | 3 +- .../TempDesignSystem/Form/Phone/index.tsx | 5 +- components/TempDesignSystem/Link/index.tsx | 3 +- lib/dt.ts | 8 +-- lib/graphql/batchRequest.ts | 4 +- lib/graphql/previewRequest.ts | 6 +- lib/graphql/request.ts | 7 ++- lib/trpc/Provider.tsx | 6 +- lint-staged.config.js | 2 +- package-lock.json | 11 ++++ package.json | 8 ++- 82 files changed, 282 insertions(+), 160 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index bffb357a7..5ba99de91 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,3 +1,56 @@ { - "extends": "next/core-web-vitals" + "extends": ["next/core-web-vitals", "plugin:import/recommended"], + "plugins": ["simple-import-sort"], + "rules": { + "simple-import-sort/imports": [ + "error", + { + "groups": [ + // Side effect imports. + ["^\\u0000"], + // Node.js builtins. + ["^node:"], + // NPM packages. + ["^@?\\w"], + // Internal packages. + ["^@scandic-hotels/(?!.*\u0000$).*$"], + // Local imports (lib, constants, etc.), excl. types. + [ + "^@/constants/?(?!.*\u0000$).*$", + "^@/env/?(?!.*\u0000$).*$", + "^@/lib/?(?!.*\u0000$).*$", + "^@/server/?(?!.*\u0000$).*$", + "^@/stores/?(?!.*\u0000$).*$" + ], + // Local imports (the rest), excl. types. + ["^@/(?!(types|.*\u0000$)).*$"], + // Parent imports. Put `..` last. + // Other relative imports. Put same-folder imports and `.` last. + [ + "^\\.\\.(?!/?$)", + "^\\.\\./?$", + "^\\./(?=.*/)(?!/?$)", + "^\\.(?!/?$)", + "^\\./?$" + ], + // Style imports. + ["^(?!\\u0000).+\\.s?css$"], + // Node.js builtins and NPM packages type imports. + ["^node:.*\\u0000$", "^@?\\w.*\\u0000$"], + // Local type imports. + [ + "^@scandichotels/.*\\u0000$", + "^@/types/.*", + "^@/.*\\u0000$", + "^[^.].*\\u0000$", + "^\\..*\\u0000$" + ] + ] + } + ], + "simple-import-sort/exports": "error", + "import/first": "error", + "import/newline-after-import": "error", + "import/no-duplicates": "error" + } } diff --git a/app/[lang]/(live)/(protected)/logout/route.ts b/app/[lang]/(live)/(protected)/logout/route.ts index 91fb4081d..a4031bd26 100644 --- a/app/[lang]/(live)/(protected)/logout/route.ts +++ b/app/[lang]/(live)/(protected)/logout/route.ts @@ -1,9 +1,10 @@ import { NextRequest, NextResponse } from "next/server" import { AuthError } from "next-auth" -import { signOut } from "@/auth" import { badRequest } from "@/server/errors/next" +import { signOut } from "@/auth" + export async function GET(request: NextRequest) { const returnUrl = request.headers.get("x-returnurl") diff --git a/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/benefits/page.tsx b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/benefits/page.tsx index c09ee2b83..25acf3e0a 100644 --- a/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/benefits/page.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/benefits/page.tsx @@ -1,5 +1,5 @@ -import { serverClient } from "@/lib/trpc/server" import { benefits } from "@/constants/routes/myPages" +import { serverClient } from "@/lib/trpc/server" import Breadcrumbs from "@/components/MyPages/Breadcrumbs" diff --git a/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/overview/page.tsx b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/overview/page.tsx index 67c3a5789..203ace024 100644 --- a/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/overview/page.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/overview/page.tsx @@ -1,5 +1,5 @@ -import { serverClient } from "@/lib/trpc/server" import { overview } from "@/constants/routes/myPages" +import { serverClient } from "@/lib/trpc/server" import Breadcrumbs from "@/components/MyPages/Breadcrumbs" diff --git a/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/profile/[...catchAll]/page.tsx b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/profile/[...catchAll]/page.tsx index 61a2d172a..243892846 100644 --- a/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/profile/[...catchAll]/page.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/profile/[...catchAll]/page.tsx @@ -1,5 +1,5 @@ -import { serverClient } from "@/lib/trpc/server" import { profile } from "@/constants/routes/myPages" +import { serverClient } from "@/lib/trpc/server" import Breadcrumbs from "@/components/MyPages/Breadcrumbs" diff --git a/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/profile/page.tsx b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/profile/page.tsx index 61a2d172a..243892846 100644 --- a/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/profile/page.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/profile/page.tsx @@ -1,5 +1,5 @@ -import { serverClient } from "@/lib/trpc/server" import { profile } from "@/constants/routes/myPages" +import { serverClient } from "@/lib/trpc/server" import Breadcrumbs from "@/components/MyPages/Breadcrumbs" diff --git a/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/stays/page.tsx b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/stays/page.tsx index 721a56db2..69a7ccdab 100644 --- a/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/stays/page.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/stays/page.tsx @@ -1,5 +1,5 @@ -import { serverClient } from "@/lib/trpc/server" import { stays } from "@/constants/routes/myPages" +import { serverClient } from "@/lib/trpc/server" import Breadcrumbs from "@/components/MyPages/Breadcrumbs" diff --git a/app/[lang]/(live)/(protected)/my-pages/benefits/page.tsx b/app/[lang]/(live)/(protected)/my-pages/benefits/page.tsx index 0e5731e1a..c3aba6b90 100644 --- a/app/[lang]/(live)/(protected)/my-pages/benefits/page.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/benefits/page.tsx @@ -1,13 +1,14 @@ -import Title from "@/components/MyPages/Title" import CurrentBenefitsBlock from "@/components/MyPages/Blocks/Benefits/CurrentLevel" import NextLevelBenefitsBlock from "@/components/MyPages/Blocks/Benefits/NextLevel" import Shortcuts from "@/components/MyPages/Blocks/Shortcuts" +import Title from "@/components/MyPages/Title" import { shortcuts } from "./_constants" -import type { LangParams, PageArgs } from "@/types/params" import styles from "./page.module.css" +import type { LangParams, PageArgs } from "@/types/params" + export default function BenefitsPage({ params }: PageArgs) { return (
diff --git a/app/[lang]/(live)/(protected)/my-pages/layout.tsx b/app/[lang]/(live)/(protected)/my-pages/layout.tsx index cb519ab45..b5e51dd1d 100644 --- a/app/[lang]/(live)/(protected)/my-pages/layout.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/layout.tsx @@ -1,5 +1,4 @@ import { firaMono, firaSans } from "@/app/[lang]/(live)/fonts" - import Header from "@/components/MyPages/Header" import Sidebar from "@/components/MyPages/Sidebar" diff --git a/app/[lang]/(live)/(protected)/my-pages/overview/page.tsx b/app/[lang]/(live)/(protected)/my-pages/overview/page.tsx index 3d8948b7b..3064a0350 100644 --- a/app/[lang]/(live)/(protected)/my-pages/overview/page.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/overview/page.tsx @@ -3,8 +3,8 @@ import { serverClient } from "@/lib/trpc/server" import MaxWidth from "@/components/MaxWidth" import Overview from "@/components/MyPages/Blocks/Overview" -import Shortcuts from "@/components/MyPages/Blocks/Shortcuts" import UpcomingStays from "@/components/MyPages/Blocks/Overview/UpcomingStays" +import Shortcuts from "@/components/MyPages/Blocks/Shortcuts" import styles from "./page.module.css" diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@edit/edit/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@edit/edit/page.tsx index 70fa4a645..215039f2f 100644 --- a/app/[lang]/(live)/(protected)/my-pages/profile/@edit/edit/page.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@edit/edit/page.tsx @@ -1,6 +1,6 @@ "use client" -import { _ } from "@/lib/translation" import { profile } from "@/constants/routes/myPages" +import { _ } from "@/lib/translation" import { useProfileStore } from "@/stores/edit-profile" import Button from "@/components/TempDesignSystem/Button" diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@view/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@view/page.tsx index 365533f77..30bf1b004 100644 --- a/app/[lang]/(live)/(protected)/my-pages/profile/@view/page.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@view/page.tsx @@ -1,5 +1,5 @@ -import { _ } from "@/lib/translation" import { profileEdit } from "@/constants/routes/myPages" +import { _ } from "@/lib/translation" import Button from "@/components/TempDesignSystem/Button" import Link from "@/components/TempDesignSystem/Link" diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/edit/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/edit/page.tsx index 7732dd7f1..496477ced 100644 --- a/app/[lang]/(live)/(protected)/my-pages/profile/edit/page.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/profile/edit/page.tsx @@ -1,4 +1,5 @@ import "../profileLayout.css" + export default function EditProfilePage() { return null } diff --git a/app/[lang]/(live)/(protected)/my-pages/stays/page.tsx b/app/[lang]/(live)/(protected)/my-pages/stays/page.tsx index f71a51b65..575a6767d 100644 --- a/app/[lang]/(live)/(protected)/my-pages/stays/page.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/stays/page.tsx @@ -1,5 +1,5 @@ -import UpcomingStays from "@/components/MyPages/Blocks/Stays/Upcoming" import PreviousStays from "@/components/MyPages/Blocks/Stays/Previous" +import UpcomingStays from "@/components/MyPages/Blocks/Stays/Upcoming" import styles from "./page.module.css" diff --git a/app/[lang]/(live)/(public)/login/route.ts b/app/[lang]/(live)/(public)/login/route.ts index dadcd452a..a444a6225 100644 --- a/app/[lang]/(live)/(public)/login/route.ts +++ b/app/[lang]/(live)/(public)/login/route.ts @@ -1,11 +1,12 @@ import { NextRequest, NextResponse } from "next/server" import { AuthError } from "next-auth" -import { signIn } from "@/auth" import { Lang } from "@/constants/languages" import { env } from "@/env/server" import { badRequest, internalServerError } from "@/server/errors/next" +import { signIn } from "@/auth" + export async function GET( request: NextRequest, context: { params: { lang: Lang } } diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx index 6beb1476d..fa6213f9f 100644 --- a/app/[lang]/(live)/layout.tsx +++ b/app/[lang]/(live)/layout.tsx @@ -1,17 +1,18 @@ +import "@/app/globals.css" +import "@scandic-hotels/design-system/style.css" + +import Script from "next/script" import { SessionProvider } from "next-auth/react" -import { auth } from "@/auth" - -import AdobeScript from "@/components/Current/AdobeScript" -import Script from "next/script" import TrpcProvider from "@/lib/trpc/Provider" + +import { auth } from "@/auth" +import AdobeScript from "@/components/Current/AdobeScript" import VwoScript from "@/components/Current/VwoScript" import type { Metadata } from "next" -import type { LangParams, LayoutArgs } from "@/types/params" -import "@/app/globals.css" -import "@scandic-hotels/design-system/style.css" +import type { LangParams, LayoutArgs } from "@/types/params" export const metadata: Metadata = { description: "New web", diff --git a/app/[lang]/(live-current)/current-content-page/page.tsx b/app/[lang]/(live-current)/current-content-page/page.tsx index fd876a1f5..3154b25e4 100644 --- a/app/[lang]/(live-current)/current-content-page/page.tsx +++ b/app/[lang]/(live-current)/current-content-page/page.tsx @@ -1,14 +1,14 @@ import { notFound } from "next/navigation" -import { request } from "@/lib/graphql/request" import { GetCurrentBlockPage } from "@/lib/graphql/Query/CurrentBlockPage.graphql" import { GetCurrentBlockPageTrackingData } from "@/lib/graphql/Query/CurrentBlockPageTrackingData.graphql" +import { request } from "@/lib/graphql/request" import ContentPage from "@/components/Current/ContentPage" import Header from "@/components/Current/Header" import Tracking from "@/components/Current/Tracking" -import type { PageArgs, LangParams, UriParams } from "@/types/params" +import type { LangParams, PageArgs, UriParams } from "@/types/params" import type { GetCurrentBlockPageData } from "@/types/requests/currentBlockPage" import type { TrackingData } from "@/types/requests/trackingData" diff --git a/app/[lang]/(live-current)/layout.tsx b/app/[lang]/(live-current)/layout.tsx index fc1c07719..cc9f8959e 100644 --- a/app/[lang]/(live-current)/layout.tsx +++ b/app/[lang]/(live-current)/layout.tsx @@ -1,12 +1,14 @@ import "@scandic-hotels/design-system/current/style.css" +import Script from "next/script" + import AdobeScript from "@/components/Current/AdobeScript" import Footer from "@/components/Current/Footer" import LangPopup from "@/components/Current/LangPopup" -import Script from "next/script" import SkipToMainContent from "@/components/SkipToMainContent" import type { Metadata } from "next" + import type { LangParams, LayoutArgs } from "@/types/params" export const fetchCache = "default-no-store" diff --git a/app/[lang]/(preview)/layout.tsx b/app/[lang]/(preview)/layout.tsx index 66363a93c..e944f091a 100644 --- a/app/[lang]/(preview)/layout.tsx +++ b/app/[lang]/(preview)/layout.tsx @@ -1,6 +1,7 @@ import InitLivePreview from "@/components/Current/LivePreview" import type { Metadata } from "next" + import type { LangParams, LayoutArgs } from "@/types/params" export const metadata: Metadata = { diff --git a/app/[lang]/(preview-current)/layout.tsx b/app/[lang]/(preview-current)/layout.tsx index deffcb44b..4f7f803d0 100644 --- a/app/[lang]/(preview-current)/layout.tsx +++ b/app/[lang]/(preview-current)/layout.tsx @@ -1,10 +1,12 @@ +import Script from "next/script" + import Footer from "@/components/Current/Footer" import LangPopup from "@/components/Current/LangPopup" -import Script from "next/script" -import SkipToMainContent from "@/components/SkipToMainContent" import InitLivePreview from "@/components/Current/LivePreview" +import SkipToMainContent from "@/components/SkipToMainContent" import type { Metadata } from "next" + import type { LangParams, LayoutArgs } from "@/types/params" export const fetchCache = "default-no-store" diff --git a/app/[lang]/(preview-current)/preview-current/page.tsx b/app/[lang]/(preview-current)/preview-current/page.tsx index 9943944e9..c6d089247 100644 --- a/app/[lang]/(preview-current)/preview-current/page.tsx +++ b/app/[lang]/(preview-current)/preview-current/page.tsx @@ -1,11 +1,13 @@ +import ContentstackLivePreview from "@contentstack/live-preview-utils" + import { previewRequest } from "@/lib/graphql/previewRequest" import { GetCurrentBlockPage } from "@/lib/graphql/Query/CurrentBlockPage.graphql" -import type { PageArgs, LangParams, PreviewParams } from "@/types/params" -import type { GetCurrentBlockPageData } from "@/types/requests/currentBlockPage" -import ContentstackLivePreview from "@contentstack/live-preview-utils" -import LoadingSpinner from "@/components/Current/LoadingSpinner" import ContentPage from "@/components/Current/ContentPage" +import LoadingSpinner from "@/components/Current/LoadingSpinner" + +import type { LangParams, PageArgs, PreviewParams } from "@/types/params" +import type { GetCurrentBlockPageData } from "@/types/requests/currentBlockPage" export default async function CurrentPreviewPage({ params, diff --git a/app/[lang]/(test)/layout.tsx b/app/[lang]/(test)/layout.tsx index 76cf1c005..f75ab046d 100644 --- a/app/[lang]/(test)/layout.tsx +++ b/app/[lang]/(test)/layout.tsx @@ -1,4 +1,5 @@ import type { Metadata } from "next" + import type { LangParams, LayoutArgs } from "@/types/params" export const metadata: Metadata = { diff --git a/app/[lang]/webview/layout.tsx b/app/[lang]/webview/layout.tsx index 5409013a8..684d28aa8 100644 --- a/app/[lang]/webview/layout.tsx +++ b/app/[lang]/webview/layout.tsx @@ -1,4 +1,5 @@ import type { Metadata } from "next" + import type { LangParams, LayoutArgs } from "@/types/params" export const metadata: Metadata = { diff --git a/app/api/web/revalidate/route.ts b/app/api/web/revalidate/route.ts index 401ee4586..227c11946 100644 --- a/app/api/web/revalidate/route.ts +++ b/app/api/web/revalidate/route.ts @@ -1,8 +1,8 @@ -import { env } from "@/env/server" import { revalidateTag } from "next/cache" - import { NextRequest } from "next/server" +import { env } from "@/env/server" + export async function POST(request: NextRequest) { try { const secret = request.nextUrl.searchParams.get("secret") ?? "" diff --git a/components/Current/AdobeScript.tsx b/components/Current/AdobeScript.tsx index 35e7803d4..4691398a7 100644 --- a/components/Current/AdobeScript.tsx +++ b/components/Current/AdobeScript.tsx @@ -1,7 +1,7 @@ -import { env } from "@/env/server" - import Script from "next/script" +import { env } from "@/env/server" + export default function AdobeScript() { return env.ADOBE_SCRIPT_SRC ? (