Merge branch 'main' into avivkeller/admin-972/gov-repo

Signed-off-by: Aviv Keller <[email protected]>

Author: avivkeller

.github/workflows/translations-sync.yml

@@ -89,27 +89,27 @@ jobs:
             cache-lint-${{ hashFiles('pnpm-lock.yaml') }}-
             cache-lint-
 
+      - name: Patch version if the files changed
+        working-directory: packages/i18n
+        run: |
+          CHANGED_FILES=$(git diff --name-only HEAD^1 HEAD)
+          if [ -n "$CHANGED_FILES" ]; then
+            pnpm version patch --no-git-tag-version
+          fi
+
       - name: Run ESLint
         working-directory: apps/site
         run: node --run lint:md -- --fix
 
       - name: Run Prettier
         run: node --run prettier:fix
 
-      - name: Patch version if the files changed
-        run: |
-          CHANGED_FILES=$(git diff --name-only origin/main HEAD -- packages/website-i18n)
-          if [ -n "$CHANGED_FILES" ]; then
-            cd packages/website-i18n
-            pnpm version patch --no-git-tag-version
-          else
-
       - name: Push Changes back to Pull Request
         uses: stefanzweifel/git-auto-commit-action@778341af668090896ca464160c2def5d1d1a3eb0 # v6.0.1
         with:
           commit_options: '--no-verify --signoff'
           commit_message: 'chore: automated format of translated files'
-          branch: 'chore/crowdin'
+          branch: ${{ env.BRANCH_NAME }}
 
       - name: Save Lint Cache
         uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3

apps/site/app/[locale]/[...path]/page.tsx

@@ -74,9 +74,9 @@ const getPage: FC<PageParams> = async props => {
   // If we have a filename and layout then we have a page
   if (context.filename && context.frontmatter.layout) {
     return basePage.renderPage({
-      content: content,
+      content,
       layout: context.frontmatter.layout,
-      context: context,
+      context,
     });
   }
 

apps/site/app/[locale]/blog/[...path]/page.tsx

@@ -50,15 +50,15 @@ const getPage: FC<PageParams> = async props => {
   // Gets the Markdown content and context for Blog pages
   // otherwise this is likely a blog-category or a blog post
   const [content, context] = await basePage.getMarkdownContext({
-    locale: locale,
+    locale,
     pathname: `blog/${pathname}`,
   });
 
   // If this isn't a valid dynamic route for blog post or there's no markdown file
   // for this, then we fail as not found as there's nothing we can do.
   if (isDynamicRoute || context.filename) {
     return basePage.renderPage({
-      content: content,
+      content,
       layout: context.frontmatter.layout ?? 'blog-category',
       context: { ...context, pathname: `/blog/${pathname}` },
     });

apps/site/app/[locale]/download/archive/[version]/page.tsx

@@ -31,7 +31,7 @@ export const generateStaticParams = async () => {
 
   return ARCHIVE_DYNAMIC_ROUTES.map(version => ({
     locale: defaultLocale.code,
-    version: version,
+    version,
   }));
 };
 
@@ -58,15 +58,15 @@ const getPage: FC<PageParams> = async props => {
 
   // Gets the Markdown content and context for Download Archive pages
   const [content, context] = await basePage.getMarkdownContext({
-    locale: locale,
+    locale,
     pathname: 'download/archive',
   });
 
   // If this isn't a valid dynamic route for archive version or there's no markdown
   //  file for this, then we fail as not found as there's nothing we can do.
   if (isDynamicRoute && context.filename) {
     return basePage.renderPage({
-      content: content,
+      content,
       layout: context.frontmatter.layout!,
       context: { ...context, pathname: `/download/archive/${pathname}` },
     });

apps/site/app/[locale]/page.tsx

@@ -64,9 +64,9 @@ const getPage: FC<PageParams> = async props => {
   // If we have a filename and layout then we have a page
   if (context.filename && context.frontmatter.layout) {
     return basePage.renderPage({
-      content: content,
+      content,
       layout: context.frontmatter.layout,
-      context: context,
+      context,
     });
   }
 

apps/site/components/Downloads/Release/PrebuiltDownloadButtons.tsx

@@ -24,17 +24,17 @@ const PrebuiltDownloadButtons: FC = () => {
   const installerUrl = platform
     ? getNodeDownloadUrl({
         versionWithPrefix: release.versionWithPrefix,
-        os: os,
-        platform: platform,
+        os,
+        platform,
         kind: 'installer',
       })
     : '';
 
   const binaryUrl = platform
     ? getNodeDownloadUrl({
         versionWithPrefix: release.versionWithPrefix,
-        os: os,
-        platform: platform,
+        os,
+        platform,
         kind: 'binary',
       })
     : '';

apps/site/components/Downloads/Release/VersionDropdown.tsx

@@ -38,12 +38,12 @@ const VersionDropdown: FC = () => {
     );
 
     if (release?.isLts && pathname.includes('current')) {
-      redirect({ href: '/download', locale: locale });
+      redirect({ href: '/download', locale });
       return;
     }
 
     if (release?.status === 'Current' && !pathname.includes('current')) {
-      redirect({ href: '/download/current', locale: locale });
+      redirect({ href: '/download/current', locale });
       return;
     }
 

apps/site/components/withBreadcrumbs.tsx

@@ -57,9 +57,7 @@ const WithBreadcrumbs: FC<WithBreadcrumbsProps> = ({ navKeys = [] }) => {
         // Goes deeper on the tree of items if there are any.
         currentNode = items;
 
-        return label
-          ? [...breadcrumbs, { label: label, href: link }]
-          : breadcrumbs;
+        return label ? [...breadcrumbs, { label, href: link }] : breadcrumbs;
       }
 
       return breadcrumbs;

apps/site/components/withFooter.tsx

@@ -16,7 +16,7 @@ const WithFooter: FC = () => {
   const { socialLinks, footerLinks } = siteNavigation;
 
   const navigation = {
-    socialLinks: socialLinks,
+    socialLinks,
     footerLinks: footerLinks.map(link => ({ ...link, text: t(link.text) })),
   };
 

apps/site/components/withNavBar.tsx

@@ -62,9 +62,9 @@ const WithNavBar: FC = () => {
 
       <NavBar
         navItems={navigationItems.map(([, { label, link, target }]) => ({
-          link: link,
+          link,
           text: label,
-          target: target,
+          target,
         }))}
         pathname={pathname}
         as={Link}