@akanjs/next 0.0.149 → 0.0.150

package/bootCsr.d.ts

@@ -1 +1 @@
-export declare const bootCsr: (context: Record<string, () => Promise<unknown>>, rootPath: string, entryPath?: string) => Promise<void>;
+export declare const bootCsr: (context: Record<string, () => Promise<unknown>>) => Promise<void>;

package/cjs/bootCsr.js

@@ -38,15 +38,33 @@ var import_react = __toESM(require("react"));
 var ReactDOM = __toESM(require("react-dom/client"));
 var import_useCsrValues = require("./useCsrValues");
 const supportLanguages = ["en", "ko"];
-const bootCsr = async (context, rootPath, entryPath = "/route") => {
+const bootCsr = async (context) => {
+  window.document.body.style.overflow = "hidden";
+  const pathname = window.location.pathname;
+  if (pathname === "/404")
+    return;
   const [, jwt] = await Promise.all([import_client.device.init({ supportLanguages }), import_client.storage.getItem("jwt")]);
+  if (!pathname.startsWith(`/${import_client.device.lang}`))
+    window.location.replace(`/${import_client.device.lang}${pathname}`);
   if (jwt)
     (0, import_client.initAuth)({ jwt });
   import_common.Logger.verbose(`Set default language: ${import_client.device.lang}`);
+  const basePaths = process.env.basePaths?.split(",");
+  const currentBasePath = basePaths ? pathname.split("/")[2] : void 0;
+  if (currentBasePath && basePaths && !basePaths.includes(currentBasePath))
+    throw new Error(`Invalid path: ${pathname}`);
+  const baseLayoutPaths = ["/", "/:lang", ...currentBasePath ? [`/:lang/${currentBasePath}`] : []];
+  const otherBasePaths = basePaths?.filter((path) => path !== currentBasePath) ?? [];
   const pages = {};
   await Promise.all(
     Object.entries(context).map(async ([key, value]) => {
-      pages[key] = await value();
+      if (basePaths) {
+        const pageBasePath = key.split("/")[2];
+        if (pageBasePath && otherBasePaths.includes(pageBasePath))
+          return;
+      }
+      const getPageContent = value;
+      pages[key] = await getPageContent();
     })
   );
   const getPageState = (csrConfig) => {
@@ -96,13 +114,10 @@ const bootCsr = async (context, rootPath, entryPath = "/route") => {
       }
     });
   }
-  const pathname = window.location.pathname;
-  const initialPath = import_client.device.lang + entryPath;
-  window.document.body.style.overflow = "hidden";
   const getPathRoutes = (route, parentRootLayouts = [], parentLayouts = [], parentPaths = []) => {
     const parentPath = parentPaths.filter((path2) => path2 !== "/").join("");
     const currentPathSegment = /^\/\(.*\)$/.test(route.path) ? "" : route.path;
-    const isRoot = ["/", "/:lang"].includes(parentPath + currentPathSegment) && parentRootLayouts.length < 2;
+    const isRoot = baseLayoutPaths.includes(parentPath + currentPathSegment) && parentRootLayouts.length < 2;
     const path = parentPath + currentPathSegment;
     const pathSegments = [...parentPaths, ...currentPathSegment ? [currentPathSegment] : []];
     const RootLayouts = [...parentRootLayouts, ...isRoot && route.Layout ? [route.Layout] : []];
@@ -149,14 +164,9 @@ const bootCsr = async (context, rootPath, entryPath = "/route") => {
       /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null)
     ));
   };
-  if (pathname !== `/${initialPath}`) {
-    window.location.replace(initialPath);
-    return;
-  } else {
-    const el = document.getElementById("root");
-    if (!el)
-      throw new Error("No root element");
-    const root = ReactDOM.createRoot(el);
-    root.render(/* @__PURE__ */ import_react.default.createElement(RouterProvider, null));
-  }
+  const el = document.getElementById("root");
+  if (!el)
+    throw new Error("No root element");
+  const root = ReactDOM.createRoot(el);
+  root.render(/* @__PURE__ */ import_react.default.createElement(RouterProvider, null));
 };

package/esm/bootCsr.js

@@ -11,15 +11,33 @@ import React from "react";
 import * as ReactDOM from "react-dom/client";
 import { useCsrValues } from "./useCsrValues";
 const supportLanguages = ["en", "ko"];
-const bootCsr = async (context, rootPath, entryPath = "/route") => {
+const bootCsr = async (context) => {
+  window.document.body.style.overflow = "hidden";
+  const pathname = window.location.pathname;
+  if (pathname === "/404")
+    return;
   const [, jwt] = await Promise.all([device.init({ supportLanguages }), storage.getItem("jwt")]);
+  if (!pathname.startsWith(`/${device.lang}`))
+    window.location.replace(`/${device.lang}${pathname}`);
   if (jwt)
     initAuth({ jwt });
   Logger.verbose(`Set default language: ${device.lang}`);
+  const basePaths = process.env.basePaths?.split(",");
+  const currentBasePath = basePaths ? pathname.split("/")[2] : void 0;
+  if (currentBasePath && basePaths && !basePaths.includes(currentBasePath))
+    throw new Error(`Invalid path: ${pathname}`);
+  const baseLayoutPaths = ["/", "/:lang", ...currentBasePath ? [`/:lang/${currentBasePath}`] : []];
+  const otherBasePaths = basePaths?.filter((path) => path !== currentBasePath) ?? [];
   const pages = {};
   await Promise.all(
     Object.entries(context).map(async ([key, value]) => {
-      pages[key] = await value();
+      if (basePaths) {
+        const pageBasePath = key.split("/")[2];
+        if (pageBasePath && otherBasePaths.includes(pageBasePath))
+          return;
+      }
+      const getPageContent = value;
+      pages[key] = await getPageContent();
     })
   );
   const getPageState = (csrConfig) => {
@@ -69,13 +87,10 @@ const bootCsr = async (context, rootPath, entryPath = "/route") => {
       }
     });
   }
-  const pathname = window.location.pathname;
-  const initialPath = device.lang + entryPath;
-  window.document.body.style.overflow = "hidden";
   const getPathRoutes = (route, parentRootLayouts = [], parentLayouts = [], parentPaths = []) => {
     const parentPath = parentPaths.filter((path2) => path2 !== "/").join("");
     const currentPathSegment = /^\/\(.*\)$/.test(route.path) ? "" : route.path;
-    const isRoot = ["/", "/:lang"].includes(parentPath + currentPathSegment) && parentRootLayouts.length < 2;
+    const isRoot = baseLayoutPaths.includes(parentPath + currentPathSegment) && parentRootLayouts.length < 2;
     const path = parentPath + currentPathSegment;
     const pathSegments = [...parentPaths, ...currentPathSegment ? [currentPathSegment] : []];
     const RootLayouts = [...parentRootLayouts, ...isRoot && route.Layout ? [route.Layout] : []];
@@ -122,16 +137,11 @@ const bootCsr = async (context, rootPath, entryPath = "/route") => {
       /* @__PURE__ */ React.createElement(React.Fragment, null)
     ));
   };
-  if (pathname !== `/${initialPath}`) {
-    window.location.replace(initialPath);
-    return;
-  } else {
-    const el = document.getElementById("root");
-    if (!el)
-      throw new Error("No root element");
-    const root = ReactDOM.createRoot(el);
-    root.render(/* @__PURE__ */ React.createElement(RouterProvider, null));
-  }
+  const el = document.getElementById("root");
+  if (!el)
+    throw new Error("No root element");
+  const root = ReactDOM.createRoot(el);
+  root.render(/* @__PURE__ */ React.createElement(RouterProvider, null));
 };
 export {
   bootCsr

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/next",
-  "version": "0.0.149",
+  "version": "0.0.150",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"