@koine/next 2.0.0-beta.16 → 2.0.0-beta.18

package/12/AnalyticsGoogle.js

@@ -1,4 +1,5 @@
 "use client";
+import { __read } from "tslib";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { useRouter } from "next/router";
 import Script from "next/script";
@@ -8,8 +9,8 @@ export var AnalyticsGoogle = function (_a) {
     var id = _a.id;
     var uid = id || process.env["NEXT_PUBLIC_GTM_ID"];
     var _b = useRouter(), events = _b.events, asPath = _b.asPath, query = _b.query;
-    var _c = useState(false), ready = _c[0], setReady = _c[1];
-    var _d = useState(false), routed = _d[0], setRouted = _d[1];
+    var _c = __read(useState(false), 2), ready = _c[0], setReady = _c[1];
+    var _d = __read(useState(false), 2), routed = _d[0], setRouted = _d[1];
     useEffect(function () {
         var handleRouteChange = function () {
             setRouted(true);

package/12/NextProgress.js

@@ -1,11 +1,12 @@
 "use client";
+import { __read } from "tslib";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useRouter } from "next/router";
 import { useCallback, useEffect, useRef, useState } from "react";
 export var NextProgress = function (_a) {
     var _b = _a.startAt, startAt = _b === void 0 ? 0.3 : _b, _c = _a.showOnShallow, showOnShallow = _c === void 0 ? true : _c, _d = _a.stopDelayMs, stopDelayMs = _d === void 0 ? 200 : _d, _e = _a.Overlay, Overlay = _e === void 0 ? "div" : _e;
     var events = useRouter().events;
-    var _f = useState(false), running = _f[0], setRunning = _f[1];
+    var _f = __read(useState(false), 2), running = _f[0], setRunning = _f[1];
     var timer = useRef(null);
     var routeChangeStart = useCallback(function (_, _a) {
         var shallow = _a.shallow;

package/12/to.js

@@ -1,10 +1,11 @@
+import { __read } from "tslib";
 export function to() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
         args[_i] = arguments[_i];
     }
     var relative = "";
-    var t = args[0];
+    var _a = __read(args, 1), t = _a[0];
     if (args.length === 3) {
         if (args[2]) {
             relative = t(args[1], args[2]).replace("*", "");

package/12/useBackUrl.js

@@ -1,4 +1,5 @@
 "use client";
+import { __read } from "tslib";
 import { useRouter } from "next/router";
 import { useEffect, useRef, useState } from "react";
 import { createStorage } from "@koine/browser";
@@ -8,7 +9,7 @@ var back = createStorage({
 export function useBackUrl() {
     var asPath = useRouter().asPath;
     var calledOnce = useRef(false);
-    var _a = useState(), backUrl = _a[0], setBackUrl = _a[1];
+    var _a = __read(useState(), 2), backUrl = _a[0], setBackUrl = _a[1];
     useEffect(function () {
         if (calledOnce.current) {
             return;

package/12/useDateFormat.js

@@ -1,19 +1,19 @@
 "use client";
-import { __assign } from "tslib";
+import { __assign, __read, __spreadArray } from "tslib";
 import format from "date-fns/format";
 import { useRouter } from "next/router";
 import { useEffect, useState } from "react";
 import { useDateLocale } from "@koine/react";
 export var useDateFormat = function () {
-    var _a = useState(function () {
+    var _a = __read(useState(function () {
         return function () {
             var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {
                 args[_i] = arguments[_i];
             }
-            return format.apply(void 0, args);
+            return format.apply(void 0, __spreadArray([], __read(args), false));
         };
-    }), formatter = _a[0], setFormatter = _a[1];
+    }), 2), formatter = _a[0], setFormatter = _a[1];
     var router = useRouter();
     var locale = useDateLocale(router.locale);
     useEffect(function () {
@@ -25,7 +25,7 @@ export var useDateFormat = function () {
                     for (var _i = 0; _i < arguments.length; _i++) {
                         args[_i] = arguments[_i];
                     }
-                    return newFormatter_1.apply(void 0, args);
+                    return newFormatter_1.apply(void 0, __spreadArray([], __read(args), false));
                 };
             });
         }

package/12/useTo.js

@@ -1,5 +1,5 @@
 "use client";
-import { __spreadArray } from "tslib";
+import { __read, __spreadArray } from "tslib";
 import { to } from "./to.js";
 import { useT } from "./useT.js";
 export function useTo() {
@@ -9,7 +9,7 @@ export function useTo() {
         for (var _i = 0; _i < arguments.length; _i++) {
             args[_i] = arguments[_i];
         }
-        return to.apply(void 0, __spreadArray([t], args, false));
+        return to.apply(void 0, __spreadArray([t], __read(args), false));
     };
 }
 export default useTo;

package/ThemeProvider.js

@@ -1,5 +1,5 @@
 "use client";
-import { __spreadArray } from "tslib";
+import { __read, __spreadArray } from "tslib";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import NextScript from "next/script";
 import { memo, useCallback, useEffect, useState } from "react";
@@ -10,12 +10,12 @@ var MEDIA = "(prefers-color-scheme: dark)";
 var THEME_STORAGE_KEY = "theme";
 export var ThemeProvider = function (_a) {
     var forcedTheme = _a.forcedTheme, _b = _a.disableTransitionOnChange, disableTransitionOnChange = _b === void 0 ? false : _b, _c = _a.enableSystem, enableSystem = _c === void 0 ? true : _c, enableColorScheme = _a.enableColorScheme, _d = _a.themes, themes = _d === void 0 ? ["light", "dark"] : _d, _e = _a.defaultTheme, defaultTheme = _e === void 0 ? enableSystem ? "system" : "light" : _e, _f = _a.attribute, attribute = _f === void 0 ? "data-theme" : _f, value = _a.value, children = _a.children, nonce = _a.nonce;
-    var _g = useState(function () {
+    var _g = __read(useState(function () {
         return getTheme(THEME_STORAGE_KEY, defaultTheme);
-    }), theme = _g[0], setThemeState = _g[1];
-    var _h = useState(function () {
+    }), 2), theme = _g[0], setThemeState = _g[1];
+    var _h = __read(useState(function () {
         return getTheme(THEME_STORAGE_KEY);
-    }), resolvedTheme = _h[0], setResolvedTheme = _h[1];
+    }), 2), resolvedTheme = _h[0], setResolvedTheme = _h[1];
     var attrs = !value ? themes : Object.values(value);
     var applyTheme = useCallback(function (theme) {
         var _a;
@@ -29,7 +29,7 @@ export var ThemeProvider = function (_a) {
         var enable = disableTransitionOnChange ? disableAnimation() : null;
         var d = document.documentElement;
         if (attribute === "class") {
-            (_a = d.classList).remove.apply(_a, attrs);
+            (_a = d.classList).remove.apply(_a, __spreadArray([], __read(attrs), false));
             if (name)
                 d.classList.add(name);
         }
@@ -100,7 +100,7 @@ export var ThemeProvider = function (_a) {
             setTheme: setTheme,
             forcedTheme: forcedTheme,
             resolvedTheme: theme === "system" ? resolvedTheme : theme,
-            themes: enableSystem ? __spreadArray(__spreadArray([], themes, true), ["system"], false) : themes,
+            themes: enableSystem ? __spreadArray(__spreadArray([], __read(themes), false), ["system"], false) : themes,
             systemTheme: (enableSystem ? resolvedTheme : undefined),
         }, children: [_jsx(ThemeScript, { forcedTheme: forcedTheme, disableTransitionOnChange: disableTransitionOnChange, enableSystem: enableSystem, enableColorScheme: enableColorScheme, themes: themes, defaultTheme: defaultTheme, attribute: attribute, value: value, children: children, attrs: attrs, nonce: nonce }), children] }));
 };

package/config-i18n.d.ts

@@ -0,0 +1,52 @@
+import type { Redirect as _Redirect, Rewrite as _Rewrite } from "next/dist/lib/load-custom-routes";
+export type Redirect = Omit<_Redirect, "locale"> & {
+    locale?: boolean;
+};
+export type Rewrite = Omit<_Rewrite, "locale"> & {
+    locale?: boolean;
+};
+type Route = string | {
+    [key: string]: Route | string;
+};
+type RoutesByLocale = Record<string, Route>;
+export type Locale = string;
+export type Routes = Record<Locale, RoutesByLocale>;
+type RoutesMapRoute = {
+    template: string;
+    pathname: string;
+    wildcard?: boolean;
+};
+export declare function normaliseUrlPathname(pathname?: string): string;
+export declare function toPath(urlOrPathname?: string): string;
+export declare function encodePathname(pathname?: string): string;
+export declare function getRoutesOfDefaultLocale(routes: Routes | RoutesByLocale, defaultLocale?: Locale): RoutesByLocale;
+export type ConfigI18nOptions = {
+    locales: Locale[];
+    defaultLocale: Locale;
+    hideDefaultLocaleInUrl?: boolean;
+    localeParam?: string;
+};
+type Options = ConfigI18nOptions & {
+    routes: Routes;
+    debug?: boolean;
+    permanent?: boolean;
+};
+export declare function getPathRedirect(arg: Pick<GetRedirectsOptions, "localeParam" | "permanent"> & {
+    localeSource?: Locale;
+    localeDestination?: Locale;
+    route: RoutesMapRoute;
+    usePathnameAsSource?: boolean;
+}): Redirect | undefined;
+type GetRedirectsOptions = Options;
+export declare function getRedirects(arg: GetRedirectsOptions): Promise<Redirect[]>;
+export declare function getPathRewrite(arg: Pick<GetRewritesOptions, "localeParam"> & {
+    localeSource?: Locale;
+    localeDestination?: Locale;
+    route: RoutesMapRoute;
+}): {
+    source: string;
+    destination: string;
+} | undefined;
+type GetRewritesOptions = Options;
+export declare function getRewrites(arg: GetRewritesOptions): Promise<Rewrite[]>;
+export {};

package/config-i18n.js

@@ -0,0 +1,251 @@
+import { __assign, __awaiter, __generator } from "tslib";
+var arrayUniqueByProperties = function (array, keys) {
+    return array.filter(function (item, idx, arr) {
+        return arr.findIndex(function (itemWith) {
+            return keys.every(function (k) { return itemWith[k] === item[k]; });
+        }) === idx;
+    });
+};
+export function normaliseUrlPathname(pathname) {
+    if (pathname === void 0) { pathname = ""; }
+    return pathname.replace(/\/+\//g, "/").replace(/^\/*(.*?)\/*$/, "$1");
+}
+export function toPath(urlOrPathname) {
+    if (urlOrPathname === void 0) { urlOrPathname = ""; }
+    var pathname = "";
+    try {
+        var parsed = new URL(urlOrPathname);
+        pathname = parsed.pathname;
+    }
+    catch (e) {
+        pathname = urlOrPathname;
+    }
+    return pathname.replace(/\/+\//g, "/").replace(/^\/*(.*?)\/*$/, "$1");
+}
+export function encodePathname(pathname) {
+    if (pathname === void 0) { pathname = ""; }
+    var parts = normaliseUrlPathname(pathname).split("/");
+    return parts
+        .filter(function (part) { return !!part; })
+        .map(function (part) { return encodeURIComponent(part); })
+        .join("/");
+}
+function transformRoute(route) {
+    var rawPathname = route.pathname, rawTemplate = route.template;
+    var pathnameParts = rawPathname.split("/").filter(function (part) { return !!part; });
+    var templateParts = rawTemplate.split("/").filter(function (part) { return !!part; });
+    var mapPartsByIdx = {};
+    var pathname = pathnameParts
+        .map(function (part) {
+        var _a, _b;
+        var hasWildcard = part.endsWith("*");
+        part = part.replace("*", "");
+        var isDynamic = part.startsWith("{{") && part.endsWith("}}");
+        var asValue = isDynamic
+            ? (_b = (_a = part.match(/{{(.+)}}/)) === null || _a === void 0 ? void 0 : _a[1].trim()) !== null && _b !== void 0 ? _b : ""
+            : part.trim();
+        var asPath = encodeURIComponent(asValue) + (hasWildcard ? "*" : "");
+        mapPartsByIdx[asValue] = {
+            isDynamic: isDynamic,
+            hasWildcard: hasWildcard,
+        };
+        return isDynamic ? ":".concat(asPath) : asPath;
+    })
+        .join("/");
+    var template = templateParts
+        .map(function (part) {
+        var _a, _b, _c;
+        var isDynamic = part.startsWith("[") && part.endsWith("]");
+        var asValue = isDynamic
+            ? (_b = (_a = part.match(/\[(.+)\]/)) === null || _a === void 0 ? void 0 : _a[1].trim()) !== null && _b !== void 0 ? _b : ""
+            : part.trim();
+        var hasWildcard = (_c = mapPartsByIdx[asValue]) === null || _c === void 0 ? void 0 : _c.hasWildcard;
+        var asPath = encodeURIComponent(asValue) + (hasWildcard ? "*" : "");
+        return isDynamic ? ":".concat(asPath) : asPath;
+    })
+        .join("/");
+    return { pathname: pathname, template: template };
+}
+function getRoutesMap(map, routesByLocale, pathnameBuffer, templateBuffer) {
+    if (map === void 0) { map = {}; }
+    if (pathnameBuffer === void 0) { pathnameBuffer = ""; }
+    if (templateBuffer === void 0) { templateBuffer = ""; }
+    var isSpaRoute = Object.keys(routesByLocale).includes("[spa]");
+    for (var key in routesByLocale) {
+        var pathOrNestedRoutes = routesByLocale[key];
+        var template = "".concat(templateBuffer, "/").concat(key);
+        if (typeof pathOrNestedRoutes === "string") {
+            if (!isSpaRoute || (isSpaRoute && ["[spa]", "index"].includes(key))) {
+                map[template] = {
+                    template: template,
+                    pathname: pathOrNestedRoutes,
+                    wildcard: pathOrNestedRoutes.includes("*"),
+                };
+            }
+        }
+        else {
+            if (!isSpaRoute) {
+                getRoutesMap(map, pathOrNestedRoutes, pathnameBuffer, template);
+            }
+        }
+    }
+    return map;
+}
+function getWithoutIndex(template) {
+    return template.replace(/\/index$/, "");
+}
+export function getRoutesOfDefaultLocale(routes, defaultLocale) {
+    var routesByLocale = routes;
+    if (defaultLocale &&
+        routesByLocale[defaultLocale]) {
+        return routesByLocale[defaultLocale];
+    }
+    if (Object.keys(routes).length === 1) {
+        var routesWithOneLocale = routes;
+        var output = {};
+        for (var onlyLocale in routesWithOneLocale) {
+            output =
+                routesWithOneLocale[onlyLocale];
+        }
+        return output;
+    }
+    return routes;
+}
+export function getPathRedirect(arg) {
+    var localeSource = arg.localeSource, localeDestination = arg.localeDestination, route = arg.route, usePathnameAsSource = arg.usePathnameAsSource, permanent = arg.permanent;
+    var _a = transformRoute(route), routeTemplate = _a.template, pathname = _a.pathname;
+    var template = usePathnameAsSource ? pathname : routeTemplate;
+    var sourcePrefix = localeSource ? "".concat(localeSource, "/") : "";
+    var source = getWithoutIndex("/".concat(normaliseUrlPathname(sourcePrefix + template)));
+    var destinationPrefix = localeDestination ? "".concat(localeDestination, "/") : "";
+    var destination = "/".concat(normaliseUrlPathname(destinationPrefix + pathname));
+    if (source === destination)
+        return;
+    var redirect = {
+        source: source,
+        destination: destination,
+        permanent: Boolean(permanent),
+    };
+    return redirect;
+}
+export function getRedirects(arg) {
+    return __awaiter(this, void 0, void 0, function () {
+        var routes, defaultLocale, hideDefaultLocaleInUrl, localeParam, permanent, debug, redirects, locale, routesByLocale, routesMap, template, route, isVisibleDefaultLocale, isHiddenDefaultLocale, cleaned;
+        return __generator(this, function (_a) {
+            routes = arg.routes, defaultLocale = arg.defaultLocale, hideDefaultLocaleInUrl = arg.hideDefaultLocaleInUrl, localeParam = arg.localeParam, permanent = arg.permanent, debug = arg.debug;
+            redirects = [];
+            for (locale in routes) {
+                routesByLocale = routes[locale];
+                routesMap = getRoutesMap({}, routesByLocale);
+                for (template in routesMap) {
+                    route = routesMap[template];
+                    if (route.pathname !== getWithoutIndex(template)) {
+                        isVisibleDefaultLocale = locale === defaultLocale && !hideDefaultLocaleInUrl;
+                        isHiddenDefaultLocale = locale === defaultLocale && hideDefaultLocaleInUrl;
+                        if (localeParam) {
+                            if (isVisibleDefaultLocale) {
+                                redirects.push(getPathRedirect({ localeDestination: locale, route: route, permanent: permanent }));
+                            }
+                            else if (isHiddenDefaultLocale) {
+                                redirects.push(getPathRedirect({ localeSource: locale, route: route, permanent: permanent }));
+                            }
+                            else if (locale !== defaultLocale) {
+                                redirects.push(getPathRedirect({
+                                    localeSource: locale,
+                                    localeDestination: locale,
+                                    route: route,
+                                    permanent: permanent,
+                                }));
+                            }
+                            else {
+                                redirects.push(getPathRedirect({ route: route, permanent: permanent }));
+                            }
+                        }
+                        else {
+                            if (isVisibleDefaultLocale) {
+                                redirects.push(getPathRedirect({ localeDestination: locale, route: route, permanent: permanent }));
+                            }
+                            else if (locale !== defaultLocale) {
+                                redirects.push(getPathRedirect({
+                                    localeSource: locale,
+                                    localeDestination: locale,
+                                    route: route,
+                                    permanent: permanent,
+                                }));
+                            }
+                            else {
+                                redirects.push(getPathRedirect({ route: route, permanent: permanent }));
+                            }
+                        }
+                    }
+                }
+            }
+            cleaned = arrayUniqueByProperties(redirects.filter(Boolean), ["source", "destination"]).map(function (rewrite) { return (localeParam ? rewrite : __assign(__assign({}, rewrite), { locale: false })); });
+            if (debug)
+                console.info("[@koine/next/config:getRedirects]", cleaned);
+            return [2, cleaned];
+        });
+    });
+}
+export function getPathRewrite(arg) {
+    var localeSource = arg.localeSource, localeDestination = arg.localeDestination, localeParam = arg.localeParam, route = arg.route;
+    var _a = transformRoute(route), pathname = _a.pathname, template = _a.template;
+    var sourcePrefix = "";
+    if (localeSource)
+        sourcePrefix = "".concat(localeSource, "/");
+    else if (localeParam)
+        sourcePrefix = ":".concat(localeParam, "/");
+    var source = "/".concat(normaliseUrlPathname(sourcePrefix + pathname));
+    var destinationPrefix = "";
+    if (localeDestination)
+        destinationPrefix = "".concat(localeDestination, "/");
+    else if (localeParam)
+        destinationPrefix = ":".concat(localeParam, "/");
+    var destination = getWithoutIndex("/".concat(normaliseUrlPathname(destinationPrefix + template)));
+    if (source === destination)
+        return;
+    return {
+        source: source,
+        destination: destination,
+    };
+}
+export function getRewrites(arg) {
+    return __awaiter(this, void 0, void 0, function () {
+        var routes, defaultLocale, hideDefaultLocaleInUrl, localeParam, debug, rewrites, locale, routesByLocale, routesMap, template, route, isVisibleDefaultLocale, isHiddenDefaultLocale, cleaned;
+        return __generator(this, function (_a) {
+            routes = arg.routes, defaultLocale = arg.defaultLocale, hideDefaultLocaleInUrl = arg.hideDefaultLocaleInUrl, localeParam = arg.localeParam, debug = arg.debug;
+            rewrites = [];
+            for (locale in routes) {
+                routesByLocale = routes[locale];
+                routesMap = getRoutesMap({}, routesByLocale);
+                for (template in routesMap) {
+                    route = routesMap[template];
+                    isVisibleDefaultLocale = locale === defaultLocale && !hideDefaultLocaleInUrl;
+                    isHiddenDefaultLocale = locale === defaultLocale && hideDefaultLocaleInUrl;
+                    if (localeParam) {
+                        if (isHiddenDefaultLocale) {
+                            rewrites.push(getPathRewrite({ localeDestination: locale, route: route }));
+                        }
+                        else {
+                            rewrites.push(getPathRewrite({ localeParam: localeParam, route: route }));
+                        }
+                    }
+                    else {
+                        if (route.pathname !== getWithoutIndex(template)) {
+                            if (locale !== defaultLocale || isVisibleDefaultLocale) {
+                                rewrites.push(getPathRewrite({ localeSource: locale, route: route }));
+                            }
+                            else {
+                                rewrites.push(getPathRewrite({ route: route }));
+                            }
+                        }
+                    }
+                }
+            }
+            cleaned = arrayUniqueByProperties(rewrites.filter(Boolean), ["source", "destination"]);
+            if (debug)
+                console.info("[@koine/next/config:getRewrites]", cleaned);
+            return [2, cleaned];
+        });
+    });
+}

package/config.d.ts

@@ -1,30 +1,6 @@
 import type { NextConfig } from "next";
-import type { Redirect, Rewrite } from "next/dist/lib/load-custom-routes";
-type Route = string | {
-    [key: string]: Route | string;
-};
-type Routes = Record<string, Route>;
-type RoutesMapRoute = {
-    template: string;
-    pathname: string;
-    wildcard?: boolean;
-};
-export declare function normaliseUrlPathname(pathname?: string): string;
-export declare function toPath(urlOrPathname?: string): string;
-export declare function encodePathname(pathname?: string): string;
-export declare function getPathRewrite(route: RoutesMapRoute): {
-    source: string;
-    destination: string;
-};
-export declare function getPathRedirect(locale: string | undefined, route: RoutesMapRoute, permanent?: boolean): {
-    source: string;
-    destination: string;
-    permanent: boolean;
-    locale: false;
-};
-export declare function getRedirects(defaultLocale: string, routes: Routes, permanent?: boolean, debug?: boolean): Promise<Redirect[]>;
-export declare function getRewrites(routes: Routes, debug?: boolean): Promise<Rewrite[]>;
-type KoineNextConfig = {
+import { type ConfigI18nOptions, type Routes } from "./config-i18n.js";
+interface KoineNextConfig {
     nx?: boolean;
     svg?: boolean;
     sc?: boolean;
@@ -32,6 +8,102 @@ type KoineNextConfig = {
     routes?: Routes;
     permanent?: boolean;
     debug?: boolean;
+    i18n: ConfigI18nOptions & {
+        loader?: any;
+    };
+}
+interface MergedConfig extends KoineNextConfig, Omit<NextConfig, "i18n"> {
+}
+export declare function withKoine({ nx, svg, sc, page, routes, permanent, debug, ...custom }?: MergedConfig): NextConfig | {
+    redirects(): Promise<import("./config-i18n.js").Redirect[]>;
+    rewrites(): Promise<{
+        beforeFiles: import("./config-i18n.js").Rewrite[];
+        afterFiles: import("next/dist/lib/load-custom-routes.js").Rewrite[];
+        fallback: import("next/dist/lib/load-custom-routes.js").Rewrite[];
+    }>;
+    exportPathMap?: ((defaultMap: import("next/dist/server/config-shared.js").ExportPathMap, ctx: {
+        dev: boolean;
+        dir: string;
+        outDir: string | null;
+        distDir: string;
+        buildId: string;
+    }) => import("next/dist/server/config-shared.js").ExportPathMap | Promise<import("next/dist/server/config-shared.js").ExportPathMap>) | undefined;
+    i18n?: import("next/dist/server/config-shared.js").I18NConfig | null | undefined;
+    eslint?: import("next/dist/server/config-shared.js").ESLintConfig | undefined;
+    typescript?: import("next/dist/server/config-shared.js").TypeScriptConfig | undefined;
+    headers?: (() => Promise<import("next/dist/lib/load-custom-routes.js").Header[]>) | undefined;
+    excludeDefaultMomentLocales?: boolean | undefined;
+    webpack?: import("next/dist/server/config-shared.js").NextJsWebpackConfig | null | undefined;
+    trailingSlash?: boolean | undefined;
+    env?: Record<string, string> | undefined;
+    distDir?: string | undefined;
+    cleanDistDir?: boolean | undefined;
+    assetPrefix?: string | undefined;
+    useFileSystemPublicRoutes?: boolean | undefined;
+    generateBuildId?: (() => string | Promise<string | null> | null) | undefined;
+    generateEtags?: boolean | undefined;
+    pageExtensions?: string[] | undefined;
+    compress?: boolean | undefined;
+    analyticsId?: string | undefined;
+    poweredByHeader?: boolean | undefined;
+    images?: Partial<import("next/dist/shared/lib/image-config.js").ImageConfigComplete> | undefined;
+    devIndicators?: {
+        buildActivity?: boolean | undefined;
+        buildActivityPosition?: "bottom-right" | "bottom-left" | "top-right" | "top-left" | undefined;
+    } | undefined;
+    onDemandEntries?: {
+        maxInactiveAge?: number | undefined;
+        pagesBufferLength?: number | undefined;
+    } | undefined;
+    amp?: {
+        canonicalBase?: string | undefined;
+    } | undefined;
+    basePath?: string | undefined;
+    sassOptions?: {
+        [key: string]: any;
+    } | undefined;
+    productionBrowserSourceMaps?: boolean | undefined;
+    optimizeFonts?: boolean | undefined;
+    reactProductionProfiling?: boolean | undefined;
+    reactStrictMode?: boolean | null | undefined;
+    publicRuntimeConfig?: {
+        [key: string]: any;
+    } | undefined;
+    serverRuntimeConfig?: {
+        [key: string]: any;
+    } | undefined;
+    httpAgentOptions?: {
+        keepAlive?: boolean | undefined;
+    } | undefined;
+    outputFileTracing?: boolean | undefined;
+    staticPageGenerationTimeout?: number | undefined;
+    crossOrigin?: false | "anonymous" | "use-credentials" | undefined;
+    swcMinify?: boolean | undefined;
+    compiler?: {
+        reactRemoveProperties?: boolean | {
+            properties?: string[] | undefined;
+        } | undefined;
+        relay?: {
+            src: string;
+            artifactDirectory?: string | undefined;
+            language?: "typescript" | "flow" | "javascript" | undefined;
+            eagerEsModules?: boolean | undefined;
+        } | undefined;
+        removeConsole?: boolean | {
+            exclude?: string[] | undefined;
+        } | undefined;
+        styledComponents?: boolean | import("next/dist/server/config-shared.js").StyledComponentsConfig | undefined;
+        emotion?: boolean | import("next/dist/server/config-shared.js").EmotionConfig | undefined;
+    } | undefined;
+    output?: "standalone" | "export" | undefined;
+    transpilePackages?: string[] | undefined;
+    skipMiddlewareUrlNormalize?: boolean | undefined;
+    skipTrailingSlashRedirect?: boolean | undefined;
+    modularizeImports?: Record<string, {
+        transform: string | Record<string, string>;
+        preventFullImport?: boolean | undefined;
+        skipDefaultConversion?: boolean | undefined;
+    }> | undefined;
+    experimental?: import("next/dist/server/config-shared.js").ExperimentalConfig | undefined;
 };
-export declare function withKoine({ nx, svg, sc, page, routes, permanent, debug, ...custom }?: NextConfig & KoineNextConfig): NextConfig;
 export default withKoine;

package/config.js

@@ -1,150 +1,14 @@
-import { __assign, __awaiter, __generator, __rest, __spreadArray } from "tslib";
-export function normaliseUrlPathname(pathname) {
-    if (pathname === void 0) { pathname = ""; }
-    return pathname.replace(/\/+\//g, "/").replace(/^\/*(.*?)\/*$/, "$1");
-}
-export function toPath(urlOrPathname) {
-    if (urlOrPathname === void 0) { urlOrPathname = ""; }
-    var pathname = "";
-    try {
-        var parsed = new URL(urlOrPathname);
-        pathname = parsed.pathname;
-    }
-    catch (e) {
-        pathname = urlOrPathname;
-    }
-    return pathname.replace(/\/+\//g, "/").replace(/^\/*(.*?)\/*$/, "$1");
-}
-export function encodePathname(pathname) {
-    if (pathname === void 0) { pathname = ""; }
-    var parts = normaliseUrlPathname(pathname).split("/");
-    return parts
-        .filter(function (part) { return !!part; })
-        .map(function (part) { return encodeURIComponent(part); })
-        .join("/");
-}
-function transformRoute(route) {
-    var rawPathname = route.pathname, rawTemplate = route.template;
-    var pathnameParts = rawPathname.split("/").filter(function (part) { return !!part; });
-    var templateParts = rawTemplate.split("/").filter(function (part) { return !!part; });
-    var mapPartsByIdx = {};
-    var pathname = pathnameParts
-        .map(function (part) {
-        var _a, _b;
-        var hasWildcard = part.endsWith("*");
-        part = part.replace("*", "");
-        var isDynamic = part.startsWith("{{") && part.endsWith("}}");
-        var asValue = isDynamic
-            ? (_b = (_a = part.match(/{{(.+)}}/)) === null || _a === void 0 ? void 0 : _a[1].trim()) !== null && _b !== void 0 ? _b : ""
-            : part.trim();
-        var asPath = encodeURIComponent(asValue) + (hasWildcard ? "*" : "");
-        mapPartsByIdx[asValue] = {
-            isDynamic: isDynamic,
-            hasWildcard: hasWildcard,
-        };
-        return isDynamic ? ":".concat(asPath) : asPath;
-    })
-        .join("/");
-    var template = templateParts
-        .map(function (part) {
-        var _a, _b, _c;
-        var isDynamic = part.startsWith("[") && part.endsWith("]");
-        var asValue = isDynamic
-            ? (_b = (_a = part.match(/\[(.+)\]/)) === null || _a === void 0 ? void 0 : _a[1].trim()) !== null && _b !== void 0 ? _b : ""
-            : part.trim();
-        var hasWildcard = (_c = mapPartsByIdx[asValue]) === null || _c === void 0 ? void 0 : _c.hasWildcard;
-        var asPath = encodeURIComponent(asValue) + (hasWildcard ? "*" : "");
-        return isDynamic ? ":".concat(asPath) : asPath;
-    })
-        .join("/");
-    return { pathname: pathname, template: template };
-}
-function getRoutesMap(map, routes, pathnameBuffer, templateBuffer) {
-    if (map === void 0) { map = {}; }
-    if (pathnameBuffer === void 0) { pathnameBuffer = ""; }
-    if (templateBuffer === void 0) { templateBuffer = ""; }
-    for (var key in routes) {
-        var pathOrNestedRoutes = routes[key];
-        var template = "".concat(templateBuffer, "/").concat(key);
-        if (typeof pathOrNestedRoutes === "string") {
-            map[template] = {
-                template: template,
-                pathname: pathOrNestedRoutes,
-                wildcard: pathOrNestedRoutes.includes("*"),
-            };
-        }
-        else {
-            getRoutesMap(map, pathOrNestedRoutes, pathnameBuffer, template);
-        }
-    }
-    return map;
-}
-function getWithoutIndex(template) {
-    return template.replace(/\/index$/, "");
-}
-export function getPathRewrite(route) {
-    var _a = transformRoute(route), pathname = _a.pathname, template = _a.template;
-    var source = "/".concat(normaliseUrlPathname(pathname));
-    var destination = "/".concat(normaliseUrlPathname(template));
-    return {
-        source: source,
-        destination: getWithoutIndex(destination),
-    };
-}
-export function getPathRedirect(locale, route, permanent) {
-    if (locale === void 0) { locale = ""; }
-    var _a = transformRoute(route), template = _a.template, pathname = _a.pathname;
-    var source = "/".concat(normaliseUrlPathname((locale ? "/".concat(locale, "/") : "/") + template));
-    var destination = "/".concat(normaliseUrlPathname(pathname));
-    return {
-        source: getWithoutIndex(source),
-        destination: destination,
-        permanent: Boolean(permanent),
-        locale: false,
-    };
-}
-export function getRedirects(defaultLocale, routes, permanent, debug) {
-    return __awaiter(this, void 0, void 0, function () {
-        var redirects, routesMap;
-        return __generator(this, function (_a) {
-            redirects = [];
-            routesMap = getRoutesMap({}, routes);
-            Object.keys(routesMap).forEach(function (template) {
-                var route = routesMap[template];
-                if (route.pathname !== getWithoutIndex(template)) {
-                    redirects.push(getPathRedirect("", route, permanent));
-                }
-            });
-            if (debug)
-                console.info("[@koine/next/config:getRedirects]", redirects);
-            return [2, redirects];
-        });
-    });
-}
-export function getRewrites(routes, debug) {
-    return __awaiter(this, void 0, void 0, function () {
-        var rewrites, routesMap;
-        return __generator(this, function (_a) {
-            rewrites = [];
-            routesMap = getRoutesMap({}, routes);
-            Object.keys(routesMap).forEach(function (template) {
-                var route = routesMap[template];
-                if (route.pathname !== getWithoutIndex(template)) {
-                    rewrites.push(getPathRewrite(route));
-                }
-            });
-            if (debug)
-                console.info("[@koine/next/config:getRewrites]", rewrites);
-            return [2, rewrites];
-        });
-    });
-}
+import { __assign, __awaiter, __generator, __read, __rest, __spreadArray } from "tslib";
+import { getRedirects, getRewrites, } from "./config-i18n.js";
 export function withKoine(_a) {
-    var _b;
     if (_a === void 0) { _a = {
-        i18n: { locales: ["en"], defaultLocale: "en" },
+        i18n: {
+            locales: ["en"],
+            defaultLocale: "en",
+            hideDefaultLocaleInUrl: false,
+        },
     }; }
-    var _c = _a.nx, nx = _c === void 0 ? true : _c, _d = _a.svg, svg = _d === void 0 ? true : _d, _e = _a.sc, sc = _e === void 0 ? true : _e, page = _a.page, routes = _a.routes, permanent = _a.permanent, debug = _a.debug, custom = __rest(_a, ["nx", "svg", "sc", "page", "routes", "permanent", "debug"]);
+    var _b = _a.nx, nx = _b === void 0 ? true : _b, _c = _a.svg, svg = _c === void 0 ? true : _c, _d = _a.sc, sc = _d === void 0 ? true : _d, page = _a.page, routes = _a.routes, permanent = _a.permanent, debug = _a.debug, custom = __rest(_a, ["nx", "svg", "sc", "page", "routes", "permanent", "debug"]);
     var nextConfig = __assign({ pageExtensions: page ? ["page.tsx", "page.ts"] : undefined, eslint: {
             ignoreDuringBuilds: true,
         }, typescript: {
@@ -192,21 +56,29 @@ export function withKoine(_a) {
             styledComponents: true,
         };
     }
+    if (custom.i18n) {
+        var _e = custom.i18n || {}, hideDefaultLocaleInUrl = _e.hideDefaultLocaleInUrl, localeParam = _e.localeParam, loader = _e.loader, nextI18nConfig = __rest(_e, ["hideDefaultLocaleInUrl", "localeParam", "loader"]);
+        if (localeParam) {
+            delete nextConfig.i18n;
+        }
+        else {
+            nextConfig.i18n = nextI18nConfig;
+        }
+    }
     if (routes) {
-        var defaultLocale_1 = (_b = nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig.i18n) === null || _b === void 0 ? void 0 : _b.defaultLocale;
         return __assign(__assign({}, nextConfig), { redirects: function () {
                 return __awaiter(this, void 0, void 0, function () {
                     var defaults, customs;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
-                            case 0: return [4, getRedirects(defaultLocale_1, routes, permanent, debug)];
+                            case 0: return [4, getRedirects(__assign({ routes: routes, permanent: permanent, debug: debug }, custom.i18n))];
                             case 1:
                                 defaults = _a.sent();
                                 if (!nextConfig.redirects) return [3, 3];
                                 return [4, nextConfig.redirects()];
                             case 2:
                                 customs = _a.sent();
-                                return [2, __spreadArray(__spreadArray([], defaults, true), customs, true)];
+                                return [2, __spreadArray(__spreadArray([], __read(defaults), false), __read(customs), false)];
                             case 3: return [2, defaults];
                         }
                     });
@@ -216,7 +88,7 @@ export function withKoine(_a) {
                     var defaults, customs;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
-                            case 0: return [4, getRewrites(routes, debug)];
+                            case 0: return [4, getRewrites(__assign({ routes: routes, debug: debug }, custom.i18n))];
                             case 1:
                                 defaults = _a.sent();
                                 if (!nextConfig.rewrites) return [3, 3];
@@ -230,7 +102,7 @@ export function withKoine(_a) {
                                             fallback: [],
                                         }];
                                 }
-                                return [2, __assign(__assign({}, customs), { beforeFiles: __spreadArray(__spreadArray([], defaults, true), (customs.beforeFiles || []), true) })];
+                                return [2, __assign(__assign({}, customs), { beforeFiles: __spreadArray(__spreadArray([], __read(defaults), false), __read((customs.beforeFiles || [])), false) })];
                             case 3: return [2, {
                                     afterFiles: [],
                                     beforeFiles: defaults,

package/package.json

@@ -2,9 +2,9 @@
   "name": "@koine/next",
   "sideEffects": false,
   "dependencies": {
-    "@koine/browser": "2.0.0-beta.16",
-    "@koine/react": "2.0.0-beta.16",
-    "@koine/utils": "2.0.0-beta.16"
+    "@koine/browser": "2.0.0-beta.18",
+    "@koine/react": "2.0.0-beta.18",
+    "@koine/utils": "2.0.0-beta.18"
   },
   "peerDependenciesMeta": {
     "@hookform/resolvers": {
@@ -201,6 +201,9 @@
     "./ThemeProvider": {
       "import": "./ThemeProvider.js"
     },
+    "./config-i18n": {
+      "import": "./config-i18n.js"
+    },
     "./config": {
       "import": "./config.js"
     },
@@ -215,5 +218,5 @@
     }
   },
   "peerDependencies": {},
-  "version": "2.0.0-beta.16"
+  "version": "2.0.0-beta.18"
 }