Merge branch 'master' into fix/graphql

blog/app/package.json

@@ -8,7 +8,7 @@
   },
   "main": "src/index.ts",
   "scripts": {
-    "build": "yarn next build src --no-lint ; cp -r ./src/.next/standalone ./dist && cp -r ./src/.next/static ./dist/src/.next/static && mv ./dist/src/server.js ./dist/src/index.cjs",
+    "build": "yarn next build src --no-lint && rm ./src/.next/standalone/package.json ; cp -r ./src/.next/standalone ./dist && cp -r ./src/.next/static ./dist/src/.next/static && mv ./dist/src/server.js ./dist/src/index.cjs",
     "cleanup": "rm -rf dist",
     "dev": "yarn next dev src",
     "prepack": "run build",
@@ -36,6 +36,7 @@
     "@fragments/root-layout-fragment": "workspace:*",
     "@globals/config": "workspace:*",
     "@globals/data": "workspace:*",
+    "@shared/api-routes": "workspace:*",
     "@types/node": "22.1.0",
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",

blog/app/src/app/api/yandex-turbo/[[...slug]]/route.ts

@@ -0,0 +1 @@
+export { yandexTurboApiHandle as GET } from '@shared/api-routes'

package.json

@@ -28,6 +28,6 @@
     "prettier": "3.3.3",
     "typescript": "5.4.2"
   },
-  "packageManager": "yarn@4.5.3",
+  "packageManager": "yarn@4.6.0",
   "typecheckSkipLibCheck": true
 }

shared/api-routes/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "@shared/api-routes",
+  "version": "0.0.1",
+  "license": "BSD-3-Clause",
+  "type": "module",
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "main": "src/index.ts"
+}

shared/api-routes/src/index.ts

@@ -0,0 +1 @@
+export * from './yandex-turbo/index.js'

site/api/yandex-turbo/src/getters/response-url.getter.ts → shared/api-routes/src/yandex-turbo/getters/response-url.getter.ts

@@ -6,5 +6,6 @@ const getResponseOrigin = (): string => {
 export const getResponseUrl = (pathname: string): string => {
   const responseOrigin = getResponseOrigin()
   const responseUrl = new URL(pathname, responseOrigin)
+  responseUrl.searchParams.append('yandex-turbo', 'true')
   return responseUrl.href
 }

site/api/yandex-turbo/src/yandex-turbo.api.ts → shared/api-routes/src/yandex-turbo/yandex-turbo.api.ts

@@ -16,7 +16,9 @@ export const yandexTurboApiHandle = async (
 
   const responseUrl = getResponseUrl(pathname)
 
-  const response = await fetch(responseUrl)
+  const response = await fetch(responseUrl, {
+    cache: 'no-store',
+  })
   const responseText = await response.text()
 
   const bodyHtmlString = getBodyHtmlString(responseText)

site/app/package.json

@@ -30,12 +30,12 @@
     "@fragments/root-layout-fragment": "workspace:*",
     "@globals/config": "workspace:*",
     "@globals/data": "workspace:*",
+    "@shared/api-routes": "workspace:*",
     "@site/booking-api": "workspace:*",
     "@site/contacts-page": "workspace:*",
     "@site/index-page": "workspace:*",
     "@site/service-page": "workspace:*",
     "@site/services-page": "workspace:*",
-    "@site/yandex-turbo-api": "workspace:*",
     "@types/node": "22.1.0",
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",

site/app/src/app/api/yandex-turbo/[[...slug]]/route.ts

@@ -1 +1 @@
-export { yandexTurboApiHandle as GET } from '@site/yandex-turbo-api'
+export { yandexTurboApiHandle as GET } from '@shared/api-routes'

site/fragments/contacts-fragment/src/contacts.component.tsx

@@ -1,10 +1,12 @@
-import type { FC }             from 'react'
+'use client'
 
 import type { ContactsProps }  from './contacts.interface.js'
+import type { FC }             from 'react'
 
-import { memo }                from 'react'
 import React                   from 'react'
+import { memo }                from 'react'
 
+import { Condition }           from '@ui/condition'
 import { Box }                 from '@ui/layout'
 import { Column }              from '@ui/layout'
 import { Row }                 from '@ui/layout'
@@ -17,6 +19,7 @@ import { MapComponent }        from './map/index.js'
 import { useContacts }         from './hooks/index.js'
 
 const Contacts: FC<ContactsProps> = memo((props) => {
+  const { isYandexTurbo } = props
   const contactsInformationData = useContacts(props)
   const { contactsTitle } = contactsInformationData
 
@@ -39,7 +42,9 @@ const Contacts: FC<ContactsProps> = memo((props) => {
         justifyContent='space-between'
       >
         <ContactsInformation contactsData={contactsInformationData} />
-        <MapComponent />
+        <Condition match={!Boolean(isYandexTurbo)}>
+          <MapComponent />
+        </Condition>
       </Row>
       <Layout flexBasis={[24, 24, 0]} />
       <Box width='100%' height={270} display={['flex', 'flex', 'none']}>

site/fragments/contacts-fragment/src/contacts.interface.ts

@@ -2,6 +2,7 @@ import type { ContactsDataType as GlobalContactsDataType } from '@globals/data'
 import type { FragmentsDataType }                          from '@globals/data'
 
 export interface ContactsProps {
+  isYandexTurbo?: boolean
   contactsData: GlobalContactsDataType
   fragmentsData: FragmentsDataType
 }

site/fragments/works-examples-fragment/src/slider-part/slider-part.component.tsx

@@ -1,6 +1,5 @@
-import type { FC }              from 'react'
-
 import type { SliderPartProps } from './slider-part.interface.js'
+import type { FC }              from 'react'
 
 import React                    from 'react'
 
@@ -15,6 +14,7 @@ export const SliderPart: FC<SliderPartProps> = ({
   priceTitle,
   timeTitle,
   setActiveIndex,
+  isYandexTurbo,
 }) => {
   return (
     <Row justifyContent='center' alignItems='center' width='$fill' maxWidth={1440}>
@@ -33,6 +33,7 @@ export const SliderPart: FC<SliderPartProps> = ({
               priceTitle={priceTitle}
               timeTitle={timeTitle}
               setActiveIndex={setActiveIndex}
+              isYandexTurbo={isYandexTurbo}
             />
           </SwiperSlide>
         ))}

site/fragments/works-examples-fragment/src/slider-part/slider-part.interface.ts

@@ -1,11 +1,11 @@
-import type { Swiper }     from 'swiper'
-
 import type { SlidesType } from '../works-examples.interface.js'
+import type { Swiper }     from 'swiper'
 
 export interface SliderPartProps {
   slides: Array<SlidesType>
   setControlsSwiper: React.Dispatch<React.SetStateAction<Swiper | null>>
   priceTitle: string
   timeTitle: string
   setActiveIndex: React.Dispatch<React.SetStateAction<number>>
+  isYandexTurbo?: boolean
 }

site/fragments/works-examples-fragment/src/works-examples.component.tsx

@@ -1,9 +1,8 @@
-import type { FC }                 from 'react'
-
 import type { WorksExamplesProps } from './works-examples.interface.js'
+import type { FC }                 from 'react'
 
-import { forwardRef }              from 'react'
 import React                       from 'react'
+import { forwardRef }              from 'react'
 
 import { Box }                     from '@ui/layout'
 import { Row }                     from '@ui/layout'
@@ -16,7 +15,7 @@ import { TitlePart }               from './title-part/index.js'
 import { useWorkExamplesFragment } from './hooks/index.js'
 
 export const WorksExamples: FC<WorksExamplesProps> = forwardRef((
-  { fragmentsData, workResultsData },
+  { fragmentsData, workResultsData, isYandexTurbo },
   ref: any
 ) => {
   const {
@@ -49,6 +48,7 @@ export const WorksExamples: FC<WorksExamplesProps> = forwardRef((
             priceTitle={priceTitle}
             timeTitle={timeTitle}
             setActiveIndex={setActiveIndex}
+            isYandexTurbo={isYandexTurbo}
           />
 
           <PaginationPart

site/fragments/works-examples-fragment/src/works-examples.interface.ts

@@ -21,4 +21,5 @@ export type SlidesType = {
 export interface WorksExamplesProps {
   fragmentsData: FragmentsDataType
   workResultsData: WorkResultsDataType
+  isYandexTurbo?: boolean
 }

site/pages/contacts-page/src/contacts-page.client.tsx

@@ -1,8 +1,7 @@
 'use client'
 
-import type { FC }                      from 'react'
-
 import type { ContactsPageClientProps } from './contacts-page.interfaces.js'
+import type { FC }                      from 'react'
 
 import React                            from 'react'
 
@@ -17,7 +16,7 @@ import { getAvailableRadiiData }        from '@globals/data'
 import { getCarBodiesData }             from '@globals/data'
 import { getServicesData }              from '@globals/data'
 
-export const ContactsPageClient: FC<ContactsPageClientProps> = () => {
+export const ContactsPageClient: FC<ContactsPageClientProps> = ({ isYandexTurbo }) => {
   const { fragments } = getFragmentsData()
   const { contacts } = getContactsData()
   const { navigation } = getNavigationData()
@@ -35,7 +34,7 @@ export const ContactsPageClient: FC<ContactsPageClientProps> = () => {
         carBodiesData={carBodies}
         servicesData={services}
       />
-      <Contacts fragmentsData={fragments} contactsData={contacts} />
+      <Contacts fragmentsData={fragments} contactsData={contacts} isYandexTurbo={isYandexTurbo} />
       <Footer fragmentsData={fragments} contactsData={contacts} />
     </Column>
   )

site/pages/contacts-page/src/contacts-page.component.tsx

@@ -1,14 +1,17 @@
 import type { ContactsPageProps }       from './contacts-page.interfaces.js'
+import type { FC }                      from 'react'
 
 import React                            from 'react'
 
 import { ContactsPageClient }           from './contacts-page.client.js'
 import { runContactsPageServerQueries } from './hooks/index.js'
 
-const ContactsPage: ContactsPageProps = async () => {
+const ContactsPage: FC<ContactsPageProps> = async ({ searchParams }) => {
+  const isYandexTurbo = Boolean(searchParams['yandex-turbo'])
+
   await runContactsPageServerQueries()
   // @ts-expect-error not assignable
-  return <ContactsPageClient />
+  return <ContactsPageClient isYandexTurbo={isYandexTurbo} />
 }
 
 export default ContactsPage

site/pages/contacts-page/src/contacts-page.interfaces.ts

@@ -5,8 +5,13 @@ export interface ContactsPageClientProps {
   ogCover: string
   SEO: SEOInt
   data: DataInt
+  isYandexTurbo?: boolean
 }
 
-export type ContactsPageProps = () => Promise<JSX.Element>
+export interface ContactsPageProps {
+  searchParams: { [key: string]: string | string[] | undefined }
+}
+
+export type ContactsPageInt = () => Promise<JSX.Element>
 
 export type ContactsPageServerProps = () => Promise<ContactsPageClientProps>

site/pages/index-page/src/index-page.client.tsx

@@ -1,12 +1,11 @@
 'use client'
 
-import type { FC }                   from 'react'
-
 import type { IndexPageClientProps } from './index-page.interfaces.js'
+import type { FC }                   from 'react'
 
+import React                         from 'react'
 import { useRef }                    from 'react'
 import { useState }                  from 'react'
-import React                         from 'react'
 
 import { Footer }                    from '@fragments/footer-fragment'
 import { Navigation }                from '@fragments/navigation-fragment'
@@ -20,7 +19,10 @@ import { Column }                    from '@ui/layout'
 
 import { useIndexPageClient }        from './hooks/index.js'
 
-export const IndexPageClient: FC<IndexPageClientProps> = ({ servicesDataToReplace }) => {
+export const IndexPageClient: FC<IndexPageClientProps> = ({
+  servicesDataToReplace,
+  isYandexTurbo,
+}) => {
   const headerRef = useRef<HTMLDivElement | null>(null)
   const isLoaded = useRef<boolean>(false)
 
@@ -91,6 +93,7 @@ export const IndexPageClient: FC<IndexPageClientProps> = ({ servicesDataToReplac
       <WorksExamples
         workResultsData={workResults}
         fragmentsData={fragments}
+        isYandexTurbo={isYandexTurbo}
         {...getObserverOptions('works-examples')}
       />
       <Footer fragmentsData={fragments} contactsData={contacts} />