@korioinc/next-core 2.0.24 → 2.0.25

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

@@ -1 +1 @@
-{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/auth/routing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAgCxD,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAmB1F"}
+{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/auth/routing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAqCxD,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAmB1F"}

package/dist/auth/routing.js

@@ -14,13 +14,16 @@ function isPathMatching(path, patterns) {
 }
 // 경로에서 locale 접두사를 제거하는 함수
 function removeLocalePrefix(pathname) {
-    // Check if pathname starts with any locale
-    for (const locale of locales) {
-        if (pathname.startsWith(`/${locale}/`) || pathname === `/${locale}`) {
-            return pathname.slice(`/${locale}`.length) || '/';
-        }
+    const pathMatch = pathname.match(/^\/([^\\/]+)(?:\/|$)/);
+    const localeSegment = pathMatch?.[1];
+    if (!localeSegment) {
+        return pathname;
+    }
+    const canonicalLocale = locales.find((locale) => locale.toLowerCase() === localeSegment.toLowerCase());
+    if (!canonicalLocale) {
+        return pathname;
     }
-    return pathname;
+    return pathname.replace(new RegExp(`^/${canonicalLocale}(?=/|$)`, 'i'), '') || '/';
 }
 export async function handleAuthRouting(request) {
     const config = getConfig();

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;AAyDD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,WAAW,yBAyEvD;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,CAkB9F;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;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"}

package/dist/i18n/routing.js

@@ -47,11 +47,25 @@ const setCookie = (response, locale) => {
     });
     return response;
 };
+const getCanonicalLocale = (locale) => {
+    if (!locale) {
+        return undefined;
+    }
+    return locales.find((supportedLocale) => supportedLocale.toLowerCase() === locale.toLowerCase());
+};
+const getPathLocaleSegment = (pathname) => {
+    const pathMatch = pathname.match(/^\/([^\\/]+)(?:\/|$)/);
+    return pathMatch?.[1];
+};
+const replacePathLocale = (pathname, locale) => {
+    return pathname.replace(/^\/[^\\/]+(?=\/|$)/, `/${locale}`);
+};
 /**
  * URL에서 locale 부분을 제거하는 헬퍼 함수
  */
 const removeLocaleFromPath = (pathname, locale) => {
-    return pathname.replace(`/${locale}`, '') || '/';
+    const localePattern = new RegExp(`^/${locale}(?=/|$)`, 'i');
+    return pathname.replace(localePattern, '') || '/';
 };
 /**
  * URL에서 locale을 제거하고 리다이렉트하는 함수
@@ -67,6 +81,17 @@ const redirectWithoutLocale = (request, pathname, locale, shouldSetCookie = fals
     }
     return response;
 };
+const redirectWithLocale = (request, pathname, locale, shouldSetCookie = false) => {
+    const newPathname = replacePathLocale(pathname, locale);
+    const url = new URL(newPathname, request.url);
+    url.search = request.nextUrl.search;
+    url.hash = request.nextUrl.hash;
+    const response = setRoutingHeaders(NextResponse.redirect(url, 302), newPathname, request.nextUrl.search);
+    if (shouldSetCookie) {
+        setCookie(response, locale);
+    }
+    return response;
+};
 /**
  * 내부적으로 locale을 처리하는 rewrite 함수
  */
@@ -79,24 +104,22 @@ const rewriteWithLocale = (request, pathname, locale) => {
 };
 export function handleLocaleRouting(request) {
     const { pathname } = request.nextUrl;
-    const cookies = request.cookies;
-    const localeCookie = cookies.get(LOCALE_COOKIE_NAME);
+    const localeCookie = request.cookies.get(LOCALE_COOKIE_NAME);
+    const cookieLocale = getCanonicalLocale(localeCookie?.value);
     const defaultFallback = DEFAULT_FALLBACK();
     // 1. URL에서 locale 감지
-    let pathLocale;
-    const pathnameHasLocale = locales.some((locale) => {
-        if (pathname.startsWith(`/${locale}/`) || pathname === `/${locale}`) {
-            pathLocale = locale;
-            return true;
-        }
-        return false;
-    });
+    const pathLocaleSegment = getPathLocaleSegment(pathname);
+    const pathLocale = getCanonicalLocale(pathLocaleSegment);
+    const pathnameHasLocale = pathLocale !== undefined;
     // 2. URL에 locale이 포함된 경우
     if (pathnameHasLocale) {
+        if (pathLocaleSegment !== pathLocale) {
+            return redirectWithLocale(request, pathname, pathLocale, cookieLocale !== pathLocale);
+        }
         // 이미 path에 locale이 있을 때
         const response = setRoutingHeaders(NextResponse.next(), pathname, request.nextUrl.search);
         // 쿠키 값이 path locale과 다를 경우
-        if (localeCookie?.value !== pathLocale) {
+        if (cookieLocale !== pathLocale) {
             // 기본 locale인 경우 URL에서 제거
             if (LOCALE_PREFIX === 'as-needed' && pathLocale === defaultFallback) {
                 return redirectWithoutLocale(request, pathname, pathLocale, true);
@@ -112,14 +135,14 @@ export function handleLocaleRouting(request) {
     }
     // 3. URL에 locale이 없는 경우
     // 쿠키가 기본 locale이고, as-needed 설정일 때 내부적으로만 locale 처리
-    if (LOCALE_PREFIX === 'as-needed' && localeCookie?.value === defaultFallback) {
+    if (LOCALE_PREFIX === 'as-needed' && cookieLocale === defaultFallback) {
         return rewriteWithLocale(request, pathname, defaultFallback);
     }
     // 4. 적절한 locale 감지 및 적용
     const defaultLocale = getRequestLocale(request.headers);
     let locale = getCookieLocale(request.headers, pathname) || defaultLocale;
-    const findLocale = match([locale], locales, defaultLocale);
-    if (locale !== findLocale) {
+    const findLocale = getCanonicalLocale(match([locale], locales, defaultLocale));
+    if (findLocale && locale !== findLocale) {
         locale = findLocale;
     }
     // 기본 locale이고 as-needed 설정인 경우 URL에는 포함하지 않음
@@ -142,24 +165,17 @@ export function getRequestLocale(requestHeaders) {
         headers: { 'accept-language': langHeader },
     }).languages(locales.slice());
     const activeLocale = languages[0] || DEFAULT_FALLBACK();
-    return activeLocale;
+    return getCanonicalLocale(activeLocale) || activeLocale;
 }
 export function getCookieLocale(requestHeaders, pathname) {
-    const cookieLocale = getCookieFromHeaders(requestHeaders, LOCALE_COOKIE_NAME);
+    const cookieLocale = getCanonicalLocale(getCookieFromHeaders(requestHeaders, LOCALE_COOKIE_NAME));
     if (cookieLocale) {
         return cookieLocale;
     }
-    let pathLocale = undefined;
-    if (pathname) {
-        const pathMatch = pathname.match(/^\/([^\\/]+)(?:\/|$)/);
-        if (pathMatch && pathMatch[1]) {
-            const potentialLocale = pathMatch[1];
-            if (Array.isArray(locales) && locales.includes(potentialLocale)) {
-                pathLocale = potentialLocale;
-            }
-        }
+    if (!pathname) {
+        return undefined;
     }
-    return pathLocale;
+    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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@korioinc/next-core",
-  "version": "2.0.24",
+  "version": "2.0.25",
   "type": "module",
   "exports": {
     "./ads": {
@@ -79,7 +79,8 @@
     "tsc-alias": "^1.8.16",
     "tw-animate-css": "^1.4.0",
     "typescript": "^5.9.3",
-    "@korioinc/next-configs": "2.0.24"
+    "vitest": "^4.0.18",
+    "@korioinc/next-configs": "2.0.25"
   },
   "dependencies": {
     "@floating-ui/react": "^0.27.19",
@@ -94,7 +95,7 @@
     "schema-dts": "^1.1.5",
     "tailwind-merge": "^3.5.0",
     "valtio": "^2.3.1",
-    "@korioinc/next-conf": "2.0.24"
+    "@korioinc/next-conf": "2.0.25"
   },
   "publishConfig": {
     "access": "public",
@@ -119,6 +120,7 @@
   "scripts": {
     "build": "tsc -p tsconfig.json && tsc-alias -p tsconfig.json && cp -r src/styles dist/ && cp -r src/types dist/",
     "dev": "tsc -p tsconfig.json -w & tsc-alias -p tsconfig.json -w",
+    "test": "vitest run --config vitest.config.ts",
     "lint": "eslint . --max-warnings 0",
     "generate:component": "turbo gen react-component"
   }