Merge pull request #116 from torin-asakura/fix/release

fix/release
torin-asakura · Feb 3, 2024 · 467779a · 467779a
2 parents d21495a + c21b82e
commit 467779a
Show file tree

Hide file tree

Showing 11 changed files with 814 additions and 998 deletions.
diff --git a/...inux-x64-musl-npm-12.1.0-ba7473df3f-9.zip → ...-darwin-arm64-npm-12.1.0-773b5e10e1-9.zip b/...inux-x64-musl-npm-12.1.0-ba7473df3f-9.zip → ...-darwin-arm64-npm-12.1.0-773b5e10e1-9.zip
diff --git a/.yarn/cache/@next-swc-linux-x64-gnu-npm-12.1.0-9ea5ce91a7-9.zip b/.yarn/cache/@next-swc-linux-x64-gnu-npm-12.1.0-9ea5ce91a7-9.zip
diff --git a/.yarn/cache/fsevents-patch-19706e7e35-9.zip b/.yarn/cache/fsevents-patch-19706e7e35-9.zip
diff --git a/.yarn/releases/yarn-file.cjs → .yarn/releases/yarn-remote.cjs b/.yarn/releases/yarn-file.cjs → .yarn/releases/yarn-remote.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -40,4 +40,4 @@ packageExtensions:
     dependencies:
       react: '*'
 
-yarnPath: .yarn/releases/yarn-file.cjs
+yarnPath: .yarn/releases/yarn-remote.cjs
diff --git a/landing/app/src/pages/_app.tsx b/landing/app/src/pages/_app.tsx
@@ -14,7 +14,7 @@ const Bare = ({ Component, pageProps, props }) => {
   return (
     <ApolloProvider client={client}>
       <ThemeProvider>
-        <Component {...props} {...pageProps} />
+        <Component {...pageProps} {...props} />
       </ThemeProvider>
     </ApolloProvider>
   )

diff --git a/landing/app/src/tsconfig.json b/landing/app/src/tsconfig.json
@@ -12,7 +12,8 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "jsx": "preserve"
+    "jsx": "preserve",
+    "incremental": true
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
   "exclude": ["node_modules"]

diff --git a/landing/fragments/landing-navigation/src/navigation.component.tsx b/landing/fragments/landing-navigation/src/navigation.component.tsx
@@ -104,23 +104,26 @@ const Navigation: FC = () => {
             </Layout>
             <Layout flexGrow={1} flexBasis={[0, 0, 168]} flexShrink={0} />
             <Row alignItems='center' justifyContent='flex-start' display={['none', 'none', 'flex']}>
-              {navigation[language]?.filter(item => !relocationId.includes(item.id)).reverse().map(({ title, elementsMenu, content }) => (
-                <>
-                  <Layout>
-                    <Condition match={elementsMenu?.externalLink !== null}>
-                      <Link href={elementsMenu.externalLink} fontSize='semiRegular'>
-                        {title}
-                      </Link>
-                    </Condition>
-                    <Condition match={elementsMenu?.externalLink === null}>
-                      <NextLink path={content} fontSize='semiRegular'>
-                        {title}
-                      </NextLink>
-                    </Condition>
-                  </Layout>
-                  <Layout flexBasis={40} />
-                </>
-              ))}
+              {navigation[language]
+                ?.filter((item) => !relocationId.includes(item.id))
+                .reverse()
+                .map(({ title, elementsMenu, content }) => (
+                  <>
+                    <Layout>
+                      <Condition match={elementsMenu?.externalLink !== null}>
+                        <Link href={elementsMenu.externalLink} fontSize='semiRegular'>
+                          {title}
+                        </Link>
+                      </Condition>
+                      <Condition match={elementsMenu?.externalLink === null}>
+                        <NextLink path={content} fontSize='semiRegular'>
+                          {title}
+                        </NextLink>
+                      </Condition>
+                    </Layout>
+                    <Layout flexBasis={40} />
+                  </>
+                ))}
               <Layout flexBasis={40} />
             </Row>
             <Layout flexGrow={1} />

diff --git a/landing/fragments/landing-services/src/services.component.tsx b/landing/fragments/landing-services/src/services.component.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable no-shadow */
-
 import React               from 'react'
 import { forwardRef }      from 'react'
 

diff --git a/landing/pages/index-page/src/queries/services.query.ts b/landing/pages/index-page/src/queries/services.query.ts
@@ -34,17 +34,15 @@ const runServicesQuery = async () => {
 
   const relocationId = ['cG9zdDo2MDI=', 'cG9zdDo2MDM=']
 
-  const data = servicesData.mainServices.nodes.filter(node => relocationId[0] !== (node.id) && relocationId[1] !== node.id)
+  const data = servicesData.mainServices.nodes.filter(
+    (node) => relocationId[0] !== node.id && relocationId[1] !== node.id
+  )
 
   if (servicesData) {
     return {
       services: {
-        RU: data.filter(
-          (servicesFragment) => servicesFragment.language.code === 'RU'
-        ),
-        EN: data.filter(
-          (servicesFragment) => servicesFragment.language.code === 'EN'
-        ),
+        RU: data.filter((servicesFragment) => servicesFragment.language.code === 'RU'),
+        EN: data.filter((servicesFragment) => servicesFragment.language.code === 'EN'),
       },
     }
   }

diff --git a/package.json b/package.json
@@ -29,5 +29,5 @@
     "husky": "8.0.1",
     "typescript": "4.4.4"
   },
-  "packageManager": "yarn@3.6.1"
+  "packageManager": "yarn@4.1.0"
 }