create-brainerce-store 1.27.4 → 1.27.5

package/templates/nextjs/base/src/app/register/page.tsx

@@ -1,8 +1,7 @@
 'use client';
 
 import { useState } from 'react';
-import { useRouter } from 'next/navigation';
-import Link from 'next/link';
+import { useRouter, Link } from '@/lib/navigation';
 import { useAuth } from '@/providers/store-provider';
 import { proxyRegister } from '@/lib/auth';
 import { RegisterForm } from '@/components/auth/register-form';

package/templates/nextjs/base/src/app/reset-password/page.tsx

@@ -1,8 +1,7 @@
 'use client';
 
 import { useState } from 'react';
-import { useRouter } from 'next/navigation';
-import Link from 'next/link';
+import { useRouter, Link } from '@/lib/navigation';
 import { proxyResetPassword } from '@/lib/auth';
 import { LoadingSpinner } from '@/components/shared/loading-spinner';
 import { useTranslations } from '@/lib/translations';

package/templates/nextjs/base/src/app/verify-email/page.tsx

@@ -1,8 +1,7 @@
 'use client';
 
 import { Suspense, useState, useRef, useEffect, useCallback } from 'react';
-import { useRouter } from 'next/navigation';
-import Link from 'next/link';
+import { useRouter, Link } from '@/lib/navigation';
 import { useAuth } from '@/providers/store-provider';
 import { proxyVerifyEmail, proxyResendVerification } from '@/lib/auth';
 import { LoadingSpinner } from '@/components/shared/loading-spinner';

package/templates/nextjs/base/src/components/auth/login-form.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { useState } from 'react';
-import Link from 'next/link';
+import { Link } from '@/lib/navigation';
 import { useTranslations } from '@/lib/translations';
 import { cn } from '@/lib/utils';
 import { LoadingSpinner } from '@/components/shared/loading-spinner';

package/templates/nextjs/base/src/components/layout/footer.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import Link from 'next/link';
+import { Link } from '@/lib/navigation';
 import { useTranslations } from '@/lib/translations';
 import { useStoreInfo, useAuth } from '@/providers/store-provider';
 

package/templates/nextjs/base/src/components/layout/header.tsx

@@ -1,9 +1,8 @@
 'use client';
 
 import { useState, useEffect, useRef, useCallback } from 'react';
-import Link from 'next/link';
+import { Link, useRouter } from '@/lib/navigation';
 import Image from 'next/image';
-import { useRouter } from 'next/navigation';
 import type { SearchSuggestions, ProductSuggestion } from 'brainerce';
 import { formatPrice } from 'brainerce';
 import { getClient } from '@/lib/brainerce';

package/templates/nextjs/base/src/components/products/product-card.tsx

@@ -1,8 +1,7 @@
 'use client';
 
 import { useState } from 'react';
-import Link from 'next/link';
-import { useRouter } from 'next/navigation';
+import { Link, useRouter } from '@/lib/navigation';
 import Image from 'next/image';
 import type { Product } from 'brainerce';
 import { getProductPriceInfo, getVariantPrice, formatPrice } from 'brainerce';

package/templates/nextjs/base/src/components/products/recommendation-section.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { useEffect, useState } from 'react';
-import Link from 'next/link';
+import { Link } from '@/lib/navigation';
 import Image from 'next/image';
 import type { ProductRecommendation } from 'brainerce';
 import { PriceDisplay } from '@/components/shared/price-display';

package/templates/nextjs/base/src/lib/navigation.tsx.ejs

@@ -0,0 +1,60 @@
+<% if (i18nEnabled) { %>
+'use client';
+
+import React from 'react';
+import NextLink from 'next/link';
+import { useRouter as useNextRouter, usePathname } from 'next/navigation';
+import type { ComponentProps } from 'react';
+
+const supportedLocales = <%- supportedLocales %>;
+const defaultLocale = '<%= defaultLocale %>';
+
+function getLocale(pathname: string): string {
+  const segment = pathname.split('/')[1];
+  return supportedLocales.includes(segment) ? segment : defaultLocale;
+}
+
+function localizePath(path: string, locale: string): string {
+  if (!path.startsWith('/')) return path;
+  // Don't double-prefix
+  const firstSeg = path.split('/')[1];
+  if (supportedLocales.includes(firstSeg)) return path;
+  return `/${locale}${path}`;
+}
+
+/**
+ * Locale-aware Link — automatically prepends current locale to href.
+ */
+export function Link({ href, ...props }: ComponentProps<typeof NextLink>) {
+  const pathname = usePathname();
+  const locale = getLocale(pathname);
+  const localizedHref =
+    typeof href === 'string' ? localizePath(href, locale) : href;
+  return <NextLink href={localizedHref} {...props} />;
+}
+
+/**
+ * Locale-aware useRouter — push/replace automatically prepend locale.
+ */
+export function useRouter() {
+  const router = useNextRouter();
+  const pathname = usePathname();
+  const locale = getLocale(pathname);
+
+  return {
+    ...router,
+    push: (url: string, options?: Parameters<typeof router.push>[1]) => {
+      return router.push(localizePath(url, locale), options);
+    },
+    replace: (url: string, options?: Parameters<typeof router.replace>[1]) => {
+      return router.replace(localizePath(url, locale), options);
+    },
+  };
+}
+<% } else { %>
+/* Single-language store — re-export Next.js navigation as-is */
+'use client';
+
+export { default as Link } from 'next/link';
+export { useRouter } from 'next/navigation';
+<% } %>