@koine/next 2.0.0-beta.39 → 2.0.0-beta.41

package/config.cjs.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-let e=(e,t)=>e.filter((e,n,i)=>i.findIndex(n=>t.every(t=>n[t]===e[t]))===n);function t(e,t){let{[t]:n,...i}=e;return {[t]:n,...i}}function n(e=""){return e.replace(/\/+\//g,"/").replace(/^\/*(.*?)\/*$/,"$1")}function i(e){let{pathname:t,template:n}=e,i=t.split("/").filter(e=>!!e),l=n.split("/").filter(e=>!!e),o={};return {pathname:i.map(e=>{let t=e.endsWith("*"),n=(e=e.replace("*","")).startsWith("{{")&&e.endsWith("}}"),i=n?e.match(/{{(.+)}}/)?.[1].trim()??"":e.trim(),l=encodeURIComponent(i)+(t?"*":"");return o[i]={isDynamic:n,hasWildcard:t},n?`:${l}`:l}).join("/"),template:l.map(e=>{let t=e.startsWith("[")&&e.endsWith("]"),n=t?e.match(/\[(.+)\]/)?.[1].trim()??"":e.trim(),i=o[n]?.hasWildcard,l=encodeURIComponent(n)+(i?"*":"");return t?`:${l}`:l}).join("/")}}function l(e={},t,n="",i=""){let o=Object.keys(t).includes("[spa]");for(let r in t){let a=t[r],c=`${i}/${r}`;"string"==typeof a?(!o||o&&["[spa]","index"].includes(r))&&(e[c]={template:c,pathname:a,wildcard:a.includes("*")}):o||l(e,a,n,c);}return e}function o(e){return e.replace(/\/index$/,"")}function r(e){let{localeSource:t,localeDestination:l,route:r,usePathnameAsSource:a,permanent:c}=e,{template:s,pathname:u}=i(r),p=t?`${t}/`:"",f=o(`/${n(p+(a?u:s))}`),h=l?`${l}/`:"",d=`/${n(h+u)}`;if(f!==d)return {source:f,destination:d,permanent:!!c}}function getRedirects(n){let{routes:i,defaultLocale:a,hideDefaultLocaleInUrl:c,localeParam:s,permanent:u,debug:p}=n,f=t(i,a),h=[];for(let e in f){let t=l({},i[e]);for(let n in t){let i=t[n];if(i.pathname!==o(n)){let t=e===a&&!c,n=e===a&&c;s?t?h.push(r({localeDestination:e,route:i,permanent:u})):n?h.push(r({localeSource:e,route:i,permanent:u})):e!==a?h.push(r({localeSource:e,localeDestination:e,route:i,permanent:u})):h.push(r({route:i,permanent:u})):t?h.push(r({localeDestination:e,route:i,permanent:u})):e!==a?h.push(r({localeSource:e,localeDestination:e,route:i,permanent:u})):h.push(r({route:i,permanent:u}));}}}let d=e(h.filter(Boolean),["source","destination"]).map(e=>s?e:{...e,locale:!1});return p&&console.info("[@koine/next/config:getRedirects]",d),d}function a(e){let{localeSource:t,localeDestination:l,localeParam:r,route:a}=e,{pathname:c,template:s}=i(a),u="";t?u=`${t}/`:r&&(u=`:${r}/`);let p=`/${n(u+c)}`,f="";l?f=`${l}/`:r&&(f=`:${r}/`);let h=o(`/${n(f+s)}`);if(p!==h)return {source:p,destination:h}}function getRewrites(n){let{routes:i,defaultLocale:r,hideDefaultLocaleInUrl:c,localeParam:s,debug:u}=n,p=t(i,r),f=[];for(let e in p){let t=l({},i[e]);for(let n in t){let i=t[n],l=e===r&&!c,u=e===r&&c;s?u?f.push(a({localeDestination:e,route:i})):f.push(a({localeParam:s,route:i})):i.pathname!==o(n)&&(e!==r||l?f.push(a({localeSource:e,route:i})):f.push(a({route:i})));}}let h=e(f.filter(Boolean),["source","destination"]);return u&&console.info("[@koine/next/config:getRewrites]",h),h}
+var nextConfig = require('@koine/i18n/next-config');
 
-let withKoine=({nx:i=!0,svg:t=!0,page:n,routes:l,permanent:o,debug:s,...a}={i18n:{locales:["en"],defaultLocale:"en",hideDefaultLocaleInUrl:!1}})=>{let c={eslint:{ignoreDuringBuilds:!0},typescript:{ignoreBuildErrors:!0},poweredByHeader:!1,modularizeImports:{"@koine/i18n":{transform:"@koine/i18n/{{member}}"},"@koine/next/?(((\\w*)?/?)*)":{transform:"@koine/next/{{ matches.[1] }}/{{member}}"},...a.modularizeImports||{}},experimental:{scrollRestoration:!0,...a.experimental||{}},...a};if(t&&(i?c.nx={svgr:!0}:(delete c.nx,c.webpack=(e,r)=>{let i="function"==typeof c.webpack?c.webpack(e,r):e;return i.module.rules.push({test:/\.svg$/,use:[{loader:"@svgr/webpack",options:{svgoConfig:{plugins:[{name:"removeViewBox",active:!1}]}}}]}),i})),a.i18n){let{locales:e,defaultLocale:r,localeParam:i}=a.i18n;i?delete c.i18n:c.i18n={locales:e,defaultLocale:r};}return l?{...c,async redirects(){let r=getRedirects({routes:l,permanent:o,debug:s,...a.i18n});return c.redirects?[...r,...await c.redirects()]:r},async rewrites(){let e=getRewrites({routes:l,debug:s,...a.i18n});if(c.rewrites){let r=await c.rewrites();return Array.isArray(r)?{beforeFiles:e,afterFiles:r,fallback:[]}:{...r,beforeFiles:[...e,...r.beforeFiles||[]]}}return {beforeFiles:e,afterFiles:[],fallback:[]}}}:c};
+let withKoine=(r={})=>o=>{let{nx:t=!0,svg:i=!0,i18n:n}=r,s={eslint:{ignoreDuringBuilds:!0},typescript:{ignoreBuildErrors:!0},poweredByHeader:!1,experimental:{scrollRestoration:!0,...o.experimental||{}},...o};return (i&&(t?s.nx={svgr:!0}:(delete s.nx,s.webpack=(e,r)=>{let o="function"==typeof s.webpack?s.webpack(e,r):e;return o.module.rules.push({test:/\.svg$/,use:[{loader:"@svgr/webpack",options:{svgoConfig:{plugins:[{name:"removeViewBox",active:!1}]}}}]}),o})),n)?nextConfig.withI18nNext({...r,i18n:n})(s):s};
 
 exports.withKoine = withKoine;

package/config.d.ts

@@ -1,37 +1,29 @@
 import type { NextConfig } from "next";
-import { type ConfigI18nOptions, type Routes } from "./config-i18n.js";
-interface KoineNextConfig {
+import { type WithI18nNextConfig } from "@koine/i18n/next-config";
+type WithKoineConfig = {
     nx?: boolean;
     svg?: boolean;
-    routes?: Routes;
-    permanent?: boolean;
-    debug?: boolean;
-    i18n: ConfigI18nOptions & {
-        loader?: any;
-    };
-}
-interface MergedConfig extends KoineNextConfig, Omit<NextConfig, "i18n"> {
-}
-export declare let withKoine: ({ nx, svg, page, routes, permanent, debug, ...custom }?: MergedConfig) => NextConfig | {
-    redirects(): Promise<import("./config-i18n.js").Redirect[]>;
+} & Partial<WithI18nNextConfig>;
+export declare let withKoine: (config?: WithKoineConfig) => (customNextConfig: NextConfig) => NextConfig | {
+    redirects(): Promise<import("@koine/i18n/client/adapter-next/config").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[];
+        beforeFiles: import("@koine/i18n/client/adapter-next/config").Rewrite[];
+        afterFiles: import("next/dist/lib/load-custom-routes").Rewrite[];
+        fallback: import("next/dist/lib/load-custom-routes").Rewrite[];
     }>;
-    exportPathMap?: ((defaultMap: import("next/dist/server/config-shared.js").ExportPathMap, ctx: {
+    exportPathMap?: ((defaultMap: import("next/dist/server/config-shared").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;
+    }) => import("next/dist/server/config-shared").ExportPathMap | Promise<import("next/dist/server/config-shared").ExportPathMap>) | undefined;
+    i18n?: import("next/dist/server/config-shared").I18NConfig | null | undefined;
+    eslint?: import("next/dist/server/config-shared").ESLintConfig | undefined;
+    typescript?: import("next/dist/server/config-shared").TypeScriptConfig | undefined;
+    headers?: (() => Promise<import("next/dist/lib/load-custom-routes").Header[]>) | undefined;
     excludeDefaultMomentLocales?: boolean | undefined;
-    webpack?: import("next/dist/server/config-shared.js").NextJsWebpackConfig | null | undefined;
+    webpack?: import("next/dist/server/config-shared").NextJsWebpackConfig | null | undefined;
     trailingSlash?: boolean | undefined;
     env?: Record<string, string | undefined> | undefined;
     distDir?: string | undefined;
@@ -46,7 +38,7 @@ export declare let withKoine: ({ nx, svg, page, routes, permanent, debug, ...cus
     compress?: boolean | undefined;
     analyticsId?: string | undefined;
     poweredByHeader?: boolean | undefined;
-    images?: Partial<import("next/dist/shared/lib/image-config.js").ImageConfigComplete> | undefined;
+    images?: Partial<import("next/dist/shared/lib/image-config").ImageConfigComplete> | undefined;
     devIndicators?: {
         buildActivity?: boolean | undefined;
         buildActivityPosition?: "bottom-right" | "bottom-left" | "top-right" | "top-left" | undefined;
@@ -92,8 +84,8 @@ export declare let withKoine: ({ nx, svg, page, routes, permanent, debug, ...cus
         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;
+        styledComponents?: boolean | import("next/dist/server/config-shared").StyledComponentsConfig | undefined;
+        emotion?: boolean | import("next/dist/server/config-shared").EmotionConfig | undefined;
     } | undefined;
     output?: "standalone" | "export" | undefined;
     transpilePackages?: string[] | undefined;
@@ -109,6 +101,6 @@ export declare let withKoine: ({ nx, svg, page, routes, permanent, debug, ...cus
             fullUrl?: boolean | undefined;
         } | undefined;
     } | undefined;
-    experimental?: import("next/dist/server/config-shared.js").ExperimentalConfig | undefined;
+    experimental?: import("next/dist/server/config-shared").ExperimentalConfig | undefined;
 };
 export {};

package/config.esm.js

@@ -1,5 +1,5 @@
-let e=(e,t)=>e.filter((e,n,i)=>i.findIndex(n=>t.every(t=>n[t]===e[t]))===n);function t(e,t){let{[t]:n,...i}=e;return {[t]:n,...i}}function n(e=""){return e.replace(/\/+\//g,"/").replace(/^\/*(.*?)\/*$/,"$1")}function i(e){let{pathname:t,template:n}=e,i=t.split("/").filter(e=>!!e),l=n.split("/").filter(e=>!!e),o={};return {pathname:i.map(e=>{let t=e.endsWith("*"),n=(e=e.replace("*","")).startsWith("{{")&&e.endsWith("}}"),i=n?e.match(/{{(.+)}}/)?.[1].trim()??"":e.trim(),l=encodeURIComponent(i)+(t?"*":"");return o[i]={isDynamic:n,hasWildcard:t},n?`:${l}`:l}).join("/"),template:l.map(e=>{let t=e.startsWith("[")&&e.endsWith("]"),n=t?e.match(/\[(.+)\]/)?.[1].trim()??"":e.trim(),i=o[n]?.hasWildcard,l=encodeURIComponent(n)+(i?"*":"");return t?`:${l}`:l}).join("/")}}function l(e={},t,n="",i=""){let o=Object.keys(t).includes("[spa]");for(let r in t){let a=t[r],c=`${i}/${r}`;"string"==typeof a?(!o||o&&["[spa]","index"].includes(r))&&(e[c]={template:c,pathname:a,wildcard:a.includes("*")}):o||l(e,a,n,c);}return e}function o(e){return e.replace(/\/index$/,"")}function r(e){let{localeSource:t,localeDestination:l,route:r,usePathnameAsSource:a,permanent:c}=e,{template:s,pathname:u}=i(r),p=t?`${t}/`:"",f=o(`/${n(p+(a?u:s))}`),h=l?`${l}/`:"",d=`/${n(h+u)}`;if(f!==d)return {source:f,destination:d,permanent:!!c}}function getRedirects(n){let{routes:i,defaultLocale:a,hideDefaultLocaleInUrl:c,localeParam:s,permanent:u,debug:p}=n,f=t(i,a),h=[];for(let e in f){let t=l({},i[e]);for(let n in t){let i=t[n];if(i.pathname!==o(n)){let t=e===a&&!c,n=e===a&&c;s?t?h.push(r({localeDestination:e,route:i,permanent:u})):n?h.push(r({localeSource:e,route:i,permanent:u})):e!==a?h.push(r({localeSource:e,localeDestination:e,route:i,permanent:u})):h.push(r({route:i,permanent:u})):t?h.push(r({localeDestination:e,route:i,permanent:u})):e!==a?h.push(r({localeSource:e,localeDestination:e,route:i,permanent:u})):h.push(r({route:i,permanent:u}));}}}let d=e(h.filter(Boolean),["source","destination"]).map(e=>s?e:{...e,locale:!1});return p&&console.info("[@koine/next/config:getRedirects]",d),d}function a(e){let{localeSource:t,localeDestination:l,localeParam:r,route:a}=e,{pathname:c,template:s}=i(a),u="";t?u=`${t}/`:r&&(u=`:${r}/`);let p=`/${n(u+c)}`,f="";l?f=`${l}/`:r&&(f=`:${r}/`);let h=o(`/${n(f+s)}`);if(p!==h)return {source:p,destination:h}}function getRewrites(n){let{routes:i,defaultLocale:r,hideDefaultLocaleInUrl:c,localeParam:s,debug:u}=n,p=t(i,r),f=[];for(let e in p){let t=l({},i[e]);for(let n in t){let i=t[n],l=e===r&&!c,u=e===r&&c;s?u?f.push(a({localeDestination:e,route:i})):f.push(a({localeParam:s,route:i})):i.pathname!==o(n)&&(e!==r||l?f.push(a({localeSource:e,route:i})):f.push(a({route:i})));}}let h=e(f.filter(Boolean),["source","destination"]);return u&&console.info("[@koine/next/config:getRewrites]",h),h}
+import { withI18nNext } from '@koine/i18n/next-config';
 
-let withKoine=({nx:i=!0,svg:t=!0,page:n,routes:l,permanent:o,debug:s,...a}={i18n:{locales:["en"],defaultLocale:"en",hideDefaultLocaleInUrl:!1}})=>{let c={eslint:{ignoreDuringBuilds:!0},typescript:{ignoreBuildErrors:!0},poweredByHeader:!1,modularizeImports:{"@koine/i18n":{transform:"@koine/i18n/{{member}}"},"@koine/next/?(((\\w*)?/?)*)":{transform:"@koine/next/{{ matches.[1] }}/{{member}}"},...a.modularizeImports||{}},experimental:{scrollRestoration:!0,...a.experimental||{}},...a};if(t&&(i?c.nx={svgr:!0}:(delete c.nx,c.webpack=(e,r)=>{let i="function"==typeof c.webpack?c.webpack(e,r):e;return i.module.rules.push({test:/\.svg$/,use:[{loader:"@svgr/webpack",options:{svgoConfig:{plugins:[{name:"removeViewBox",active:!1}]}}}]}),i})),a.i18n){let{locales:e,defaultLocale:r,localeParam:i}=a.i18n;i?delete c.i18n:c.i18n={locales:e,defaultLocale:r};}return l?{...c,async redirects(){let r=getRedirects({routes:l,permanent:o,debug:s,...a.i18n});return c.redirects?[...r,...await c.redirects()]:r},async rewrites(){let e=getRewrites({routes:l,debug:s,...a.i18n});if(c.rewrites){let r=await c.rewrites();return Array.isArray(r)?{beforeFiles:e,afterFiles:r,fallback:[]}:{...r,beforeFiles:[...e,...r.beforeFiles||[]]}}return {beforeFiles:e,afterFiles:[],fallback:[]}}}:c};
+let withKoine=(r={})=>o=>{let{nx:t=!0,svg:i=!0,i18n:n}=r,s={eslint:{ignoreDuringBuilds:!0},typescript:{ignoreBuildErrors:!0},poweredByHeader:!1,experimental:{scrollRestoration:!0,...o.experimental||{}},...o};return (i&&(t?s.nx={svgr:!0}:(delete s.nx,s.webpack=(e,r)=>{let o="function"==typeof s.webpack?s.webpack(e,r):e;return o.module.rules.push({test:/\.svg$/,use:[{loader:"@svgr/webpack",options:{svgoConfig:{plugins:[{name:"removeViewBox",active:!1}]}}}]}),o})),n)?withI18nNext({...r,i18n:n})(s):s};
 
 export { withKoine };

package/package.json

@@ -2,9 +2,9 @@
   "name": "@koine/next",
   "sideEffects": false,
   "dependencies": {
-    "@koine/browser": "2.0.0-beta.39",
-    "@koine/react": "2.0.0-beta.39",
-    "@koine/utils": "2.0.0-beta.39"
+    "@koine/browser": "2.0.0-beta.41",
+    "@koine/react": "2.0.0-beta.41",
+    "@koine/utils": "2.0.0-beta.41"
   },
   "peerDependencies": {
     "next": "^14.0.4",
@@ -45,5 +45,5 @@
   },
   "module": "./index.esm.js",
   "main": "./index.cjs.js",
-  "version": "2.0.0-beta.39"
+  "version": "2.0.0-beta.41"
 }

package/config-i18n.d.ts

@@ -1,29 +0,0 @@
-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>;
-export type ConfigI18nOptions = {
-    locales: Locale[];
-    defaultLocale: Locale;
-    hideDefaultLocaleInUrl?: boolean;
-    localeParam?: string;
-};
-type Options = ConfigI18nOptions & {
-    routes: Routes;
-    debug?: boolean;
-    permanent?: boolean;
-};
-type GetRedirectsOptions = Options;
-export declare function getRedirects(arg: GetRedirectsOptions): Redirect[];
-type GetRewritesOptions = Options;
-export declare function getRewrites(arg: GetRewritesOptions): Rewrite[];
-export {};