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

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/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.27",
+    "@koine/react": "2.0.0-beta.27",
+    "@koine/utils": "2.0.0-beta.27"
   },
   "peerDependenciesMeta": {
     "@kuus/yup": {
@@ -172,5 +172,5 @@
     }
   },
   "peerDependencies": {},
-  "version": "2.0.0-beta.26"
+  "version": "2.0.0-beta.27"
 }