@korioinc/next-core 2.0.34 → 2.0.35

package/dist/components/locale-switcher/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/locale-switcher/index.tsx"],"names":[],"mappings":"AAcA,UAAU,mBAAmB;IAC3B;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EAAE,SAAS,EAAE,GAAE,mBAAwB,kDAgF7E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/locale-switcher/index.tsx"],"names":[],"mappings":"AAeA,UAAU,mBAAmB;IAC3B;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EAAE,SAAS,EAAE,GAAE,mBAAwB,kDAiG7E"}

package/dist/components/locale-switcher/index.js

@@ -7,6 +7,7 @@ import { Menu, MenuButton, MenuItem, MenuItems, Transition } from '@headlessui/r
 import { useLingui } from '@lingui/react';
 import { allLanguages } from './language-options';
 import { resolveVisibleLanguages } from './resolve-visible-languages';
+import { setCookie } from 'cookies-next/client';
 import linguiConfig from 'lingui.config';
 export default function LocaleSwitcher({ languages } = {}) {
     const router = useRouter();
@@ -16,6 +17,15 @@ export default function LocaleSwitcher({ languages } = {}) {
     useEffect(() => {
         setMounted(true);
     }, []);
+    useEffect(() => {
+        if (!mounted || !i18n.locale) {
+            return;
+        }
+        setCookie('NEXT_LOCALE', i18n.locale, {
+            path: '/',
+            sameSite: 'lax',
+        });
+    }, [mounted, i18n.locale]);
     const availableLanguages = resolveVisibleLanguages({
         allLanguages,
         defaultLanguageCodes: linguiConfig.locales,
@@ -30,6 +40,10 @@ export default function LocaleSwitcher({ languages } = {}) {
     const changeLanguage = (nextLocale) => {
         const currentLocale = i18n.locale;
         const newPath = getChangeLocalePath(pathname, currentLocale, nextLocale);
+        setCookie('NEXT_LOCALE', nextLocale, {
+            path: '/',
+            sameSite: 'lax',
+        });
         router.replace(newPath);
         router.refresh();
     };

package/dist/i18n/routing.client.d.ts

@@ -0,0 +1,2 @@
+export declare function useToLocalePath(): (href?: string | null) => string;
+//# sourceMappingURL=routing.client.d.ts.map

package/dist/i18n/routing.client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"routing.client.d.ts","sourceRoot":"","sources":["../../src/i18n/routing.client.ts"],"names":[],"mappings":"AAMA,wBAAgB,eAAe,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,KAAK,MAAM,CAIlE"}

package/dist/i18n/routing.client.js

@@ -0,0 +1,7 @@
+'use client';
+import { usePathname } from 'next/navigation';
+import { toLocalePath as buildLocalePath } from './routing';
+export function useToLocalePath() {
+    const pathname = usePathname();
+    return (href) => buildLocalePath(pathname, href);
+}

package/dist/i18n/routing.d.ts

@@ -8,6 +8,7 @@ export declare function getLocales(): string[];
  * Get default locale
  */
 export declare function getDefaultLocale(): string;
+export declare function getPathLocale(pathname: string): string | undefined;
 export declare function handleLocaleRouting(request: NextRequest): NextResponse<unknown>;
 export declare function getRequestLocale(requestHeaders: Headers): string;
 export declare function getCookieLocale(requestHeaders: Headers, pathname?: string): string | undefined;
@@ -18,6 +19,10 @@ export declare function getPathname({ locale, href }: {
 }): string;
 export declare function getLanguageAlternates(pathname?: string): Record<string, string>;
 export declare function getCurrentPathname(): Promise<string>;
+export declare function getCurrentPathLocale(): Promise<string | undefined>;
+export declare function getPathLocalePathname(pathname: string, href?: string | null): string;
+export declare function toLocalePath(pathname: string, href?: string | null): string;
+export declare function getLocalePathname(href: string): Promise<string>;
 export declare function getCurrentSearchParams(): Promise<URLSearchParams>;
 export declare function getDefaultPathname(): Promise<string>;
 export declare function getCurrentLanguageAlternates(): Promise<Record<string, string>>;

package/dist/i18n/routing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/i18n/routing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,KAAK,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAsC7D;;GAEG;AACH,wBAAgB,UAAU,IAAI,MAAM,EAAE,CAErC;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAiGD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,WAAW,yBAsEvD;AAED,wBAAgB,gBAAgB,CAAC,cAAc,EAAE,OAAO,GAAG,MAAM,CAShE;AAED,wBAAgB,eAAe,CAAC,cAAc,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAW9F;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAoBvG;AAED,wBAAgB,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,UAY7E;AAsBD,wBAAgB,qBAAqB,CAAC,QAAQ,GAAE,MAAY,0BAwB3D;AAED,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,CAK1D;AAED,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,eAAe,CAAC,CAMvE;AAED,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,CAU1D;AAED,wBAAsB,4BAA4B,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAIpF;AAED,KAAK,aAAa,GACd,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,GAC7C,eAAe,GACf,uBAAuB,GACvB,SAAS,CAAC;AAiDd,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,aAAa,GAAG,MAAM,CAErF;AAED,wBAAsB,UAAU,CAAC,MAAM,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAIxE;AAED,wBAAsB,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC,CAKnE"}
+{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/i18n/routing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,KAAK,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAoC7D;;GAEG;AACH,wBAAgB,UAAU,IAAI,MAAM,EAAE,CAErC;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AA4BD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAElE;AAiFD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,WAAW,yBA2EvD;AAED,wBAAgB,gBAAgB,CAAC,cAAc,EAAE,OAAO,GAAG,MAAM,CAShE;AAED,wBAAgB,eAAe,CAAC,cAAc,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAW9F;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAevG;AAED,wBAAgB,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,UAY7E;AAsBD,wBAAgB,qBAAqB,CAAC,QAAQ,GAAE,MAAY,0BAwB3D;AAED,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,CAK1D;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAKxE;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAuBpF;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAE3E;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAKrE;AAED,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,eAAe,CAAC,CAMvE;AAED,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,CAU1D;AAED,wBAAsB,4BAA4B,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAIpF;AAED,KAAK,aAAa,GACd,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,GAC7C,eAAe,GACf,uBAAuB,GACvB,SAAS,CAAC;AAiDd,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,aAAa,GAAG,MAAM,CAErF;AAED,wBAAsB,UAAU,CAAC,MAAM,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAIxE;AAED,wBAAsB,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC,CAKnE"}

package/dist/i18n/routing.js

@@ -19,11 +19,10 @@ const DEFAULT_FALLBACK = () => {
 const LOCALE_COOKIE_NAME = 'NEXT_LOCALE';
 const LOCALE_PREFIX = 'as-needed';
 const PATHNAME_HEADER_NAME = 'x-pathname';
+const PATH_LOCALE_HEADER_NAME = 'x-path-locale';
 const SEARCH_PARAMS_HEADER_NAME = 'x-search-params';
-const setRoutingHeaders = (response, pathname, search) => {
-    response.headers.set(PATHNAME_HEADER_NAME, pathname);
-    response.headers.set(SEARCH_PARAMS_HEADER_NAME, search.replace(/^\?/, ''));
-    return response;
+const isDocumentRequest = (request) => {
+    return request.headers.get('accept')?.includes('text/html') || false;
 };
 /**
  * Get all available locales
@@ -57,6 +56,16 @@ const getPathLocaleSegment = (pathname) => {
     const pathMatch = pathname.match(/^\/([^\\/]+)(?:\/|$)/);
     return pathMatch?.[1];
 };
+export function getPathLocale(pathname) {
+    return getCanonicalLocale(getPathLocaleSegment(pathname));
+}
+const setRoutingHeaders = (response, pathname, search) => {
+    const pathLocale = getCanonicalLocale(getPathLocaleSegment(pathname));
+    response.headers.set(PATHNAME_HEADER_NAME, pathname);
+    response.headers.set(PATH_LOCALE_HEADER_NAME, pathLocale || '');
+    response.headers.set(SEARCH_PARAMS_HEADER_NAME, search.replace(/^\?/, ''));
+    return response;
+};
 const replacePathLocale = (pathname, locale) => {
     return pathname.replace(/^\/[^\\/]+(?=\/|$)/, `/${locale}`);
 };
@@ -107,6 +116,7 @@ export function handleLocaleRouting(request) {
     const localeCookie = request.cookies.get(LOCALE_COOKIE_NAME);
     const cookieLocale = getCanonicalLocale(localeCookie?.value);
     const defaultFallback = DEFAULT_FALLBACK();
+    const documentRequest = isDocumentRequest(request);
     // 1. URL에서 locale 감지
     const pathLocaleSegment = getPathLocaleSegment(pathname);
     const pathLocale = getCanonicalLocale(pathLocaleSegment);
@@ -114,7 +124,7 @@ export function handleLocaleRouting(request) {
     // 2. URL에 locale이 포함된 경우
     if (pathnameHasLocale) {
         if (pathLocaleSegment !== pathLocale) {
-            return redirectWithLocale(request, pathname, pathLocale, cookieLocale !== pathLocale);
+            return redirectWithLocale(request, pathname, pathLocale, cookieLocale !== pathLocale && documentRequest);
         }
         // 이미 path에 locale이 있을 때
         const response = setRoutingHeaders(NextResponse.next(), pathname, request.nextUrl.search);
@@ -122,9 +132,12 @@ export function handleLocaleRouting(request) {
         if (cookieLocale !== pathLocale) {
             // 기본 locale인 경우 URL에서 제거
             if (LOCALE_PREFIX === 'as-needed' && pathLocale === defaultFallback) {
-                return redirectWithoutLocale(request, pathname, pathLocale, true);
+                return redirectWithoutLocale(request, pathname, pathLocale, documentRequest);
             }
             // 다른 locale의 경우 쿠키 설정
+            if (!documentRequest) {
+                return response;
+            }
             return setCookie(response, pathLocale);
         }
         // locale은 같지만 기본 locale이고 as-needed 설정인 경우
@@ -154,7 +167,7 @@ export function handleLocaleRouting(request) {
     request.nextUrl.pathname = newPathname;
     const response = setRoutingHeaders(NextResponse.redirect(request.nextUrl), newPathname, request.nextUrl.search);
     // 쿠키가 없는 경우 설정
-    if (localeCookie?.value === undefined) {
+    if (localeCookie?.value === undefined && documentRequest) {
         setCookie(response, locale);
     }
     return response;
@@ -178,25 +191,20 @@ export function getCookieLocale(requestHeaders, pathname) {
     return getCanonicalLocale(getPathLocaleSegment(pathname));
 }
 export function getChangeLocalePath(pathname, currentLocale, nextLocale) {
-    // Create the new path based on whether the current path has a locale segment or not
     let pathNameWithoutLocale;
-    // Check if pathname starts with current locale
     if (pathname === `/${currentLocale}` || pathname.startsWith(`/${currentLocale}/`)) {
-        // Path has locale: /ko or /ko/something
-        pathNameWithoutLocale = pathname.slice(currentLocale.length + 1); // Remove /locale part
+        pathNameWithoutLocale = pathname.slice(currentLocale.length + 1);
         if (pathNameWithoutLocale.startsWith('/')) {
-            pathNameWithoutLocale = pathNameWithoutLocale.slice(1); // Remove leading slash if any
+            pathNameWithoutLocale = pathNameWithoutLocale.slice(1);
         }
     }
     else if (pathname === '/') {
-        // Root path
         pathNameWithoutLocale = '';
     }
     else {
-        // Path doesn't have locale prefix: /something
         pathNameWithoutLocale = pathname.startsWith('/') ? pathname.slice(1) : pathname;
     }
-    return `/${nextLocale}${pathNameWithoutLocale ? '/' + pathNameWithoutLocale : ''}`;
+    return `/${nextLocale}${pathNameWithoutLocale ? `/${pathNameWithoutLocale}` : ''}`;
 }
 export function getPathname({ locale, href }) {
     const defaultFallback = DEFAULT_FALLBACK();
@@ -251,6 +259,37 @@ export async function getCurrentPathname() {
     const headersList = await headers();
     return headersList.get(PATHNAME_HEADER_NAME) || '';
 }
+export async function getCurrentPathLocale() {
+    const { headers } = await import('next/headers');
+    const headersList = await headers();
+    return getCanonicalLocale(headersList.get(PATH_LOCALE_HEADER_NAME) || undefined);
+}
+export function getPathLocalePathname(pathname, href) {
+    if (href == null || href === '#') {
+        return '#';
+    }
+    const normalizedHref = href === '' ? '/' : href.startsWith('/') ? href : `/${href}`;
+    const hrefLocale = getPathLocale(normalizedHref);
+    if (hrefLocale) {
+        return normalizedHref;
+    }
+    const pathLocale = getPathLocale(pathname);
+    if (!pathLocale) {
+        return normalizedHref;
+    }
+    if (normalizedHref === '/') {
+        return `/${pathLocale}`;
+    }
+    return `/${pathLocale}${normalizedHref}`;
+}
+export function toLocalePath(pathname, href) {
+    return getPathLocalePathname(pathname, href);
+}
+export async function getLocalePathname(href) {
+    const pathLocale = await getCurrentPathLocale();
+    const currentPathname = pathLocale ? `/${pathLocale}` : '/';
+    return getPathLocalePathname(currentPathname, href);
+}
 export async function getCurrentSearchParams() {
     const { headers } = await import('next/headers');
     const headersList = await headers();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@korioinc/next-core",
-  "version": "2.0.34",
+  "version": "2.0.35",
   "type": "module",
   "exports": {
     "./ads": {
@@ -90,7 +90,7 @@
     "tw-animate-css": "^1.4.0",
     "typescript": "^6.0.2",
     "vitest": "^4.1.2",
-    "@korioinc/next-configs": "2.0.34"
+    "@korioinc/next-configs": "2.0.35"
   },
   "dependencies": {
     "@floating-ui/react": "^0.27.19",
@@ -105,7 +105,7 @@
     "schema-dts": "^2.0.0",
     "tailwind-merge": "^3.5.0",
     "valtio": "^2.3.1",
-    "@korioinc/next-conf": "2.0.34"
+    "@korioinc/next-conf": "2.0.35"
   },
   "publishConfig": {
     "access": "public",