@sveltejs/adapter-vercel 2.4.1 → 2.4.3

package/files/serverless.js

@@ -22,10 +22,12 @@ export default async (req, res) => {
 		const [path, search] = req.url.split('?');
 
 		const params = new URLSearchParams(search);
-		const pathname = params.get('__pathname');
+		let pathname = params.get('__pathname');
 
 		if (pathname) {
 			params.delete('__pathname');
+			// Optional routes' pathname replacements look like `/foo/$1/bar` which means we could end up with an url like /foo//bar
+			pathname = pathname.replace(/\/+/g, '/');
 			req.url = `${pathname}${path.endsWith(DATA_SUFFIX) ? DATA_SUFFIX : ''}?${params}`;
 		}
 	}

package/index.js

@@ -3,6 +3,7 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { nodeFileTrace } from '@vercel/nft';
 import esbuild from 'esbuild';
+import { get_pathname } from './utils.js';
 
 const VALID_RUNTIMES = ['edge', 'nodejs16.x', 'nodejs18.x'];
 
@@ -292,13 +293,7 @@ const plugin = function (defaults = {}) {
 					fs.symlinkSync(relative, `${base}.func`);
 					fs.symlinkSync(`../${relative}`, `${base}/__data.json.func`);
 
-					let i = 1;
-					const pathname = route.segments
-						.map((segment) => {
-							return segment.dynamic ? `$${i++}` : segment.content;
-						})
-						.join('/');
-
+					const pathname = get_pathname(route);
 					const json = JSON.stringify(isr, null, '\t');
 
 					write(`${base}.prerender-config.json`, json);

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@sveltejs/adapter-vercel",
-  "version": "2.4.1",
+  "version": "2.4.3",
+  "description": "A SvelteKit adapter that creates a Vercel app",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -20,16 +21,18 @@
   "files": [
     "files",
     "index.js",
+    "utils.js",
     "index.d.ts"
   ],
   "dependencies": {
-    "@vercel/nft": "^0.22.1",
-    "esbuild": "^0.16.3"
+    "@vercel/nft": "^0.22.6",
+    "esbuild": "^0.17.18"
   },
   "devDependencies": {
     "@types/node": "^16.18.6",
     "typescript": "^4.9.4",
-    "@sveltejs/kit": "^1.14.0"
+    "uvu": "^0.5.6",
+    "@sveltejs/kit": "^1.15.9"
   },
   "peerDependencies": {
     "@sveltejs/kit": "^1.5.0"
@@ -37,6 +40,7 @@
   "scripts": {
     "lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
     "format": "pnpm lint --write",
-    "check": "tsc"
+    "check": "tsc",
+    "test": "uvu test .spec.js"
   }
 }

package/utils.js

@@ -0,0 +1,23 @@
+/** @param {import("@sveltejs/kit").RouteDefinition<any>} route */
+export function get_pathname(route) {
+	let i = 1;
+
+	return route.segments
+		.map((segment) => {
+			if (!segment.dynamic) {
+				return segment.content;
+			}
+
+			const parts = segment.content.split(/\[(.+?)\](?!\])/);
+			return parts
+				.map((content, j) => {
+					if (j % 2) {
+						return `$${i++}`;
+					} else {
+						return content;
+					}
+				})
+				.join('');
+		})
+		.join('/');
+}