@koine/next 2.0.0-beta.26 → 2.0.0-beta.28

package/12/DynamicNamespaces.d.ts

@@ -1,6 +1,6 @@
+import type { TranslateNamespace } from "@koine/i18n";
 import type { DynamicNamespacesProps as BaseDynamicNamespacesProps } from "next-translate";
 import BaseDynamicNamespaces from "next-translate/DynamicNamespaces";
-import type { TranslateNamespace } from "./types-i18n.js";
 export type DynamicNamespacesProps = Omit<BaseDynamicNamespacesProps, "namespaces"> & {
     namespaces: TranslateNamespace[];
 };

package/12/T.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
+import type { TranslateNamespace, TranslationsAllPaths, TranslationsPaths } from "@koine/i18n";
 import type { TransProps } from "next-translate";
-import type { TranslateNamespace, TranslationsAllPaths, TranslationsPaths } from "./types-i18n.js";
 export type TProps<TNamespace extends TranslateNamespace | undefined = undefined> = (Omit<TransProps, "i18nKey" | "ns"> & {
     i18nKey: TranslationsAllPaths;
 }) | (Omit<TransProps, "i18nKey" | "ns"> & {

package/12/createUseLocale.d.ts

@@ -0,0 +1,2 @@
+export declare const createUseLocale: <TLocales extends string[] | readonly string[]>(_locales: TLocales, defaultLocale: TLocales[number]) => () => TLocales[number];
+export default createUseLocale;

package/12/createUseLocale.js

@@ -0,0 +1,7 @@
+import { useRouter } from "next/router";
+export var createUseLocale = function (_locales, defaultLocale) {
+    return function () {
+        return useRouter().locale || defaultLocale;
+    };
+};
+export default createUseLocale;

package/12/createUseTo.d.ts

@@ -0,0 +1,3 @@
+import { type ToRoute, type ToRouteDynamic, type ToRouteDynamicParams, type ToRouteStatic } from "@koine/i18n";
+export declare const createUseTo: <TLocales extends string[] | readonly string[]>(useLocaleHook: () => TLocales[number], _locales: TLocales, defaultLocale: TLocales[number], hideDefaultLocaleInUrl?: boolean) => () => <TRoute extends ToRoute>(...args: TRoute extends ToRouteDynamic ? [routeId: TRoute, routeParams: ToRouteDynamicParams<TRoute>] : TRoute extends ToRouteStatic ? [routeId: ToRouteStatic] : never) => string;
+export default createUseTo;

package/12/createUseTo.js

@@ -0,0 +1,22 @@
+"use client";
+import { __read } from "tslib";
+import { createTo, } from "@koine/i18n";
+import { useT } from "./useT.js";
+export var createUseTo = function (useLocaleHook, _locales, defaultLocale, hideDefaultLocaleInUrl) {
+    return function () {
+        var t = useT("~");
+        var locale = useLocaleHook();
+        var _to = createTo(_locales, defaultLocale, hideDefaultLocaleInUrl);
+        return function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            var _a = __read(args, 2), routeId = _a[0], routeParams = _a[1];
+            return routeParams
+                ? _to(locale, t, routeId, routeParams)
+                : _to(locale, t, routeId);
+        };
+    };
+};
+export default createUseTo;

package/12/getT.d.ts

@@ -1,4 +1,4 @@
-import type { Translate, TranslateNamespace } from "./types-i18n.js";
+import type { Translate, TranslateNamespace } from "@koine/i18n";
 export type GetT = <TNamespace extends TranslateNamespace | undefined = undefined>(locale?: string, namespace?: TNamespace) => Promise<Translate<TNamespace>>;
 export declare const getT: GetT;
 export default getT;

package/12/translationAsOptions.d.ts

@@ -1,4 +1,4 @@
+import type { TranslateLoose } from "@koine/i18n";
 import type { Option } from "@koine/react/types";
-import type { TranslateLoose } from "./types-i18n.js";
 export declare function translationAsOptions(t: TranslateLoose, i18nKey: string): Option[];
 export default translationAsOptions;

package/12/types.d.ts

@@ -1,7 +1,4 @@
-export * from "./types-i18n.js";
-export * from "./types-seo.js";
 export type { TProps } from "./T.js";
 export type { GetT } from "./getT.js";
 export type { DynamicNamespacesProps } from "./DynamicNamespaces.js";
 export type { SeoDefaultsProps } from "./SeoDefaults.js";
-export type { ToTranslate, ToStaticRoute, ToDynamicRoute, ToArgs } from "./to.js";

package/12/types.js

@@ -1,2 +1 @@
-export * from "./types-i18n.js";
-export * from "./types-seo.js";
+export {};

package/12/useT.d.ts

@@ -1,4 +1,4 @@
-import type { TranslateDefault, TranslateNamespace, TranslateNamespaced } from "./types-i18n.js";
+import type { TranslateDefault, TranslateNamespace, TranslateNamespaced } from "@koine/i18n";
 export declare function useT(): TranslateDefault;
 export declare function useT<TNamespace extends TranslateNamespace>(namespace: TNamespace): TranslateNamespaced<TNamespace>;
 export default useT;

package/config-i18n.d.ts

@@ -16,6 +16,9 @@ type RoutesMapRoute = {
     pathname: string;
     wildcard?: boolean;
 };
+export declare function orderRoutes(routes: Routes, defaultLocale: Locale): {
+    [x: string]: RoutesByLocale;
+};
 export declare function normaliseUrlPathname(pathname?: string): string;
 export declare function toPath(urlOrPathname?: string): string;
 export declare function encodePathname(pathname?: string): string;

package/config-i18n.js

@@ -1,4 +1,4 @@
-import { __assign, __awaiter, __generator } from "tslib";
+import { __assign, __awaiter, __generator, __rest } from "tslib";
 var arrayUniqueByProperties = function (array, keys) {
     return array.filter(function (item, idx, arr) {
         return arr.findIndex(function (itemWith) {
@@ -6,6 +6,11 @@ var arrayUniqueByProperties = function (array, keys) {
         }) === idx;
     });
 };
+export function orderRoutes(routes, defaultLocale) {
+    var _a;
+    var _b = routes, _c = defaultLocale, routesForDefaultLocale = _b[_c], restRoutes = __rest(_b, [typeof _c === "symbol" ? _c : _c + ""]);
+    return __assign((_a = {}, _a[defaultLocale] = routesForDefaultLocale, _a), restRoutes);
+}
 export function normaliseUrlPathname(pathname) {
     if (pathname === void 0) { pathname = ""; }
     return pathname.replace(/\/+\//g, "/").replace(/^\/*(.*?)\/*$/, "$1");
@@ -130,11 +135,12 @@ export function getPathRedirect(arg) {
 }
 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;
+        var routes, defaultLocale, hideDefaultLocaleInUrl, localeParam, permanent, debug, orderedRoutes, 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;
+            orderedRoutes = orderRoutes(routes, defaultLocale);
             redirects = [];
-            for (locale in routes) {
+            for (locale in orderedRoutes) {
                 routesByLocale = routes[locale];
                 routesMap = getRoutesMap({}, routesByLocale);
                 for (template in routesMap) {
@@ -211,11 +217,12 @@ export function getPathRewrite(arg) {
 }
 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;
+        var routes, defaultLocale, hideDefaultLocaleInUrl, localeParam, debug, orderedRoutes, 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;
+            orderedRoutes = orderRoutes(routes, defaultLocale);
             rewrites = [];
-            for (locale in routes) {
+            for (locale in orderedRoutes) {
                 routesByLocale = routes[locale];
                 routesMap = getRoutesMap({}, routesByLocale);
                 for (template in routesMap) {

package/config.d.ts

@@ -3,8 +3,6 @@ import { type ConfigI18nOptions, type Routes } from "./config-i18n.js";
 interface KoineNextConfig {
     nx?: boolean;
     svg?: boolean;
-    sc?: boolean;
-    page?: boolean;
     routes?: Routes;
     permanent?: boolean;
     debug?: boolean;
@@ -14,7 +12,7 @@ interface KoineNextConfig {
 }
 interface MergedConfig extends KoineNextConfig, Omit<NextConfig, "i18n"> {
 }
-export declare function withKoine({ nx, svg, sc, page, routes, permanent, debug, ...custom }?: MergedConfig): NextConfig | {
+export declare function withKoine({ nx, svg, page, routes, permanent, debug, ...custom }?: MergedConfig): NextConfig | {
     redirects(): Promise<import("./config-i18n.js").Redirect[]>;
     rewrites(): Promise<{
         beforeFiles: import("./config-i18n.js").Rewrite[];

package/config.js

@@ -8,14 +8,14 @@ export function withKoine(_a) {
             hideDefaultLocaleInUrl: false,
         },
     }; }
-    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: {
+    var _b = _a.nx, nx = _b === void 0 ? true : _b, _c = _a.svg, svg = _c === void 0 ? true : _c, page = _a.page, routes = _a.routes, permanent = _a.permanent, debug = _a.debug, custom = __rest(_a, ["nx", "svg", "page", "routes", "permanent", "debug"]);
+    var nextConfig = __assign({ eslint: {
             ignoreDuringBuilds: true,
         }, typescript: {
             ignoreBuildErrors: true,
-        }, poweredByHeader: false, swcMinify: true, modularizeImports: __assign({ "@koine/api": { transform: "@koine/api/{{member}}" }, "@koine/browser": { transform: "@koine/browser/{{member}}" }, "@koine/dom": { transform: "@koine/dom/{{member}}" }, "@koine/next/?(((\\w*)?/?)*)": {
+        }, poweredByHeader: false, modularizeImports: __assign({ "@koine/api": { transform: "@koine/api/{{member}}" }, "@koine/browser": { transform: "@koine/browser/{{member}}" }, "@koine/dom": { transform: "@koine/dom/{{member}}" }, "@koine/i18n": { transform: "@koine/i18n/{{member}}" }, "@koine/next/?(((\\w*)?/?)*)": {
                 transform: "@koine/next/{{ matches.[1] }}/{{member}}",
-            }, "@koine/react/?(((\\w*)?/?)*)": {
+            }, "@koine/node": { transform: "@koine/node/{{member}}" }, "@koine/react/?(((\\w*)?/?)*)": {
                 transform: "@koine/react/{{ matches.[1] }}/{{member}}",
             }, "@koine/utils": { transform: "@koine/utils/{{member}}" } }, (custom["modularizeImports"] || {})), experimental: __assign({ scrollRestoration: true }, (custom["experimental"] || {})) }, custom);
     if (svg) {
@@ -25,6 +25,7 @@ export function withKoine(_a) {
             };
         }
         else {
+            delete nextConfig["nx"];
             nextConfig.webpack = function (_config, options) {
                 var webpackConfig = typeof nextConfig.webpack === "function"
                     ? nextConfig.webpack(_config, options)
@@ -51,18 +52,13 @@ export function withKoine(_a) {
             };
         }
     }
-    if (sc) {
-        nextConfig.compiler = {
-            styledComponents: true,
-        };
-    }
     if (custom.i18n) {
-        var _e = custom.i18n || {}, hideDefaultLocaleInUrl = _e.hideDefaultLocaleInUrl, localeParam = _e.localeParam, loader = _e.loader, nextI18nConfig = __rest(_e, ["hideDefaultLocaleInUrl", "localeParam", "loader"]);
+        var _d = custom.i18n, locales = _d.locales, defaultLocale = _d.defaultLocale, localeParam = _d.localeParam;
         if (localeParam) {
             delete nextConfig.i18n;
         }
         else {
-            nextConfig.i18n = nextI18nConfig;
+            nextConfig.i18n = { locales: locales, defaultLocale: defaultLocale };
         }
     }
     if (routes) {
@@ -104,8 +100,8 @@ export function withKoine(_a) {
                                 }
                                 return [2, __assign(__assign({}, customs), { beforeFiles: __spreadArray(__spreadArray([], __read(defaults), false), __read((customs.beforeFiles || [])), false) })];
                             case 3: return [2, {
-                                    afterFiles: [],
                                     beforeFiles: defaults,
+                                    afterFiles: [],
                                     fallback: [],
                                 }];
                         }

package/index.d.ts

@@ -1,4 +1,3 @@
-export { getSiteUrl } from "./getSiteUrl.js";
 export { load } from "./load.js";
 export { ThemeContext, type ThemeContextProps } from "./ThemeContext.js";
 export { ThemeProvider, type ThemeProviderProps } from "./ThemeProvider.js";

package/index.js

@@ -1,4 +1,3 @@
-export { getSiteUrl } from "./getSiteUrl.js";
 export { load } from "./load.js";
 export { ThemeContext } from "./ThemeContext.js";
 export { ThemeProvider } from "./ThemeProvider.js";

package/package.json

@@ -2,9 +2,9 @@
   "name": "@koine/next",
   "sideEffects": false,
   "dependencies": {
-    "@koine/browser": "2.0.0-beta.26",
-    "@koine/react": "2.0.0-beta.26",
-    "@koine/utils": "2.0.0-beta.26"
+    "@koine/browser": "2.0.0-beta.28",
+    "@koine/react": "2.0.0-beta.28",
+    "@koine/utils": "2.0.0-beta.28"
   },
   "peerDependenciesMeta": {
     "@kuus/yup": {
@@ -95,6 +95,12 @@
     "./12/app/sc": {
       "import": "./12/app/sc/index.js"
     },
+    "./12/createUseLocale": {
+      "import": "./12/createUseLocale.js"
+    },
+    "./12/createUseTo": {
+      "import": "./12/createUseTo.js"
+    },
     "./12/document/Document": {
       "import": "./12/document/Document.js"
     },
@@ -172,5 +178,5 @@
     }
   },
   "peerDependencies": {},
-  "version": "2.0.0-beta.26"
+  "version": "2.0.0-beta.28"
 }

package/typings.d.ts

@@ -11,15 +11,6 @@ declare module "*.svg" {
   export default content;
 }
 
-/**
- * Extend NodeJS `process.env` with variables used by @koine
- */
-declare namespace NodeJS {
-  interface ProcessEnv {
-    NEXT_PUBLIC_APP_URL: string;
-  }
-}
-
 /**
  * Types specifically related to `@koine/next` exposed on the global unique
  * namespace `Koine`. Most of the types here should be prefixed by `Next`, e.g.
@@ -30,36 +21,6 @@ declare namespace Koine {
    * Default SEO data structure expected by the `<Seo>` component's prop `seo`
    */
   type NextSeo = import("./12/types-seo").SeoData;
-
-  /**
-   * Translations dictionary extracted from JSON files.
-   * You need to augment this type with something like:
-   *
-   * ```ts
-   * declare namespace Koine {
-   *   interface Translations {
-   *     "~": typeof import("./locales/en/~.json");
-   *     "_": typeof import("./locales/en/_.json");
-   *     "$team": typeof import("./locales/en/$team.json");
-   *     "home": typeof import("./locales/en/home.json");
-   *     "Header": typeof import("./locales/en/Header.json");
-   *   }
-   * }
-   * ```
-   *
-   * Best to follow a convention to name the files which become the namespaces:
-   *
-   * - `~`: for app wide **urls** translated definitions
-   * - `_`: for app wide **common** translations
-   * - `${data}`: dollar prefix for static **data** like arrays, objects, .etc
-   * - `{route-name}`: lower cased for **route** specific data
-   * - `{ComponentName}`: pascal cased for **components** specific data
-   *
-   * This works through using [type augmentation](https://www.typescriptlang.org/docs/handbook/declaration-merging.html#module-augmentation)
-   * and [merging interfaces](https://www.typescriptlang.org/docs/handbook/declaration-merging.html#merging-interfaces).
-   */
-  // eslint-disable-next-line @typescript-eslint/no-empty-interface
-  interface Translations {}
 }
 
 /**