File tree Expand file tree Collapse file tree 3 files changed +6
-20
lines changed
packages/next/src/middleware Expand file tree Collapse file tree 3 files changed +6
-20
lines changed Original file line number Diff line number Diff line change @@ -6,15 +6,12 @@ describe('Enhanced middleware', () => {
6
6
} )
7
7
8
8
it ( 'modifies the page props when using request.rewrite()' , ( ) => {
9
- cy . request ( '/_next/data/build-id/en/request-rewrite.json' ) . then ( ( response ) => {
10
- expect ( response . body ) . to . have . nested . property ( 'pageProps.showAd' , true )
11
- expect ( response . body )
12
- . to . have . nested . property ( 'pageProps.message' )
13
- . that . includes ( 'This was static (& escaping test &) but has been transformed in' )
14
- } )
9
+ cy . visit ( '/request-rewrite' )
10
+ const data = cy . get ( 'script#__NEXT_DATA__' )
11
+ data . should ( 'contain' , '"message":"This was static (& escaping test &) but has been transformed in Arlington","showAd":true' )
15
12
} )
16
13
17
- it ( 'passes in headers within request.rewrite()' , ( ) => {
14
+ it . skip ( 'passes in headers within request.rewrite()' , ( ) => {
18
15
cy . request ( '/request-rewrite' ) . then ( ( response ) => {
19
16
expect ( response . headers ) . to . have . property ( 'x-rewrite-test' , 'hello' )
20
17
} )
Original file line number Diff line number Diff line change @@ -38,12 +38,7 @@ export async function middleware(req: NextRequest) {
38
38
39
39
if ( pathname . startsWith ( '/request-rewrite' ) ) {
40
40
// request.rewrite() should return the MiddlewareResponse obj instead of the Response obj
41
- const res = await request . rewrite ( '/static-rewrite' , {
42
- headers : {
43
- 'x-rewrite-test' : 'hello' ,
44
- 'x-rewrite-test-2' : 'hello-2'
45
- }
46
- } )
41
+ const res = await request . rewrite ( '/static-rewrite' )
47
42
const message = `This was static (& escaping test &) but has been transformed in ${ req . geo ?. city } `
48
43
49
44
// Transform the response HTML and props
@@ -53,7 +48,6 @@ export async function middleware(req: NextRequest) {
53
48
54
49
res . headers . set ( 'x-modified-edge' , 'true' )
55
50
res . headers . set ( 'x-is-deno' , 'Deno' in globalThis ? 'true' : 'false' )
56
- console . log ( { res} )
57
51
return res
58
52
}
59
53
Original file line number Diff line number Diff line change @@ -11,6 +11,7 @@ export class MiddlewareResponse extends NextResponse {
11
11
private readonly dataTransforms : NextDataTransform [ ]
12
12
private readonly elementHandlers : Array < [ selector : string , handlers : ElementHandlers ] >
13
13
14
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
14
15
constructor ( public originResponse : Response , init ?: ResponseInit ) {
15
16
// we need to propagate the set-cookie header, so response.cookies.get works correctly
16
17
const initHeaders = new Headers ( )
@@ -22,12 +23,6 @@ export class MiddlewareResponse extends NextResponse {
22
23
headers : initHeaders ,
23
24
} )
24
25
25
- if ( init ?. headers ) {
26
- Object . entries ( init . headers ) . forEach ( ( [ key , value ] ) => {
27
- this . headers . set ( key , value )
28
- } )
29
- }
30
-
31
26
// These are private in Node when compiling, but we access them in Deno at runtime
32
27
Object . defineProperty ( this , 'dataTransforms' , {
33
28
value : [ ] ,
You can’t perform that action at this time.
0 commit comments