PR feedback - better regex for trailing slash handling

roxiness · Jan 25, 2023 · b70380c · b70380c
1 parent c1abfb5
commit b70380c
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/runtime/utils/index.js b/runtime/utils/index.js
@@ -148,12 +148,8 @@ export function populateUrl(path, params, inheritedParams) {
   const allParams = Object.assign({}, inheritedParams, params)
   const queryString = getQueryString(path, params)
 
-  for (const [key, value] of Object.entries(allParams)) {
-    if (path.endsWith(`:${key}`)) {
-      path = path.replace(new RegExp(`:${key}($)`), value)
-    }
-    path = path.replace(new RegExp(`:${key}(\/)`), `${value}/`)
-  }
+  for (const [key, value] of Object.entries(allParams))
+    path = path.replace(new RegExp(`:${key}(\/|$)`), value + "$1")
 
   return `${path}${queryString}`
 }