@vercel/next 3.1.16 → 3.1.19

package/dist/index.js

@@ -47038,7 +47038,11 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
     let lambda;
     let outputPathData = path_1.default.posix.join(entryDirectory, dataRoute);
     if (nonDynamicSsg || isFallback || isOmitted) {
-        outputPathData = outputPathData.replace(new RegExp(`${(0, escape_string_regexp_1.default)(origRouteFileNoExt)}.json$`), `${routeFileNoExt}.json`);
+        outputPathData = outputPathData.replace(new RegExp(`${(0, escape_string_regexp_1.default)(origRouteFileNoExt)}.json$`), 
+        // ensure we escape "$" correctly while replacing as "$" is a special
+        // character, we need to do double escaping as first is for the initial
+        // replace on the routeFile and then the second on the outputPath
+        `${routeFileNoExt.replace(/\$/g, '$$$$')}.json`);
     }
     if (isSharedLambdas) {
         const outputSrcPathPage = normalizeIndexOutput(path_1.default.join('/', srcRoute == null
@@ -47373,6 +47377,11 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
             const shortPath = edgeFile.replace(/^pages\//, '');
             worker.edgeFunction.name = shortPath;
             source.edgeFunctions[shortPath] = worker.edgeFunction;
+            // we don't add the route for edge functions as these
+            // are already added in the routes-manifest under dynamicRoutes
+            if (worker.type === 'function') {
+                continue;
+            }
             const route = {
                 continue: true,
                 src: worker.routeSrc,
@@ -47384,14 +47393,9 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                     },
                 ],
             };
-            if (worker.type === 'function') {
-                route.dest = shortPath;
-            }
-            else {
-                route.middlewarePath = shortPath;
-                if (isCorrectMiddlewareOrder) {
-                    route.override = true;
-                }
+            route.middlewarePath = shortPath;
+            if (isCorrectMiddlewareOrder) {
+                route.override = true;
             }
             if (routesManifest.version > 3 && isDynamicRoute(worker.page)) {
                 source.dynamicRouteMap.set(worker.page, route);

package/dist/utils.js

@@ -1118,7 +1118,11 @@ const onPrerenderRoute = (prerenderRouteArgs) => (routeKey, { isBlocking, isFall
     let lambda;
     let outputPathData = path_1.default.posix.join(entryDirectory, dataRoute);
     if (nonDynamicSsg || isFallback || isOmitted) {
-        outputPathData = outputPathData.replace(new RegExp(`${(0, escape_string_regexp_1.default)(origRouteFileNoExt)}.json$`), `${routeFileNoExt}.json`);
+        outputPathData = outputPathData.replace(new RegExp(`${(0, escape_string_regexp_1.default)(origRouteFileNoExt)}.json$`), 
+        // ensure we escape "$" correctly while replacing as "$" is a special
+        // character, we need to do double escaping as first is for the initial
+        // replace on the routeFile and then the second on the outputPath
+        `${routeFileNoExt.replace(/\$/g, '$$$$')}.json`);
     }
     if (isSharedLambdas) {
         const outputSrcPathPage = normalizeIndexOutput(path_1.default.join('/', srcRoute == null
@@ -1453,6 +1457,11 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
             const shortPath = edgeFile.replace(/^pages\//, '');
             worker.edgeFunction.name = shortPath;
             source.edgeFunctions[shortPath] = worker.edgeFunction;
+            // we don't add the route for edge functions as these
+            // are already added in the routes-manifest under dynamicRoutes
+            if (worker.type === 'function') {
+                continue;
+            }
             const route = {
                 continue: true,
                 src: worker.routeSrc,
@@ -1464,14 +1473,9 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                     },
                 ],
             };
-            if (worker.type === 'function') {
-                route.dest = shortPath;
-            }
-            else {
-                route.middlewarePath = shortPath;
-                if (isCorrectMiddlewareOrder) {
-                    route.override = true;
-                }
+            route.middlewarePath = shortPath;
+            if (isCorrectMiddlewareOrder) {
+                route.override = true;
             }
             if (routesManifest.version > 3 && isDynamicRoute(worker.page)) {
                 source.dynamicRouteMap.set(worker.page, route);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.1.16",
+  "version": "3.1.19",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -44,7 +44,7 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "5.3.0",
+    "@vercel/build-utils": "5.3.1",
     "@vercel/nft": "0.21.0",
     "@vercel/routing-utils": "2.0.2",
     "async-sema": "3.0.1",
@@ -69,5 +69,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "47e3381c6df661168e8be335cc58df03f3cf2414"
+  "gitHead": "09c85f63d2aa47c147260d343767f6eea60e352c"
 }