LukeParke/vercel
1
0
Fork 0
mirror of https://github.com/LukeHagar/vercel.git synced 2025-12-07 21:07:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[node] Added middlewareRawSrc to BOA route config (#9435)

Browse Source 
Blocked by https://github.com/vercel/vercel/pull/9564

The build output's route configuration contains a compiled `src` from the list of `matchers` in middleware config, however we need to also save the original inputs so that we can render something meaningful in the web UI. The new prop added to the route is called `middlewareRawSrc` of type `string[]`.

This PR depends on https://github.com/vercel/api/pull/17231.

Linear: https://linear.app/vercel/issue/VCCLI-411/display-uncompressed-edge-middleware-matcher-show-the-list-of-matches
This commit is contained in:
Chris Barber
2023-02-28 15:26:26 -06:00
committed by GitHub
parent 347c2de3a2
commit 4a0a3b64a2
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/cli/test/unit/commands/build/index.test.ts
View File

@@ -484,6 +484,7 @@ describe('build', () => {
{ {
src: '^/.*$', src: '^/.*$',
middlewarePath: 'middleware', middlewarePath: 'middleware',
middlewareRawSrc: [],
override: true, override: true,
continue: true, continue: true,
}, },
@@ -548,6 +549,7 @@ describe('build', () => {
{ {
src: '^/.*$', src: '^/.*$',
middlewarePath: 'middleware', middlewarePath: 'middleware',
middlewareRawSrc: [],
override: true, override: true,
continue: true, continue: true,
}, },
@@ -612,6 +614,7 @@ describe('build', () => {
{ {
src: '^\\/about(?:\\/((?:[^\\/#\\?]+?)(?:\\/(?:[^\\/#\\?]+?))*))?[\\/#\\?]?$|^\\/dashboard(?:\\/((?:[^\\/#\\?]+?)(?:\\/(?:[^\\/#\\?]+?))*))?[\\/#\\?]?$', src: '^\\/about(?:\\/((?:[^\\/#\\?]+?)(?:\\/(?:[^\\/#\\?]+?))*))?[\\/#\\?]?$|^\\/dashboard(?:\\/((?:[^\\/#\\?]+?)(?:\\/(?:[^\\/#\\?]+?))*))?[\\/#\\?]?$',
middlewarePath: 'middleware', middlewarePath: 'middleware',
middlewareRawSrc: ['/about/:path*', '/dashboard/:path*'],
override: true, override: true,
continue: true, continue: true,
}, },

10
packages/node/src/index.ts
View File

@@ -449,9 +449,19 @@ export const build: BuildV3 = async ({
// Middleware is a catch-all for all paths unless a `matcher` property is defined // Middleware is a catch-all for all paths unless a `matcher` property is defined
const src = getRegExpFromMatchers(staticConfig?.matcher); const src = getRegExpFromMatchers(staticConfig?.matcher);
const middlewareRawSrc: string[] = [];
if (staticConfig?.matcher) {
if (Array.isArray(staticConfig.matcher)) {
middlewareRawSrc.push(...staticConfig.matcher);
} else {
middlewareRawSrc.push(staticConfig.matcher as string);
}
}
routes = [ routes = [
{ {
src, src,
middlewareRawSrc,
middlewarePath: outputPath, middlewarePath: outputPath,
continue: true, continue: true,
override: true, override: true,