@koine/next 1.2.0 → 1.2.2

package/config/index.js

@@ -126,6 +126,12 @@ function getRoutesMap(map, routes, pathnameBuffer, templateBuffer) {
     }
     return map;
 }
+/**
+ * Removes `/index` from a template/url path
+ */
+function getWithoutIndex(template) {
+    return template.replace(/\/index$/, "");
+}
 /**
  * Get path rewrite
  */
@@ -136,7 +142,7 @@ function getPathRewrite(route) {
     // console.log(`rewrite pathname "${source}" to template "${destination}"`);
     return {
         source: source,
-        destination: destination.replace(/\/index$/, ""),
+        destination: getWithoutIndex(destination),
     };
 }
 exports.getPathRewrite = getPathRewrite;
@@ -150,7 +156,7 @@ function getPathRedirect(locale, route, permanent) {
     var destination = "/".concat(normaliseUrlPathname(pathname));
     // console.log(`redirect template "${source}" to pathname "${destination}"`);
     return {
-        source: source.replace(/\/index$/, ""),
+        source: getWithoutIndex(source),
         destination: destination,
         permanent: Boolean(permanent),
         locale: false,
@@ -167,8 +173,16 @@ function getRedirects(defaultLocale, routes, permanent, debug) {
             routesMap = getRoutesMap({}, routes);
             Object.keys(routesMap).forEach(function (template) {
                 var route = routesMap[template];
-                if (route.pathname !== template) {
-                    redirects.push(getPathRedirect(defaultLocale, route, permanent));
+                // TODO: add option hideDefaultLocaleInUrl?
+                // this is meant to redirect the URL with the default locale to the same
+                // url without locale prefix, e.g.: /en/about -> /about (assuming en is the
+                // defualt locale).
+                // Actually this redirect seem not to be necessary, probably the i18n routing
+                // mechanism of next 12 already does this, enabling causes infinite redirects
+                // if (hideDefaultLocaleInUrl) {
+                // redirects.push(getPathRedirect(defaultLocale, route, permanent));
+                // }
+                if (route.pathname !== getWithoutIndex(template)) {
                     redirects.push(getPathRedirect("", route, permanent));
                 }
             });
@@ -189,7 +203,7 @@ function getRewrites(routes, debug) {
             routesMap = getRoutesMap({}, routes);
             Object.keys(routesMap).forEach(function (template) {
                 var route = routesMap[template];
-                if (route.pathname !== template) {
+                if (route.pathname !== getWithoutIndex(template)) {
                     rewrites.push(getPathRewrite(route));
                 }
             });

package/config/index.mjs

@@ -120,6 +120,12 @@ function getRoutesMap(map, routes, pathnameBuffer, templateBuffer) {
     }
     return map;
 }
+/**
+ * Removes `/index` from a template/url path
+ */
+function getWithoutIndex(template) {
+    return template.replace(/\/index$/, "");
+}
 /**
  * Get path rewrite
  */
@@ -130,7 +136,7 @@ export function getPathRewrite(route) {
     // console.log(`rewrite pathname "${source}" to template "${destination}"`);
     return {
         source: source,
-        destination: destination.replace(/\/index$/, ""),
+        destination: getWithoutIndex(destination),
     };
 }
 /**
@@ -143,7 +149,7 @@ export function getPathRedirect(locale, route, permanent) {
     var destination = "/".concat(normaliseUrlPathname(pathname));
     // console.log(`redirect template "${source}" to pathname "${destination}"`);
     return {
-        source: source.replace(/\/index$/, ""),
+        source: getWithoutIndex(source),
         destination: destination,
         permanent: Boolean(permanent),
         locale: false,
@@ -159,8 +165,16 @@ export function getRedirects(defaultLocale, routes, permanent, debug) {
             routesMap = getRoutesMap({}, routes);
             Object.keys(routesMap).forEach(function (template) {
                 var route = routesMap[template];
-                if (route.pathname !== template) {
-                    redirects.push(getPathRedirect(defaultLocale, route, permanent));
+                // TODO: add option hideDefaultLocaleInUrl?
+                // this is meant to redirect the URL with the default locale to the same
+                // url without locale prefix, e.g.: /en/about -> /about (assuming en is the
+                // defualt locale).
+                // Actually this redirect seem not to be necessary, probably the i18n routing
+                // mechanism of next 12 already does this, enabling causes infinite redirects
+                // if (hideDefaultLocaleInUrl) {
+                // redirects.push(getPathRedirect(defaultLocale, route, permanent));
+                // }
+                if (route.pathname !== getWithoutIndex(template)) {
                     redirects.push(getPathRedirect("", route, permanent));
                 }
             });
@@ -180,7 +194,7 @@ export function getRewrites(routes, debug) {
             routesMap = getRoutesMap({}, routes);
             Object.keys(routesMap).forEach(function (template) {
                 var route = routesMap[template];
-                if (route.pathname !== template) {
+                if (route.pathname !== getWithoutIndex(template)) {
                     rewrites.push(getPathRewrite(route));
                 }
             });

package/package.json

@@ -98,13 +98,13 @@
     "type-fest": "^3.6.0"
   },
   "peerDependencies": {
-    "@koine/browser": "1.2.0",
-    "@koine/dom": "1.2.0",
-    "@koine/react": "1.2.0",
-    "@koine/utils": "1.2.0"
+    "@koine/browser": "1.2.2",
+    "@koine/dom": "1.2.2",
+    "@koine/react": "1.2.2",
+    "@koine/utils": "1.2.2"
   },
   "main": "./index.js",
   "types": "./index.d.ts",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "module": "./index.mjs"
 }