Fixes #1988

package.json

@@ -114,14 +114,14 @@
     "mustache": "^4.2.0",
     "normalize-path": "^3.0.0",
     "nunjucks": "^3.2.3",
+    "path-to-regexp": "^6.2.0",
     "please-upgrade-node": "^3.2.0",
     "pretty": "^2.0.0",
     "pug": "^3.0.2",
     "recursive-copy": "^2.0.13",
     "semver": "^7.3.5",
     "slugify": "^1.6.0",
     "split": "^1.0.1",
-    "time-require": "^0.1.2",
-    "url-pattern": "^1.0.3"
+    "time-require": "^0.1.2"
   }
 }

src/Filters/ServerlessUrl.js

@@ -1,8 +1,8 @@
-const UrlPattern = require("url-pattern");
+const { compile } = require("path-to-regexp");
 
 function stringify(url, urlData = {}) {
-  let pattern = new UrlPattern(url);
-  return pattern.stringify(urlData);
+  let fn = compile(url, { encode: encodeURIComponent });
+  return fn(urlData);
 }
 
 module.exports = function (url, urlData = {}) {

src/Serverless.js

@@ -3,7 +3,7 @@ const fs = require("fs");
 
 const Eleventy = require("./Eleventy");
 const TemplatePath = require("./TemplatePath");
-const UrlPattern = require("url-pattern");
+const { match } = require("path-to-regexp");
 const deleteRequireCache = require("./Util/DeleteRequireCache");
 const debug = require("debug")("Eleventy:Serverless");
 
@@ -40,8 +40,8 @@ class Serverless {
         inputDir: null, // override only, we now inject this.
         functionsDir: "functions/",
         matchUrlToPattern(path, urlToCompare) {
-          let pattern = new UrlPattern(urlToCompare);
-          return pattern.match(path);
+          let fn = match(urlToCompare, { decode: decodeURIComponent });
+          return fn(path);
         },
         // Query String Parameters
         query: {},
@@ -131,7 +131,7 @@ class Serverless {
       if (result) {
         matches.push({
           compareTo: url,
-          pathParams: result,
+          pathParams: result.params,
           inputPath: contentMap[url],
         });
       }