next-intl 3.9.2 → 3.9.3

package/dist/development/shared/utils.js

@@ -66,13 +66,13 @@ pathname) {
   return regex.test(pathname);
 }
 function templateToRegex(template) {
-  const regexPattern = template.replace(/\[([^\]]+)\]/g, match => {
-    if (match.startsWith('[...')) return '(.*)';
-    if (match.startsWith('[[...')) return '(.*)';
-    return '([^/]+)';
-  })
-  // Clean up regex match remainders from optional catchall ('[[...slug]]')
-  .replaceAll('(.*)]', '(.*)');
+  const regexPattern = template
+  // Replace optional catchall ('[[...slug]]')
+  .replaceAll(/\[\[(\.\.\.[^\]]+)\]\]/g, '?(.*)')
+  // Replace catchall ('[...slug]')
+  .replaceAll(/\[(\.\.\.[^\]]+)\]/g, '(.+)')
+  // Replace regular parameter ('[slug]')
+  .replaceAll(/\[([^\]]+)\]/g, '([^/]+)');
   return new RegExp("^".concat(regexPattern, "$"));
 }
 

package/dist/esm/shared/utils.js

@@ -1 +1 @@
-function t(t){const n="object"==typeof t?t.pathname:t;return null!=n&&!n.startsWith("/")}function n(t){if("object"==typeof t)return null==t.host&&null==t.hostname;return!/^[a-z]+:/i.test(t)}function e(e,c){let o=arguments.length>2&&void 0!==arguments[2]?arguments[2]:c,a=arguments.length>3?arguments[3]:void 0;if(!n(e)||t(e))return e;const l=c!==o,i=null==c||u(c,a);return(l||i)&&null!=c?r(e,c):e}function r(t,n){let e;return"string"==typeof t?e=o(n,t):(e={...t},t.pathname&&(e.pathname=o(n,t.pathname))),e}function c(t,n){return t.replace(new RegExp("^/".concat(n)),"")||"/"}function o(t,n){let e="/"+t;return/^\/(\?.*)?$/.test(n)&&(n=n.slice(1)),e+=n,e}function u(t,n){const e="/".concat(t);return n===e||n.startsWith("".concat(e,"/"))}function a(t,n){return l(t).test(n)}function l(t){const n=t.replace(/\[([^\]]+)\]/g,(t=>t.startsWith("[...")||t.startsWith("[[...")?"(.*)":"([^/]+)")).replaceAll("(.*)]","(.*)");return new RegExp("^".concat(n,"$"))}export{u as hasPathnamePrefixed,n as isLocalHref,t as isRelativeHref,e as localizeHref,a as matchesPathname,r as prefixHref,o as prefixPathname,l as templateToRegex,c as unlocalizePathname};
+function t(t){const n="object"==typeof t?t.pathname:t;return null!=n&&!n.startsWith("/")}function n(t){if("object"==typeof t)return null==t.host&&null==t.hostname;return!/^[a-z]+:/i.test(t)}function e(e,c){let o=arguments.length>2&&void 0!==arguments[2]?arguments[2]:c,u=arguments.length>3?arguments[3]:void 0;if(!n(e)||t(e))return e;const a=c!==o,i=null==c||l(c,u);return(a||i)&&null!=c?r(e,c):e}function r(t,n){let e;return"string"==typeof t?e=o(n,t):(e={...t},t.pathname&&(e.pathname=o(n,t.pathname))),e}function c(t,n){return t.replace(new RegExp("^/".concat(n)),"")||"/"}function o(t,n){let e="/"+t;return/^\/(\?.*)?$/.test(n)&&(n=n.slice(1)),e+=n,e}function l(t,n){const e="/".concat(t);return n===e||n.startsWith("".concat(e,"/"))}function u(t,n){return a(t).test(n)}function a(t){const n=t.replaceAll(/\[\[(\.\.\.[^\]]+)\]\]/g,"?(.*)").replaceAll(/\[(\.\.\.[^\]]+)\]/g,"(.+)").replaceAll(/\[([^\]]+)\]/g,"([^/]+)");return new RegExp("^".concat(n,"$"))}export{l as hasPathnamePrefixed,n as isLocalHref,t as isRelativeHref,e as localizeHref,u as matchesPathname,r as prefixHref,o as prefixPathname,a as templateToRegex,c as unlocalizePathname};

package/dist/production/shared/utils.js

@@ -1 +1 @@
-"use strict";function t(t){const e="object"==typeof t?t.pathname:t;return null!=e&&!e.startsWith("/")}function e(t){if("object"==typeof t)return null==t.host&&null==t.hostname;return!/^[a-z]+:/i.test(t)}function n(t,e){let n;return"string"==typeof t?n=r(e,t):(n={...t},t.pathname&&(n.pathname=r(e,t.pathname))),n}function r(t,e){let n="/"+t;return/^\/(\?.*)?$/.test(e)&&(e=e.slice(1)),n+=e,n}function o(t,e){const n="/".concat(t);return e===n||e.startsWith("".concat(n,"/"))}function a(t){const e=t.replace(/\[([^\]]+)\]/g,(t=>t.startsWith("[...")||t.startsWith("[[...")?"(.*)":"([^/]+)")).replaceAll("(.*)]","(.*)");return new RegExp("^".concat(e,"$"))}Object.defineProperty(exports,"__esModule",{value:!0}),exports.hasPathnamePrefixed=o,exports.isLocalHref=e,exports.isRelativeHref=t,exports.localizeHref=function(r,a){let s=arguments.length>2&&void 0!==arguments[2]?arguments[2]:a,c=arguments.length>3?arguments[3]:void 0;if(!e(r)||t(r))return r;const i=a!==s,l=null==a||o(a,c);return(i||l)&&null!=a?n(r,a):r},exports.matchesPathname=function(t,e){return a(t).test(e)},exports.prefixHref=n,exports.prefixPathname=r,exports.templateToRegex=a,exports.unlocalizePathname=function(t,e){return t.replace(new RegExp("^/".concat(e)),"")||"/"};
+"use strict";function e(e){const t="object"==typeof e?e.pathname:e;return null!=t&&!t.startsWith("/")}function t(e){if("object"==typeof e)return null==e.host&&null==e.hostname;return!/^[a-z]+:/i.test(e)}function n(e,t){let n;return"string"==typeof e?n=r(t,e):(n={...e},e.pathname&&(n.pathname=r(t,e.pathname))),n}function r(e,t){let n="/"+e;return/^\/(\?.*)?$/.test(t)&&(t=t.slice(1)),n+=t,n}function o(e,t){const n="/".concat(e);return t===n||t.startsWith("".concat(n,"/"))}function a(e){const t=e.replaceAll(/\[\[(\.\.\.[^\]]+)\]\]/g,"?(.*)").replaceAll(/\[(\.\.\.[^\]]+)\]/g,"(.+)").replaceAll(/\[([^\]]+)\]/g,"([^/]+)");return new RegExp("^".concat(t,"$"))}Object.defineProperty(exports,"__esModule",{value:!0}),exports.hasPathnamePrefixed=o,exports.isLocalHref=t,exports.isRelativeHref=e,exports.localizeHref=function(r,a){let l=arguments.length>2&&void 0!==arguments[2]?arguments[2]:a,c=arguments.length>3?arguments[3]:void 0;if(!t(r)||e(r))return r;const s=a!==l,u=null==a||o(a,c);return(s||u)&&null!=a?n(r,a):r},exports.matchesPathname=function(e,t){return a(e).test(t)},exports.prefixHref=n,exports.prefixPathname=r,exports.templateToRegex=a,exports.unlocalizePathname=function(e,t){return e.replace(new RegExp("^/".concat(t)),"")||"/"};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-intl",
-  "version": "3.9.2",
+  "version": "3.9.3",
   "sideEffects": false,
   "author": "Jan Amann <jan@amann.work>",
   "funding": [
@@ -82,7 +82,7 @@
   "dependencies": {
     "@formatjs/intl-localematcher": "^0.2.32",
     "negotiator": "^0.6.3",
-    "use-intl": "^3.9.2"
+    "use-intl": "^3.9.3"
   },
   "peerDependencies": {
     "next": "^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0",
@@ -141,5 +141,5 @@
       "limit": "5.855 KB"
     }
   ],
-  "gitHead": "2a6199609c0a77f897d994c8d52796f5615bcfff"
+  "gitHead": "0df6e429ad3dca9e3ac9101cad6ac9ee034e24f5"
 }