Publish Stable

- vercel@28.2.4 - @vercel/frameworks@1.1.5 - @vercel/fs-detectors@3.1.0 - @vercel/static-build@1.0.23
[dev] fix middleware rewrites to relative paths that do not exist (#8535 )
2025-12-24 19:00:03 +00:00 · 2022-09-09 16:28:36 -05:00 · 2022-09-09 20:34:14 +00:00 · 2022-09-09 19:39:05 +00:00 · 2022-09-09 14:59:12 -04:00 · 2022-09-09 14:57:50 -04:00
50 changed files with 439 additions and 184 deletions
--- a/packages/build-utils/package.json
+++ b/packages/build-utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/build-utils",
-  "version": "5.4.1",
+  "version": "5.4.2",
  "license": "MIT",
  "main": "./dist/index.js",
  "types": "./dist/index.d.js",
--- a/packages/build-utils/src/types.ts
+++ b/packages/build-utils/src/types.ts
@@ -41,6 +41,7 @@ export interface Config {
  devCommand?: string;
  framework?: string | null;
  nodeVersion?: string;
+  middleware?: boolean;
  [key: string]: unknown;
 }

--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vercel",
-  "version": "28.2.1",
+  "version": "28.2.4",
  "preferGlobal": true,
  "license": "Apache-2.0",
  "description": "The command-line interface for Vercel",
@@ -41,16 +41,16 @@
    "node": ">= 14"
  },
  "dependencies": {
-    "@vercel/build-utils": "5.4.1",
-    "@vercel/go": "2.2.4",
-    "@vercel/hydrogen": "0.0.17",
-    "@vercel/next": "3.1.23",
-    "@vercel/node": "2.5.12",
-    "@vercel/python": "3.1.13",
-    "@vercel/redwood": "1.0.21",
-    "@vercel/remix": "1.0.22",
-    "@vercel/ruby": "1.3.30",
-    "@vercel/static-build": "1.0.21",
+    "@vercel/build-utils": "5.4.2",
+    "@vercel/go": "2.2.5",
+    "@vercel/hydrogen": "0.0.18",
+    "@vercel/next": "3.1.25",
+    "@vercel/node": "2.5.14",
+    "@vercel/python": "3.1.14",
+    "@vercel/redwood": "1.0.23",
+    "@vercel/remix": "1.0.24",
+    "@vercel/ruby": "1.3.31",
+    "@vercel/static-build": "1.0.23",
    "update-notifier": "5.1.0"
  },
  "devDependencies": {
@@ -95,9 +95,9 @@
    "@types/which": "1.3.2",
    "@types/write-json-file": "2.2.1",
    "@types/yauzl-promise": "2.1.0",
-    "@vercel/client": "12.2.3",
-    "@vercel/frameworks": "1.1.3",
-    "@vercel/fs-detectors": "2.1.0",
+    "@vercel/client": "12.2.4",
+    "@vercel/frameworks": "1.1.5",
+    "@vercel/fs-detectors": "3.1.0",
    "@vercel/fun": "1.0.4",
    "@vercel/ncc": "0.24.0",
    "@zeit/source-map-support": "0.6.2",
--- a/packages/cli/src/util/dev/server.ts
+++ b/packages/cli/src/util/dev/server.ts
@@ -101,6 +101,7 @@ import {
  isError,
  isSpawnError,
 } from '../is-error';
+import isURL from './is-url';
 import { pickOverrides } from '../projects/project-settings';

 const frontendRuntimeSet = new Set(
@@ -152,7 +153,7 @@ export default class DevServer {
  private filter: (path: string) => boolean;
  private podId: string;
  private devProcess?: ChildProcess;
-  private devProcessPort?: number;
+  private devProcessOrigin?: string;
  private devServerPids: Set<number>;
  private originalProjectSettings?: ProjectSettings;
  private projectSettings?: ProjectSettings;
@@ -180,11 +181,17 @@ export default class DevServer {
    this.caseSensitive = false;
    this.apiDir = null;
    this.apiExtensions = new Set();
+
    this.proxy = httpProxy.createProxyServer({
      changeOrigin: true,
      ws: true,
      xfwd: true,
    });
+    this.proxy.on('proxyRes', proxyRes => {
+      // override "server" header, like production
+      proxyRes.headers['server'] = 'Vercel';
+    });
+
    this.server = http.createServer(this.devServerHandler);
    this.server.timeout = 0; // Disable timeout
    this.stopping = false;
@@ -1007,14 +1014,14 @@ export default class DevServer {
    // Configure the server to forward WebSocket "upgrade" events to the proxy.
    this.server.on('upgrade', async (req, socket, head) => {
      await this.startPromise;
-      if (!this.devProcessPort) {
+      if (!this.devProcessOrigin) {
        this.output.debug(
          `Detected "upgrade" event, but closing socket because no frontend dev server is running`
        );
        socket.destroy();
        return;
      }
-      const target = `http://127.0.0.1:${this.devProcessPort}`;
+      const target = this.devProcessOrigin;
      this.output.debug(`Detected "upgrade" event, proxying to ${target}`);
      this.proxy.ws(req, socket, head, { target });
    });
@@ -1560,15 +1567,35 @@ export default class DevServer {
          }

          if (rewritePath) {
-            // TODO: add validation?
            debug(`Detected rewrite path from middleware: "${rewritePath}"`);
            prevUrl = rewritePath;

-            // Retain orginal pathname, but override query parameters from the rewrite
            const beforeRewriteUrl = req.url || '/';
-            const rewriteUrlParsed = url.parse(beforeRewriteUrl);
-            rewriteUrlParsed.search = url.parse(rewritePath).search;
-            req.url = url.format(rewriteUrlParsed);
+
+            if (isURL(rewritePath)) {
+              const rewriteUrlParsed = new URL(rewritePath);
+
+              // `this.address` already has localhost normalized from ip4 and ip6 values
+              const devServerParsed = new URL(this.address);
+              if (devServerParsed.origin === rewriteUrlParsed.origin) {
+                // remove origin, leaving the path
+                req.url =
+                  rewritePath.slice(rewriteUrlParsed.origin.length) || '/';
+                prevUrl = req.url;
+              } else {
+                // Proxy to absolute URL with different origin
+                debug(`ProxyPass: ${rewritePath}`);
+                this.setResponseHeaders(res, requestId);
+                proxyPass(req, res, rewritePath, this, requestId);
+                return;
+              }
+            } else {
+              // Retain orginal pathname, but override query parameters from the rewrite
+              const rewriteUrlParsed = url.parse(beforeRewriteUrl);
+              rewriteUrlParsed.search = url.parse(rewritePath).search;
+              req.url = url.format(rewriteUrlParsed);
+            }
+
            debug(
              `Rewrote incoming HTTP URL from "${beforeRewriteUrl}" to "${req.url}"`
            );
@@ -1617,12 +1644,16 @@ export default class DevServer {
        missRoutes,
        phase
      );
-      prevUrl =
-        routeResult.continue && routeResult.dest
-          ? getReqUrl(routeResult)
-          : req.url;
-      prevHeaders =
-        routeResult.continue && routeResult.headers ? routeResult.headers : {};
+
+      if (routeResult.continue) {
+        if (routeResult.dest) {
+          prevUrl = getReqUrl(routeResult);
+        }
+
+        if (routeResult.headers) {
+          prevHeaders = routeResult.headers;
+        }
+      }

      if (routeResult.isDestUrl) {
        // Mix the `routes` result dest query params into the req path
@@ -1795,8 +1826,8 @@ export default class DevServer {

    if (!match) {
      // If the dev command is started, then proxy to it
-      if (this.devProcessPort) {
-        const upstream = `http://127.0.0.1:${this.devProcessPort}`;
+      if (this.devProcessOrigin) {
+        const upstream = this.devProcessOrigin;
        debug(`Proxying to frontend dev server: ${upstream}`);

        // Add the Vercel platform proxy request headers
@@ -1975,7 +2006,7 @@ export default class DevServer {
    // - when there is no asset
    // - when the asset is not a Lambda (the dev server must take care of all static files)
    if (
-      this.devProcessPort &&
+      this.devProcessOrigin &&
      (!foundAsset || (foundAsset && foundAsset.asset.type !== 'Lambda'))
    ) {
      debug('Proxying to frontend dev server');
@@ -1987,14 +2018,7 @@ export default class DevServer {
      }

      this.setResponseHeaders(res, requestId);
-      return proxyPass(
-        req,
-        res,
-        `http://127.0.0.1:${this.devProcessPort}`,
-        this,
-        requestId,
-        false
-      );
+      return proxyPass(req, res, this.devProcessOrigin, this, requestId, false);
    }

    if (!foundAsset) {
@@ -2323,12 +2347,11 @@ export default class DevServer {

    p.on('exit', (code, signal) => {
      this.output.debug(`Dev command exited with "${signal || code}"`);
-      this.devProcessPort = undefined;
+      this.devProcessOrigin = undefined;
    });

-    await checkForPort(port, 1000 * 60 * 5);
-
-    this.devProcessPort = port;
+    const devProcessHost = await checkForPort(port, 1000 * 60 * 5);
+    this.devProcessOrigin = `http://${devProcessHost}:${port}`;
  }
 }

@@ -2616,15 +2639,29 @@ function needsBlockingBuild(buildMatch: BuildMatch): boolean {
  return typeof builder.shouldServe !== 'function';
 }

-async function checkForPort(port: number, timeout: number): Promise<void> {
-  const opts = { host: '127.0.0.1' };
+async function checkForPort(port: number, timeout: number): Promise<string> {
+  let host;
  const start = Date.now();
-  while (!(await isPortReachable(port, opts))) {
+  while (!(host = await getReachableHostOnPort(port))) {
    if (Date.now() - start > timeout) {
-      throw new Error(`Detecting port ${port} timed out after ${timeout}ms`);
+      break;
    }
    await sleep(100);
  }
+  if (!host) {
+    throw new Error(`Detecting port ${port} timed out after ${timeout}ms`);
+  }
+  return host;
+}
+
+async function getReachableHostOnPort(port: number): Promise<string | false> {
+  const optsIpv4 = { host: '127.0.0.1' };
+  const optsIpv6 = { host: '::1' };
+  const results = await Promise.all([
+    isPortReachable(port, optsIpv6).then(r => r && `[${optsIpv6.host}]`),
+    isPortReachable(port, optsIpv4).then(r => r && optsIpv4.host),
+  ]);
+  return results.find(Boolean) || false;
 }

 function filterFrontendBuilds(build: Builder) {
--- a/packages/cli/test/dev/fixtures/middleware-rewrite-404/api/edge.ts
+++ b/packages/cli/test/dev/fixtures/middleware-rewrite-404/api/edge.ts
@@ -0,0 +1,7 @@
+export const config = {
+  runtime: 'experimental-edge',
+};
+
+export default async function edge(request: Request, event: Event) {
+  return new Response('heyo');
+}
--- a/packages/cli/test/dev/fixtures/middleware-rewrite-404/index.html
+++ b/packages/cli/test/dev/fixtures/middleware-rewrite-404/index.html
@@ -0,0 +1 @@
+<h1>Hello from Index</h1>
--- a/packages/cli/test/dev/fixtures/middleware-rewrite-404/middleware.ts
+++ b/packages/cli/test/dev/fixtures/middleware-rewrite-404/middleware.ts
@@ -0,0 +1,21 @@
+export const config = {
+  runtime: 'experimental-edge',
+};
+
+export default async function edge(request: Request, event: Event) {
+  if (request.url.indexOf('/index.html') > -1) {
+    return new Response(null, {
+      headers: {
+        'x-middleware-rewrite': '/does-not-exist.html',
+      },
+    });
+  }
+
+  if (request.url.indexOf('/api/edge') > -1) {
+    return new Response(null, {
+      headers: {
+        'x-middleware-rewrite': '/api/does-not-exist',
+      },
+    });
+  }
+}
--- a/packages/cli/test/dev/fixtures/middleware-rewrite/middleware.js
+++ b/packages/cli/test/dev/fixtures/middleware-rewrite/middleware.js
@@ -1,6 +1,15 @@
 export default req => {
  const url = new URL(req.url);

+  const rewriteTo = url.searchParams.get('to');
+  if (rewriteTo) {
+    return new Response(null, {
+      headers: {
+        'x-middleware-rewrite': rewriteTo,
+      },
+    });
+  }
+
  if (url.pathname === '/') {
    // Pass-through "index.html" page
    return new Response(null, {
--- a/packages/cli/test/dev/fixtures/vite-dev/package.json
+++ b/packages/cli/test/dev/fixtures/vite-dev/package.json
@@ -1,7 +1,6 @@
 {
  "private": true,
  "scripts": {
-    "dev": "vite --port $PORT",
    "build": "vite build",
    "serve": "vite preview"
  },
--- a/packages/cli/test/dev/fixtures/vite-dev/vercel.json
+++ b/packages/cli/test/dev/fixtures/vite-dev/vercel.json
@@ -0,0 +1,3 @@
+{
+  "devCommand": "vite --port $PORT --host ::1"
+}
--- a/packages/cli/test/dev/integration-4.test.ts
+++ b/packages/cli/test/dev/integration-4.test.ts
@@ -445,11 +445,7 @@ test(
 test(
  '[vercel dev] Middleware that has no response',
  testFixtureStdio('middleware-no-response', async (testPath: any) => {
-    await testPath(
-      500,
-      '/api/hello',
-      'A server error has occurred\n\nEDGE_FUNCTION_INVOCATION_FAILED'
-    );
+    await testPath(200, '/api/hello', 'hello from a serverless function');
  })
 );

@@ -461,9 +457,42 @@ test(
    await testPath(200, '/another', '<h1>Another</h1>');
    await testPath(200, '/another.html', '<h1>Another</h1>');
    await testPath(200, '/foo', '<h1>Another</h1>');
+    // different origin
+    await testPath(200, '?to=http://example.com', /Example Domain/);
  })
 );

+test('[vercel dev] Middleware rewrites with same origin', async () => {
+  const directory = fixture('middleware-rewrite');
+  const { dev, port, readyResolver } = await testFixture(directory);
+
+  try {
+    dev.unref();
+    await readyResolver;
+
+    let response = await fetch(
+      `http://localhost:${port}?to=http://localhost:${port}`
+    );
+    validateResponseHeaders(response);
+    expect(response.status).toBe(200);
+    expect(await response.text()).toMatch(/<h1>Index<\/h1>/);
+
+    response = await fetch(
+      `http://localhost:${port}?to=http://127.0.0.1:${port}`
+    );
+    validateResponseHeaders(response);
+    expect(response.status).toBe(200);
+    expect(await response.text()).toMatch(/<h1>Index<\/h1>/);
+
+    response = await fetch(`http://localhost:${port}?to=http://[::1]:${port}`);
+    validateResponseHeaders(response);
+    expect(response.status).toBe(200);
+    expect(await response.text()).toMatch(/<h1>Index<\/h1>/);
+  } finally {
+    await dev.kill('SIGTERM');
+  }
+});
+
 test(
  '[vercel dev] Middleware that rewrites with custom query params',
  testFixtureStdio('middleware-rewrite-query', async (testPath: any) => {
@@ -481,6 +510,14 @@ test(
  })
 );

+test(
+  '[vercel dev] Middleware that rewrites to 404s',
+  testFixtureStdio('middleware-rewrite-404', async (testPath: any) => {
+    await testPath(404, '/api/edge', /NOT_FOUND/);
+    await testPath(404, '/index.html', /NOT_FOUND/);
+  })
+);
+
 test(
  '[vercel dev] Middleware that redirects',
  testFixtureStdio('middleware-redirect', async (testPath: any) => {
--- a/packages/cli/test/dev/utils.js
+++ b/packages/cli/test/dev/utils.js
@@ -13,6 +13,7 @@ const {

 jest.setTimeout(6 * 60 * 1000);

+const isCI = !!process.env.CI;
 const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
 const isCanary = () => getDistTag(cliVersion) === 'canary';

@@ -52,7 +53,7 @@ function fetchWithRetry(url, opts = {}) {
      return res;
    },
    {
-      retries: opts.retries || 3,
+      retries: opts.retries ?? 3,
      factor: 1,
    }
  );
@@ -150,9 +151,9 @@ async function testPath(
  fetchOpts = {}
 ) {
  const opts = {
+    retries: isCI ? 5 : 0,
    ...fetchOpts,
    redirect: 'manual-dont-change',
-    retries: 5,
    status,
  };
  const url = `${origin}${path}`;
@@ -330,7 +331,7 @@ function testFixtureStdio(
                Authorization: `Bearer ${token}`,
              },
              body: JSON.stringify(projectSettings),
-              retries: 3,
+              retries: isCI ? 3 : 0,
              status: 200,
            }
          );
--- a/packages/cli/test/unit/commands/build.test.ts
+++ b/packages/cli/test/unit/commands/build.test.ts
@@ -895,6 +895,12 @@ describe('build', () => {
  });

  it('should apply project settings overrides from "vercel.json"', async () => {
+    if (process.platform === 'win32') {
+      // this test runs a build command with `mkdir -p` which is unsupported on Windows
+      console.log('Skipping test on Windows');
+      return;
+    }
+
    const cwd = fixture('project-settings-override');
    const output = join(cwd, '.vercel/output');
    try {
--- a/packages/cli/test/unit/util/build/import-builders.test.ts
+++ b/packages/cli/test/unit/util/build/import-builders.test.ts
@@ -28,6 +28,12 @@ describe('importBuilders()', () => {
  });

  it('should import 3rd party Builders', async () => {
+    if (process.platform === 'win32') {
+      // this test creates symlinks which require admin by default on Windows
+      console.log('Skipping test on Windows');
+      return;
+    }
+
    const cwd = await getWriteableDirectory();
    try {
      const spec = 'vercel-deno@2.0.1';
@@ -46,6 +52,12 @@ describe('importBuilders()', () => {
  });

  it('should import legacy `@now/build-utils` Builders', async () => {
+    if (process.platform === 'win32') {
+      // this test creates symlinks which require admin by default on Windows
+      console.log('Skipping test on Windows');
+      return;
+    }
+
    const cwd = await getWriteableDirectory();
    try {
      const spec = '@frontity/now@1.2.0';
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/client",
-  "version": "12.2.3",
+  "version": "12.2.4",
  "main": "dist/index.js",
  "typings": "dist/index.d.ts",
  "homepage": "https://vercel.com",
@@ -43,7 +43,7 @@
    ]
  },
  "dependencies": {
-    "@vercel/build-utils": "5.4.1",
+    "@vercel/build-utils": "5.4.2",
    "@vercel/routing-utils": "2.0.2",
    "@zeit/fetch": "5.2.0",
    "async-retry": "1.2.3",
--- a/packages/frameworks/logos/next-dark.svg
+++ b/packages/frameworks/logos/next-dark.svg
@@ -1 +1 @@
-<svg width="48" height="48" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M22.428.013c-.103.01-.431.042-.727.066C14.883.693 8.497 4.37 4.453 10.024A23.754 23.754 0 0 0 .216 20.51C.023 21.828 0 22.217 0 24.005c0 1.787.023 2.177.216 3.495 1.304 9.012 7.718 16.584 16.417 19.39 1.558.501 3.2.844 5.068 1.05.727.08 3.87.08 4.598 0 3.224-.356 5.954-1.154 8.648-2.529.412-.21.492-.267.436-.314-.038-.028-1.797-2.388-3.909-5.24l-3.838-5.184-4.809-7.117c-2.646-3.913-4.824-7.112-4.842-7.112-.019-.005-.038 3.157-.047 7.018-.014 6.76-.019 7.033-.103 7.192-.122.23-.216.324-.413.427-.15.075-.282.09-.99.09h-.812l-.216-.137a.878.878 0 0 1-.314-.342l-.099-.211.01-9.407.014-9.41.145-.184c.075-.098.235-.225.347-.286.193-.094.268-.103 1.08-.103.957 0 1.116.038 1.365.31.07.075 2.674 3.997 5.79 8.721s7.376 11.175 9.469 14.342l3.8 5.756.192-.127c1.704-1.107 3.505-2.683 4.932-4.325a23.888 23.888 0 0 0 5.65-12.268c.192-1.319.215-1.708.215-3.495 0-1.788-.023-2.177-.216-3.495-1.304-9.013-7.718-16.584-16.417-19.39C29.832.623 28.199.28 26.369.074c-.45-.047-3.551-.099-3.94-.061zm9.825 14.515a.947.947 0 0 1 .474.554c.038.122.047 2.73.038 8.608l-.014 8.436-1.488-2.28-1.492-2.28v-6.132c0-3.964.019-6.193.047-6.3a.957.957 0 0 1 .465-.592c.192-.098.262-.108 1-.108.694 0 .816.01.97.094z" fill="#fff"/></svg>
+<svg width="48" height="48" fill="none" xmlns="http://www.w3.org/2000/svg"><mask id="mask" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="48" height="48"><circle cx="24" cy="24" r="24" fill="#000"/></mask><g mask="url(#mask)"><circle cx="24" cy="24" r="23.2" fill="#000" stroke="#fff" stroke-width="1.6"/><path d="M39.8687 42.0055L18.4378 14.4H14.3999V33.592H17.6302V18.5023L37.333 43.9587C38.222 43.3637 39.069 42.7108 39.8687 42.0055Z" fill="url(#gradient0)"/><rect x="30.6667" y="14.4" width="3.2" height="19.2" fill="url(#gradient1)"/></g><defs><linearGradient id="gradient0" x1="29.0666" y1="31.0667" x2="38.5332" y2="42.8" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="gradient1" x1="32.2667" y1="14.4" x2="32.2132" y2="28.5001" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
--- a/packages/frameworks/logos/next.svg
+++ b/packages/frameworks/logos/next.svg
@@ -1 +1 @@
-<svg width="48" height="48" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M22.428.013c-.103.01-.431.042-.727.066C14.883.693 8.497 4.37 4.453 10.024A23.754 23.754 0 0 0 .216 20.51C.023 21.828 0 22.217 0 24.005c0 1.787.023 2.177.216 3.495 1.304 9.012 7.718 16.584 16.417 19.39 1.558.501 3.2.844 5.068 1.05.727.08 3.87.08 4.598 0 3.224-.356 5.954-1.154 8.648-2.529.412-.21.492-.267.436-.314-.038-.028-1.797-2.388-3.909-5.24l-3.838-5.184-4.809-7.117c-2.646-3.913-4.824-7.112-4.842-7.112-.019-.005-.038 3.157-.047 7.018-.014 6.76-.019 7.033-.103 7.192-.122.23-.216.324-.413.427-.15.075-.282.09-.99.09h-.812l-.216-.137a.878.878 0 0 1-.314-.342l-.099-.211.01-9.407.014-9.41.145-.184c.075-.098.235-.225.347-.286.193-.094.268-.103 1.08-.103.957 0 1.116.038 1.365.31.07.075 2.674 3.997 5.79 8.721s7.376 11.175 9.469 14.342l3.8 5.756.192-.127c1.704-1.107 3.505-2.683 4.932-4.325a23.888 23.888 0 0 0 5.65-12.268c.192-1.319.215-1.708.215-3.495 0-1.788-.023-2.177-.216-3.495-1.304-9.013-7.718-16.584-16.417-19.39C29.832.623 28.199.28 26.369.074c-.45-.047-3.551-.099-3.94-.061zm9.825 14.515a.947.947 0 0 1 .474.554c.038.122.047 2.73.038 8.608l-.014 8.436-1.488-2.28-1.492-2.28v-6.132c0-3.964.019-6.193.047-6.3a.957.957 0 0 1 .465-.592c.192-.098.262-.108 1-.108.694 0 .816.01.97.094z" fill="#000"/></svg>
+<svg width="48" height="48" fill="none" xmlns="http://www.w3.org/2000/svg"><mask id="mask" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="48" height="48"><circle cx="24" cy="24" r="24" fill="#000"/></mask><g mask="url(#mask)"><circle cx="24" cy="24" r="23.2" fill="#000" stroke="#000" stroke-width="1.6"/><path d="M39.8687 42.0055L18.4378 14.4H14.3999V33.592H17.6302V18.5023L37.333 43.9587C38.222 43.3637 39.069 42.7108 39.8687 42.0055Z" fill="url(#gradient0)"/><rect x="30.6667" y="14.4" width="3.2" height="19.2" fill="url(#gradient1)"/></g><defs><linearGradient id="gradient0" x1="29.0666" y1="31.0667" x2="38.5332" y2="42.8" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="gradient1" x1="32.2667" y1="14.4" x2="32.2132" y2="28.5001" gradientUnits="userSpaceOnUse"><stop stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient></defs></svg>
--- a/packages/frameworks/package.json
+++ b/packages/frameworks/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/frameworks",
-  "version": "1.1.3",
+  "version": "1.1.5",
  "main": "./dist/frameworks.js",
  "types": "./dist/frameworks.d.ts",
  "files": [
--- a/packages/frameworks/src/frameworks.ts
+++ b/packages/frameworks/src/frameworks.ts
@@ -1785,10 +1785,16 @@ export const frameworks = [
    website: 'https://www.sanity.io',
    envPrefix: 'SANITY_STUDIO_',
    detectors: {
-      every: [
+      some: [
        {
          path: 'sanity.json',
        },
+        {
+          path: 'sanity.config.js',
+        },
+        {
+          path: 'sanity.config.ts',
+        },
      ],
    },
    settings: {
--- a/packages/fs-detectors/package.json
+++ b/packages/fs-detectors/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/fs-detectors",
-  "version": "2.1.0",
+  "version": "3.1.0",
  "description": "Vercel filesystem detectors",
  "main": "./dist/index.js",
  "types": "./dist/index.d.ts",
@@ -19,7 +19,7 @@
    "test-unit": "yarn test"
  },
  "dependencies": {
-    "@vercel/frameworks": "1.1.3",
+    "@vercel/frameworks": "1.1.5",
    "@vercel/routing-utils": "2.0.2",
    "glob": "8.0.3",
    "js-yaml": "4.1.0",
--- a/packages/fs-detectors/src/detectors/filesystem.ts
+++ b/packages/fs-detectors/src/detectors/filesystem.ts
@@ -1,3 +1,5 @@
+import { posix as posixPath } from 'path';
+
 export interface Stat {
  name: string;
  path: string;
@@ -76,12 +78,43 @@ export abstract class DetectorFilesystem {

  /**
   * Returns a list of Stat objects from the current working directory.
+   * @param dirPath The path of the directory to read.
+   * @param options.potentialFiles optional. Array of potential file names (relative to the path).  If provided, these will be used to mark the filesystem caches as existing or not existing.
   */
-  public readdir = async (name: string): Promise<Stat[]> => {
-    let p = this.readdirCache.get(name);
+  public readdir = async (
+    dirPath: string,
+    options?: { potentialFiles?: string[] }
+  ): Promise<Stat[]> => {
+    let p = this.readdirCache.get(dirPath);
    if (!p) {
-      p = this._readdir(name);
-      this.readdirCache.set(name, p);
+      p = this._readdir(dirPath);
+      this.readdirCache.set(dirPath, p);
+
+      const directoryContent = await p;
+      const directoryFiles = new Set<string>();
+
+      for (const file of directoryContent) {
+        if (file.type === 'file') {
+          // we know this file exists, mark it as so on the filesystem
+          this.fileCache.set(file.path, Promise.resolve(true));
+          this.pathCache.set(file.path, Promise.resolve(true));
+          directoryFiles.add(file.name);
+        }
+      }
+
+      if (options?.potentialFiles) {
+        // calculate the set of paths that truly do not exist
+        const filesThatDoNotExist = options.potentialFiles.filter(
+          path => !directoryFiles.has(path)
+        );
+        for (const filePath of filesThatDoNotExist) {
+          const fullFilePath =
+            dirPath === '/' ? filePath : posixPath.join(dirPath, filePath);
+          // we know this file does not exist, mark it as so on the filesystem
+          this.fileCache.set(fullFilePath, Promise.resolve(false));
+          this.pathCache.set(fullFilePath, Promise.resolve(false));
+        }
+      }
    }
    return p;
  };
@@ -98,10 +131,9 @@ export abstract class DetectorFilesystem {
   * @param name the name of the file to write
   * @param content The content of the file
   */
-  public writeFile(name: string, content?: string): void {
-    if (content)
-      this.readFileCache.set(name, Promise.resolve(Buffer.from(content)));
+  public writeFile = async (name: string, content: string): Promise<void> => {
+    this.readFileCache.set(name, Promise.resolve(Buffer.from(content)));
    this.fileCache.set(name, Promise.resolve(true));
    this.pathCache.set(name, Promise.resolve(true));
-  }
+  };
 }
--- a/packages/fs-detectors/test/unit.framework-detector.test.ts
+++ b/packages/fs-detectors/test/unit.framework-detector.test.ts
@@ -135,11 +135,18 @@ describe('DetectorFilesystem', () => {
    };

    const fs = new VirtualFilesystem(files);
+    const hasPathSpy = jest.spyOn(fs, '_hasPath');

-    expect(await fs.readdir('/')).toEqual([
+    expect(await fs.readdir('/', { potentialFiles: ['config.rb'] })).toEqual([
      { name: 'package.json', path: 'package.json', type: 'file' },
      { name: 'packages', path: 'packages', type: 'dir' },
    ]);
+    expect(await fs.hasPath('package.json')).toBe(true);
+    expect(hasPathSpy).not.toHaveBeenCalled();
+    expect(await fs.hasPath('config.rb')).toBe(false);
+    expect(hasPathSpy).not.toHaveBeenCalled();
+    expect(await fs.hasPath('tsconfig.json')).toBe(false);
+    expect(hasPathSpy).toHaveBeenCalled();

    expect(await fs.readdir('packages')).toEqual([
      { name: 'app1', path: 'packages/app1', type: 'dir' },
@@ -151,24 +158,37 @@ describe('DetectorFilesystem', () => {
      { name: 'app2', path: 'packages/app2', type: 'dir' },
    ]);

-    expect(await fs.readdir('packages/app1')).toEqual([
+    expect(
+      await fs.readdir('packages/app1', { potentialFiles: ['package.json'] })
+    ).toEqual([
      {
        name: 'package.json',
        path: 'packages/app1/package.json',
        type: 'file',
      },
    ]);
+
+    hasPathSpy.mock.calls.length = 0;
+    expect(await fs.hasPath('packages/app1/package.json')).toBe(true);
+    expect(hasPathSpy).not.toHaveBeenCalled();
  });

  it('should be able to write files', async () => {
    const files = {};
    const fs = new VirtualFilesystem(files);
+    const hasPathSpy = jest.spyOn(fs, '_hasPath');
+    const isFileSpy = jest.spyOn(fs, '_isFile');
+    const readFileSpy = jest.spyOn(fs, '_readFile');

-    fs.writeFile('file.txt', 'Hello World');
+    await fs.writeFile('file.txt', 'Hello World');

    expect(await fs.readFile('file.txt')).toEqual(Buffer.from('Hello World'));
    expect(await fs.hasPath('file.txt')).toBe(true);
    expect(await fs.isFile('file.txt')).toBe(true);
+    // We expect that the fs returned values from it's caches instead of calling the underlying functions
+    expect(hasPathSpy).not.toHaveBeenCalled();
+    expect(isFileSpy).not.toHaveBeenCalled();
+    expect(readFileSpy).not.toHaveBeenCalled();
  });

  it('should be able to change directories', async () => {
--- a/packages/go/package.json
+++ b/packages/go/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/go",
-  "version": "2.2.4",
+  "version": "2.2.5",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/go",
@@ -35,7 +35,7 @@
    "@types/jest": "28.1.6",
    "@types/node-fetch": "^2.3.0",
    "@types/tar": "^4.0.0",
-    "@vercel/build-utils": "5.4.1",
+    "@vercel/build-utils": "5.4.2",
    "@vercel/ncc": "0.24.0",
    "async-retry": "1.3.1",
    "execa": "^1.0.0",
--- a/packages/hydrogen/package.json
+++ b/packages/hydrogen/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/hydrogen",
-  "version": "0.0.17",
+  "version": "0.0.18",
  "license": "MIT",
  "main": "./dist/index.js",
  "homepage": "https://vercel.com/docs",
@@ -21,7 +21,7 @@
  "devDependencies": {
    "@types/jest": "27.5.1",
    "@types/node": "*",
-    "@vercel/build-utils": "5.4.1",
+    "@vercel/build-utils": "5.4.2",
    "typescript": "4.6.4"
  }
 }
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/next",
-  "version": "3.1.23",
+  "version": "3.1.25",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -44,8 +44,8 @@
    "@types/semver": "6.0.0",
    "@types/text-table": "0.2.1",
    "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "5.4.1",
-    "@vercel/nft": "0.21.0",
+    "@vercel/build-utils": "5.4.2",
+    "@vercel/nft": "0.22.1",
    "@vercel/routing-utils": "2.0.2",
    "async-sema": "3.0.1",
    "buffer-crc32": "0.2.13",
--- a/packages/next/src/index.ts
+++ b/packages/next/src/index.ts
@@ -2636,7 +2636,10 @@ async function getServerlessPages(params: {
    for (const [entry, normalizedEntry] of Object.entries(
      params.appPathRoutesManifest
    )) {
-      const normalizedPath = `${path.join('.', normalizedEntry)}.js`;
+      const normalizedPath = `${path.join(
+        '.',
+        normalizedEntry === '/' ? '/index' : normalizedEntry
+      )}.js`;
      const globPath = `${path.join('.', entry)}.js`;

      if (appPaths[globPath]) {
--- a/packages/next/src/utils.ts
+++ b/packages/next/src/utils.ts
@@ -2352,7 +2352,22 @@ export async function getMiddlewareBundle({

    for (const worker of workerConfigs.values()) {
      const edgeFile = worker.edgeFunction.name;
-      const shortPath = edgeFile.replace(/^pages\//, '');
+      let shortPath = edgeFile;
+
+      // Replacing the folder prefix for the page
+      //
+      // For `pages/`, use file base name directly:
+      //    pages/index -> index
+      // For `app/`, use folder name, handle the root page as index:
+      //    app/route/page -> route
+      //    app/page -> index
+      //    app/index/page -> index/index
+      if (shortPath.startsWith('pages/')) {
+        shortPath = shortPath.replace(/^pages\//, '');
+      } else if (shortPath.startsWith('app/') && shortPath.endsWith('/page')) {
+        shortPath =
+          shortPath.replace(/^app\//, '').replace(/(^|\/)page$/, '') || 'index';
+      }

      worker.edgeFunction.name = shortPath;
      source.edgeFunctions[shortPath] = worker.edgeFunction;
--- a/packages/next/test/fixtures/00-app-dir-edge/app/edge/page.server.js
+++ b/packages/next/test/fixtures/00-app-dir-edge/app/edge/page.server.js
@@ -0,0 +1,7 @@
+export default function Page() {
+  return <p>edge</p>;
+}
+
+export const config = {
+  runtime: 'experimental-edge',
+};
--- a/packages/next/test/fixtures/00-app-dir-edge/app/index/page.server.js
+++ b/packages/next/test/fixtures/00-app-dir-edge/app/index/page.server.js
@@ -0,0 +1,7 @@
+export default function page() {
+  return 'index/page';
+}
+
+export const config = {
+  runtime: 'experimental-edge',
+};
--- a/packages/next/test/fixtures/00-app-dir-edge/app/page.server.js
+++ b/packages/next/test/fixtures/00-app-dir-edge/app/page.server.js
@@ -0,0 +1,7 @@
+export default function page() {
+  return 'page';
+}
+
+export const config = {
+  runtime: 'experimental-edge',
+};
--- a/packages/next/test/fixtures/00-app-dir-edge/next.config.js
+++ b/packages/next/test/fixtures/00-app-dir-edge/next.config.js
@@ -0,0 +1,9 @@
+module.exports = {
+  experimental: {
+    appDir: true,
+    runtime: 'experimental-edge',
+    serverComponents: true,
+    legacyBrowsers: false,
+    browsersListForSwc: true,
+  },
+};
--- a/packages/next/test/fixtures/00-app-dir-edge/package.json
+++ b/packages/next/test/fixtures/00-app-dir-edge/package.json
@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+    "next": "canary",
+    "react": "experimental",
+    "react-dom": "experimental"
+  }
+}
--- a/packages/next/test/fixtures/00-app-dir-edge/vercel.json
+++ b/packages/next/test/fixtures/00-app-dir-edge/vercel.json
@@ -0,0 +1,15 @@
+{
+  "builds": [
+    {
+      "src": "package.json",
+      "use": "@vercel/next"
+    }
+  ],
+  "probes": [
+    {
+      "path": "/edge",
+      "status": 200,
+      "mustContain": "edge"
+    }
+  ]
+}
--- a/packages/next/test/fixtures/00-app-dir/app/page.server.js
+++ b/packages/next/test/fixtures/00-app-dir/app/page.server.js
@@ -0,0 +1,3 @@
+export default function Page() {
+  return <p>index app page</p>;
+}
--- a/packages/next/test/fixtures/00-app-dir/package.json
+++ b/packages/next/test/fixtures/00-app-dir/package.json
@@ -1,6 +1,6 @@
 {
  "dependencies": {
-    "next": "https://files-26yo0dy1b-ijjk-testing.vercel.app",
+    "next": "canary",
    "react": "experimental",
    "react-dom": "experimental"
  }
--- a/packages/next/test/fixtures/00-app-dir/pages/index.js
+++ b/packages/next/test/fixtures/00-app-dir/pages/index.js
@@ -1,9 +0,0 @@
-import Link from 'next/link';
-export default function Page(props) {
-  return (
-    <>
-      <p>hello from pages/index</p>
-      <Link href="/dashboard">Dashboard</Link>
-    </>
-  );
-}
--- a/packages/next/test/fixtures/00-app-dir/vercel.json
+++ b/packages/next/test/fixtures/00-app-dir/vercel.json
@@ -24,7 +24,7 @@
    {
      "path": "/",
      "status": 200,
-      "mustContain": "hello from pages/index"
+      "mustContain": "index app page"
    },
    {
      "path": "/blog/123",
--- a/packages/next/test/integration/index.test.js
+++ b/packages/next/test/integration/index.test.js
@@ -17,7 +17,6 @@ it('should build with app-dir correctly', async () => {
  for (const key of Object.keys(buildResult.output)) {
    if (buildResult.output[key].type === 'Lambda') {
      lambdas.add(buildResult.output[key]);
-      console.log('found lambda', key);
    }
  }
  expect(lambdas.size).toBe(1);
@@ -27,6 +26,26 @@ it('should build with app-dir correctly', async () => {
  expect(buildResult.output['dashboard/deployments/[id]']).toBeDefined();
 });

+it('should build with app-dir in edg runtime correctly', async () => {
+  const { buildResult } = await runBuildLambda(
+    path.join(__dirname, '../fixtures/00-app-dir-edge')
+  );
+
+  console.log('buildResult', buildResult);
+  const edgeFunctions = new Set();
+
+  for (const key of Object.keys(buildResult.output)) {
+    if (buildResult.output[key].type === 'EdgeFunction') {
+      edgeFunctions.add(buildResult.output[key]);
+    }
+  }
+
+  expect(edgeFunctions.size).toBe(3);
+  expect(buildResult.output['edge']).toBeDefined();
+  expect(buildResult.output['index']).toBeDefined();
+  expect(buildResult.output['index/index']).toBeDefined();
+});
+
 it('should show error from basePath with legacy monorepo build', async () => {
  let error;

--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/node",
-  "version": "2.5.12",
+  "version": "2.5.14",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -29,12 +29,12 @@
    }
  },
  "dependencies": {
-    "@edge-runtime/vm": "1.1.0-beta.23",
+    "@edge-runtime/vm": "1.1.0-beta.32",
    "@types/node": "*",
-    "@vercel/build-utils": "5.4.1",
+    "@vercel/build-utils": "5.4.2",
    "@vercel/node-bridge": "3.0.0",
    "@vercel/static-config": "2.0.3",
-    "edge-runtime": "1.1.0-beta.23",
+    "edge-runtime": "1.1.0-beta.32",
    "esbuild": "0.14.47",
    "exit-hook": "2.2.1",
    "node-fetch": "2.6.7",
@@ -53,7 +53,7 @@
    "@types/node-fetch": "^2.6.1",
    "@types/test-listen": "1.1.0",
    "@vercel/ncc": "0.24.0",
-    "@vercel/nft": "0.22.0",
+    "@vercel/nft": "0.22.1",
    "content-type": "1.0.4",
    "cookie": "0.4.0",
    "etag": "1.8.1",
--- a/packages/node/src/dev-server.ts
+++ b/packages/node/src/dev-server.ts
@@ -151,7 +151,8 @@ async function serializeRequest(message: IncomingMessage) {

 async function compileUserCode(
  entrypointPath: string,
-  entrypointLabel: string
+  entrypointLabel: string,
+  isMiddleware: boolean
 ): Promise<undefined | { userCode: string; wasmAssets: WasmAssets }> {
  const { wasmAssets, plugin: edgeWasmPlugin } = createEdgeWasmPlugin();
  try {
@@ -176,6 +177,8 @@ async function compileUserCode(
    const userCode = `
      ${compiledFile.text};

+      const isMiddleware = ${isMiddleware};
+
      addEventListener('fetch', async (event) => {
        try {
          let serializedRequest = await event.request.text();
@@ -205,7 +208,16 @@ async function compileUserCode(
          let response = await edgeHandler(event.request, event);

          if (!response) {
-            throw new Error('Edge Function "${entrypointLabel}" did not return a response.');
+            if (isMiddleware) {
+              // allow empty responses to pass through
+              response = new Response(null, {
+                headers: {
+                  'x-middleware-next': '1',
+                },
+              });
+            } else {
+              throw new Error('Edge Function "${entrypointLabel}" did not return a response.');
+            }
          }

          return event.respondWith(response);
@@ -280,9 +292,14 @@ async function createEdgeRuntime(params?: {

 async function createEdgeEventHandler(
  entrypointPath: string,
-  entrypointLabel: string
+  entrypointLabel: string,
+  isMiddleware: boolean
 ): Promise<(request: IncomingMessage) => Promise<VercelProxyResponse>> {
-  const userCode = await compileUserCode(entrypointPath, entrypointLabel);
+  const userCode = await compileUserCode(
+    entrypointPath,
+    entrypointLabel,
+    isMiddleware
+  );
  const server = await createEdgeRuntime(userCode);

  return async function (request: IncomingMessage) {
@@ -352,7 +369,11 @@ async function createEventHandler(
  // an Edge Function, otherwise needs to be opted-in via
  // `export const config = { runtime: 'experimental-edge' }`
  if (config.middleware === true || runtime === 'experimental-edge') {
-    return createEdgeEventHandler(entrypointPath, entrypoint);
+    return createEdgeEventHandler(
+      entrypointPath,
+      entrypoint,
+      config.middleware || false
+    );
  }

  return createServerlessEventHandler(entrypointPath, options);
--- a/packages/node/test/fixtures/22-readfile-js/api/index.js
+++ b/packages/node/test/fixtures/22-readfile-js/api/index.js
@@ -1,12 +0,0 @@
-import { readFileSync } from 'fs';
-import { join } from 'path';
-
-export default function handler(_req, res) {
-  // This build.js asset should be included but not the dep.js asset
-  // because this is readFile(), not require(). It also shouldn't transpile
-  // with babel because it should be considered an asset.
-  const file = join(process.cwd(), 'assets', 'build.js');
-  const content = readFileSync(file, 'utf8');
-  res.setHeader('Content-Type', 'application/javascript');
-  return res.end(content);
-}
--- a/packages/node/test/fixtures/22-readfile-js/assets/build.js
+++ b/packages/node/test/fixtures/22-readfile-js/assets/build.js
@@ -1 +0,0 @@
-import dep from './dep.js';
--- a/packages/node/test/fixtures/22-readfile-js/assets/dep.js
+++ b/packages/node/test/fixtures/22-readfile-js/assets/dep.js
@@ -1,3 +0,0 @@
-// This file should not be included because the
-// api/index.js is performing a readFile(), not require().
-export const dep = 'dep1';
--- a/packages/node/test/fixtures/22-readfile-js/probes.json
+++ b/packages/node/test/fixtures/22-readfile-js/probes.json
@@ -1,8 +0,0 @@
-{
-  "probes": [
-    {
-      "path": "/api",
-      "mustContain": "import dep from './dep.js';"
-    }
-  ]
-}
--- a/packages/python/package.json
+++ b/packages/python/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/python",
-  "version": "3.1.13",
+  "version": "3.1.14",
  "main": "./dist/index.js",
  "license": "MIT",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
@@ -22,7 +22,7 @@
  "devDependencies": {
    "@types/execa": "^0.9.0",
    "@types/jest": "27.4.1",
-    "@vercel/build-utils": "5.4.1",
+    "@vercel/build-utils": "5.4.2",
    "@vercel/ncc": "0.24.0",
    "execa": "^1.0.0",
    "typescript": "4.3.4"
--- a/packages/redwood/package.json
+++ b/packages/redwood/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/redwood",
-  "version": "1.0.21",
+  "version": "1.0.23",
  "main": "./dist/index.js",
  "license": "MIT",
  "homepage": "https://vercel.com/docs",
@@ -19,7 +19,7 @@
    "test-unit": "yarn test test/prepare-cache.test.js"
  },
  "dependencies": {
-    "@vercel/nft": "0.22.0",
+    "@vercel/nft": "0.22.1",
    "@vercel/routing-utils": "2.0.2",
    "semver": "6.1.1"
  },
@@ -27,6 +27,6 @@
    "@types/aws-lambda": "8.10.19",
    "@types/node": "*",
    "@types/semver": "6.0.0",
-    "@vercel/build-utils": "5.4.1"
+    "@vercel/build-utils": "5.4.2"
  }
 }
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/remix",
-  "version": "1.0.22",
+  "version": "1.0.24",
  "license": "MIT",
  "main": "./dist/index.js",
  "homepage": "https://vercel.com/docs",
@@ -20,12 +20,12 @@
    "default-server.js"
  ],
  "dependencies": {
-    "@vercel/nft": "0.22.0"
+    "@vercel/nft": "0.22.1"
  },
  "devDependencies": {
    "@types/jest": "27.5.1",
    "@types/node": "*",
-    "@vercel/build-utils": "5.4.1",
+    "@vercel/build-utils": "5.4.2",
    "typescript": "4.6.4"
  }
 }
--- a/packages/ruby/package.json
+++ b/packages/ruby/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@vercel/ruby",
  "author": "Nathan Cahill <nathan@nathancahill.com>",
-  "version": "1.3.30",
+  "version": "1.3.31",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/ruby",
@@ -22,7 +22,7 @@
  "devDependencies": {
    "@types/fs-extra": "8.0.0",
    "@types/semver": "6.0.0",
-    "@vercel/build-utils": "5.4.1",
+    "@vercel/build-utils": "5.4.2",
    "@vercel/ncc": "0.24.0",
    "execa": "2.0.4",
    "fs-extra": "^7.0.1",
--- a/packages/static-build/package.json
+++ b/packages/static-build/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/static-build",
-  "version": "1.0.21",
+  "version": "1.0.23",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/build-step",
@@ -36,8 +36,8 @@
    "@types/ms": "0.7.31",
    "@types/node-fetch": "2.5.4",
    "@types/promise-timeout": "1.3.0",
-    "@vercel/build-utils": "5.4.1",
-    "@vercel/frameworks": "1.1.3",
+    "@vercel/build-utils": "5.4.2",
+    "@vercel/frameworks": "1.1.5",
    "@vercel/ncc": "0.24.0",
    "@vercel/routing-utils": "2.0.2",
    "fs-extra": "10.0.0",
--- a/yarn.lock
+++ b/yarn.lock
@@ -719,10 +719,10 @@
  dependencies:
    "@jridgewell/trace-mapping" "0.3.9"

-"@edge-runtime/format@^1.1.0-beta.23":
-  version "1.1.0-beta.23"
-  resolved "https://registry.yarnpkg.com/@edge-runtime/format/-/format-1.1.0-beta.23.tgz#c28fddee0c45a62be63f691a01306c611c99e739"
-  integrity sha512-TuY7ywLzp2XQQZpM8cX1dzm2QMK2juvtpMVR8K61utL2qvokzJ4gBYLcPSKhH0EWAt4WwgymNVRX0cpdSLAqAg==
+"@edge-runtime/format@^1.1.0-beta.32":
+  version "1.1.0-beta.32"
+  resolved "https://registry.yarnpkg.com/@edge-runtime/format/-/format-1.1.0-beta.32.tgz#6f0d5a8726cc54ebb2b1dcb86fe25c0ff093731d"
+  integrity sha512-wpQtbgHJuSF1fvDV6Gxg2L7uNpzhQnRl91DREgOdRfa3S8y9AANjPi1/g3GPBGPiGZoX2Fv+MKV6RgY5/jLfJA==

 "@edge-runtime/jest-environment@1.1.0-beta.7":
  version "1.1.0-beta.7"
@@ -736,22 +736,22 @@
    jest-mock "28.1.1"
    jest-util "28.1.1"

-"@edge-runtime/primitives@^1.1.0-beta.23":
-  version "1.1.0-beta.23"
-  resolved "https://registry.yarnpkg.com/@edge-runtime/primitives/-/primitives-1.1.0-beta.23.tgz#b9b8d83e3dce63286cf80b8d5ece43f32420c4ab"
-  integrity sha512-0vHcZZwyxjmw/so9irYtA82/+nAlJRs+1WpRYBx7iae1FOGCPM4BIKEmboWmwTuj7c6avz9kIbptokdMUPgV9A==
+"@edge-runtime/primitives@^1.1.0-beta.32":
+  version "1.1.0-beta.33"
+  resolved "https://registry.yarnpkg.com/@edge-runtime/primitives/-/primitives-1.1.0-beta.33.tgz#9bd0d866addfdc98ec32ff3ca0f6d24f412a5c03"
+  integrity sha512-mAZw/YRhwkaPVYwSwOTJTMMzZxfuLze6VEepsrVO/4yjnxriOf2GREgLal6OBtTcEEC44q4lqS+OSd0QaSFZEQ==

 "@edge-runtime/primitives@^1.1.0-beta.7":
  version "1.1.0-beta.7"
  resolved "https://registry.yarnpkg.com/@edge-runtime/primitives/-/primitives-1.1.0-beta.7.tgz#0450ee3e5e03a8898ee072c0d0ee01fd2c1ed8f1"
  integrity sha512-ZwuSMpmrf2mAj/O7EWxKOXrC03YMkU64N+CgvVFOtJGfhydk4Db/392Zama3BjNYAMOr/oY9L7HxfPutAFesKw==

-"@edge-runtime/vm@1.1.0-beta.23", "@edge-runtime/vm@^1.1.0-beta.23":
-  version "1.1.0-beta.23"
-  resolved "https://registry.yarnpkg.com/@edge-runtime/vm/-/vm-1.1.0-beta.23.tgz#b55d9add18cb7bb57acf184f6cd7b6edec782a25"
-  integrity sha512-XBp3rCuX4scJVOo2KconAotL5XGX3zdd8IkfDNr5VVSQ/B6HkiTNuf+EvzSQTpplF+fiyLTpfcP9EbNLibwLTA==
+"@edge-runtime/vm@1.1.0-beta.32", "@edge-runtime/vm@^1.1.0-beta.32":
+  version "1.1.0-beta.32"
+  resolved "https://registry.yarnpkg.com/@edge-runtime/vm/-/vm-1.1.0-beta.32.tgz#1bc9c77a88343478d50009f30813b9fbf8a0f4ad"
+  integrity sha512-G0SH80am2XjlK6oFI3RoKlg1SBS5ZAeqakYasfNhJEXqM7g7tsoh5jURMQcNxpLvo48XBTgHgAVEMzhAGgDPZg==
  dependencies:
-    "@edge-runtime/primitives" "^1.1.0-beta.23"
+    "@edge-runtime/primitives" "^1.1.0-beta.32"

 "@edge-runtime/vm@^1.1.0-beta.7":
  version "1.1.0-beta.7"
@@ -3212,27 +3212,10 @@
  resolved "https://registry.yarnpkg.com/@vercel/ncc/-/ncc-0.24.0.tgz#a2e8783a185caa99b5d8961a57dfc9665de16296"
  integrity sha512-crqItMcIwCkvdXY/V3/TzrHJQx6nbIaRqE1cOopJhgGX6izvNov40SmD//nS5flfEvdK54YGjwVVq+zG6crjOg==

-"@vercel/nft@0.21.0":
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/@vercel/nft/-/nft-0.21.0.tgz#e0715b1997cd7021a7c7c48b584ef2295fd4b810"
-  integrity sha512-hFCAETfI5cG8l5iAiLhMC2bReC5K7SIybzrxGorv+eGspIbIFsVw7Vg85GovXm/LxA08pIDrAlrhR6GN36XB/Q==
-  dependencies:
-    "@mapbox/node-pre-gyp" "^1.0.5"
-    acorn "^8.6.0"
-    async-sema "^3.1.1"
-    bindings "^1.4.0"
-    estree-walker "2.0.2"
-    glob "^7.1.3"
-    graceful-fs "^4.2.9"
-    micromatch "^4.0.2"
-    node-gyp-build "^4.2.2"
-    resolve-from "^5.0.0"
-    rollup-pluginutils "^2.8.2"
-
-"@vercel/nft@0.22.0":
-  version "0.22.0"
-  resolved "https://registry.yarnpkg.com/@vercel/nft/-/nft-0.22.0.tgz#586ed4edfd0dabc9bf07525044782198a0b31199"
-  integrity sha512-hB80/093PPiCefN2gVbqv6J93MH+63Zr7uDCwkiS/U4W07DXkLoftbnkBmZoS0Q84LiTSl9DRVSHU4XYCX+sJA==
+"@vercel/nft@0.22.1":
+  version "0.22.1"
+  resolved "https://registry.yarnpkg.com/@vercel/nft/-/nft-0.22.1.tgz#0d91d2a21e3a7f0b23ce1550da9870eac4942828"
+  integrity sha512-lYYZIoxRurqDOSoVIdBicGnpUIpfyaS5qVjdPq+EfI285WqtZK3NK/dyCkiyBul+X2U2OEhRyeMdXPCHGJbohw==
  dependencies:
    "@mapbox/node-pre-gyp" "^1.0.5"
    acorn "^8.6.0"
@@ -5490,13 +5473,13 @@ ecc-jsbn@~0.1.1:
    jsbn "~0.1.0"
    safer-buffer "^2.1.0"

-edge-runtime@1.1.0-beta.23:
-  version "1.1.0-beta.23"
-  resolved "https://registry.yarnpkg.com/edge-runtime/-/edge-runtime-1.1.0-beta.23.tgz#fd4d93f021c622e9b188399fa83e6bd5e445cb5e"
-  integrity sha512-A7dO/Y+4UJnaxFcdz6pepL+0GcvvViWvf201oFQXepgdSxPDKiqxaayCag0eiirQ6OfF+cSTmPD3xrfEoAIjiQ==
+edge-runtime@1.1.0-beta.32:
+  version "1.1.0-beta.32"
+  resolved "https://registry.yarnpkg.com/edge-runtime/-/edge-runtime-1.1.0-beta.32.tgz#e43fd53c57fdba3c567b3fef50743cba00ff5e49"
+  integrity sha512-fbqqUF3OKynqtWgExhjyxXX2SwbkWuwmjUYhml3Sv8Y/vkrTxyTKrxS0MoxUy5sGPB3BBEtpopn36cQgwlOpAg==
  dependencies:
-    "@edge-runtime/format" "^1.1.0-beta.23"
-    "@edge-runtime/vm" "^1.1.0-beta.23"
+    "@edge-runtime/format" "^1.1.0-beta.32"
+    "@edge-runtime/vm" "^1.1.0-beta.32"
    exit-hook "2.2.1"
    http-status "1.5.2"
    mri "1.2.0"
Author	SHA1	Message	Date
Sean Massa	8b3c52b9e8	Publish Stable - vercel@28.2.4 - @vercel/frameworks@1.1.5 - @vercel/fs-detectors@3.1.0 - @vercel/static-build@1.0.23	2022-09-09 16:28:36 -05:00
Sean Massa	fc74300ad0	[dev] fix middleware rewrites to relative paths that do not exist (#8535 ) When using a `rewrite` in middleware to a relative path that does not exist, the logic gets confused and falls back to the original path. This was caused by two changes that, in combination, caused this behavior. 1. `prevUrl` was created to keep track of route results that point to other routes, but falls back to `req.url` (`prevUrl`'s initial value): [#4033](`40e4b69267 (diff-142c93a61d03a1718eb765cd25e5f18d07a95358bb27ce5d5d4da314ee2fa286R1283-R1284)`) 2. `prevUrl` was reassigned when handling middleware: [#7973](`ee1211416f (diff-00ef6e7b63ed4cae298afc2a8c84f49247855a2506270f748e4d3e41da97ad99R1538)`) Because `prevUrl` was reset back to `req.url` after the first `phase` (null) was run, the updated `prevUrl` value from middleware was lost. This only matters if the second `phase` ("filesystem") was going to be hit. Further confusing matters, this was partially fixed by https://github.com/vercel/vercel/pull/8457 because it either returned a proxy pass (which doesn't have this problem) or assigned `req.url` to include the `rewritePath`, which meant that later when `prevUrl` would default to `req.url`, it still had come from `rewritePath`. So, this is fixed for the absolute URL case, but not the relative path case. Given all that, I think the fix we need is to keep `prevUrl` at its current value when it's not being updated based on the `routeResult`. --- So, I made that change here. I added a test that exercises this specific behavior.	2022-09-09 20:34:14 +00:00
Andrew Gadzik	28f8a38e00	[fs-detectors] Add the writeFile function to DetectorFilesystem (#8536 ) Adds a `writeFile` function to `DetectorFilesystem` that will be used to update the various file cache maps. Why is this needed? When detecting npm7+ monorepos, we identified a performance improvement where the service can inspect the `package-lock.json` file for workspaces, and reuse the package information for each workspace in framework-detection. The pseudo code in `vercel/api` will look something like this For a given lockfile ```json { ..., "packages": { "": { "name": "npm-workspaces", "version": "1.0.0", "license": "ISC", "workspaces": { "packages": [ "apps/*" ] } }, "apps/admin": { "version": "0.1.0", "dependencies": { "next": "12.2.5", "react": "18.2.0", "react-dom": "18.2.0" }, "devDependencies": { "eslint": "8.23.0", "eslint-config-next": "12.2.5" } }, ..., } ``` ```ts // for each projectPath we detect in package-lock.json // switch the cwd of the fs to the project directory const projectFs = fs.chdir(projectPath); // gets the package info from the lockfile const projectPackageInfo = lockFile.packages[projectPath]; // insert this content into fs cache await projectFs.writeFile('package.json', projectPackageInfo) // call detectFramework, which should now have a cached "package.json" file const projectFramework = await detectFramework(projectFs); ``` ### Related Issues Related to https://linear.app/vercel/issue/HIT-57/monorepo-detection-api-prevent-rate-limits ### 📋 Checklist <!-- Please keep your PR as a Draft until the checklist is complete --> #### Tests - [x] The code changed/added as part of this PR has been covered with tests - [x] All tests pass locally with `yarn test-unit` #### Code Review - [x] This PR has a concise title and thorough description useful to a reviewer - [x] Issue from task tracker has a link to this PR	2022-09-09 19:39:05 +00:00
Jacob Ford	c318ce9695	[frameworks] Detect Sanity v3 config (#8540 ) Sanity v3 is currently in [developer preview](https://www.sanity.io/blog/sanity-studio-v3-developer-preview), and has deprecated `sanity.json` in the project root, replacing it with `sanity.config.js`. This should detect either. All commands remain the same in both v2 and v3. Co-authored-by: Steven <steven@ceriously.com>	2022-09-09 14:59:12 -04:00
Nathan Rajlich	5b36eaacff	[cli] Poll the Dev Command server on both IPv4 and IPv6 in `vc dev` (#8542 ) This change will allow the downstream Dev Command server be able to listen on either of `127.0.0.1` for IPv4 or `[::1]` for IPv6. - Fixes #6639 - Fixes #8511 - Fixes #8121 - Closes #8512 - Closes #8384	2022-09-09 14:57:50 -04:00
Chris Barber	c9f7ca23a8	[tests] Skip tests that won't run on Windows due to 'mkdir -p' and symlinks (#8531 ) Found a few tests that won't run on Windows. The project settings override test runs `mkdir -p` which errors. The other two build tests fail because they try to create symlinks. #### Tests - [x] The code changed/added as part of this PR has been covered with tests - [x] All tests pass locally with `yarn test-unit` #### Code Review - [ ] This PR has a concise title and thorough description useful to a reviewer - [ ] Issue from task tracker has a link to this PR	2022-09-08 14:26:30 +00:00
Sean Massa	57e0db0f65	[dev] allow middleware rewrites to change origin in `vc dev` (#8457 ) Middleware rewrites in `vc dev` were not respecting changes to the origin. This PR implements that to match prodution. --- Paired with: @TooTallNate	2022-09-07 20:30:10 +00:00
Steven	d5537500d8	Publish Stable - @vercel/build-utils@5.4.2 - vercel@28.2.3 - @vercel/client@12.2.4 - @vercel/frameworks@1.1.4 - @vercel/fs-detectors@3.0.0 - @vercel/go@2.2.5 - @vercel/hydrogen@0.0.18 - @vercel/next@3.1.25 - @vercel/node@2.5.14 - @vercel/python@3.1.14 - @vercel/redwood@1.0.23 - @vercel/remix@1.0.24 - @vercel/ruby@1.3.31 - @vercel/static-build@1.0.22	2022-09-07 15:39:47 -04:00
Andrew Gadzik	4b1736b2f2	[fs-detectors] optimize readdir for framework detection (#8497 ) Adding the ability to explicitly set the `hasPath` and `isFile` caches via `readdir` Why is this needed? For framework detection, this allows us to fetch the contents of a directory (the root directory) of a git repo, and make assumptions about the existence of files, ```ts import frameworks from "@vercel/frameworks"; // we can make the set of all file paths needed for framework detection like this const setOfPaths = new Set( frameworks.frameworks .flatMap((f) => [ ...(f.detectors?.every ?? []), ...(f.detectors?.some ?? []), ]) .map((d) => d.path) ); // then we can read the contents of the root directory of a git repo via the `DetectorFilesystem` fs.readdir('./', { potentialFiles: [...setOfPaths] }); // The filesystem has been fully primed - any network calls from here will only happen if needed. // This works because the logic of `detectFramework` calls `hasPath` and then `isFile` before // fetching file contents. Since the filesystem knows this information, it doesn't have to make // any additional network calls 🙌 const framework = detectFramework(fs); ``` ### Related Issues Related to [HIT-57](https://linear.app/vercel/issue/HIT-57/monorepo-detection-api-prevent-rate-limits) ### 📋 Checklist <!-- Please keep your PR as a Draft until the checklist is complete --> #### Tests - [x] The code changed/added as part of this PR has been covered with tests - [x] All tests pass locally with `yarn test-unit` #### Code Review - [x] This PR has a concise title and thorough description useful to a reviewer - [x] Issue from task tracker has a link to this PR	2022-09-07 15:35:56 -04:00
Sean Massa	9da1c6fa66	[tests] set retry count to 0 when running tests locally (#8529 ) When running tests locally that fail to make a fetch request, the retries add a lot of noise to debugging. This PR sets those retry counts to `0` locally, but keeps them at their current value for CI.	2022-09-07 18:47:09 +00:00
Jiachi Liu	a6c320846e	[@vercel/next] Handle nextjs edge routes from app dir (#8524 ) ### Related Issues Add handling for edge SSR in app dir, normalize the edge page routes from app dir, like what we did for ones in `pages/`. ### 📋 Checklist #### Tests - [x] The code changed/added as part of this PR has been covered with tests - [x] All tests pass locally with `yarn test-unit` #### Code Review - [ ] This PR has a concise title and thorough description useful to a reviewer - [ ] Issue from task tracker has a link to this PR Co-authored-by: JJ Kasper <jj@jjsweb.site>	2022-09-06 16:19:28 -07:00
Shu Uesugi	4973814978	[frameworks] Update Next.js Logos (#8505 ) Update them to match the new logos. See: https://vercel.com/design/brands#next-js <img width="869" alt="Screen Shot 2022-09-02 at 10 43 52 AM" src="https://user-images.githubusercontent.com/992008/188208956-aae10437-77ef-43c8-9bc1-c2499e509a7c.png">	2022-09-02 18:06:31 +00:00
Sean Massa	f1289ff263	[node] update middleware-no-response behavior to match production changes (#8500 ) Production was updated to allow middleware without responses to pass through. This PR makes `vc dev` behave the same way. Tests were updated.	2022-09-01 22:19:10 +00:00
Steven	3ff93279cd	Publish Stable - vercel@28.2.2 - @vercel/next@3.1.24 - @vercel/node@2.5.13 - @vercel/redwood@1.0.22 - @vercel/remix@1.0.23	2022-09-01 16:42:27 -04:00
Steven	58f9d649a8	[next][node][remix][redwood] Bump `@vercel/nft@0.22.1` (#8502 ) Bump `@vercel/nft` to version [0.22.1](https://github.com/vercel/nft/releases/tag/0.22.1)	2022-09-01 16:41:30 -04:00
JJ Kasper	cadc082ad1	[next] Fix index app dir case (#8501 ) ### Related Issues This ensures we properly normalize the `/` case from the `app-path-routes-manifest` as the outputs expect this to be normalized to `index`. ### 📋 Checklist <!-- Please keep your PR as a Draft until the checklist is complete --> #### Tests - [ ] The code changed/added as part of this PR has been covered with tests - [ ] All tests pass locally with `yarn test-unit` #### Code Review - [ ] This PR has a concise title and thorough description useful to a reviewer - [ ] Issue from task tracker has a link to this PR	2022-09-01 12:06:18 -07:00