Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
0ddb6c64
Unverified
Commit
0ddb6c64
authored
Sep 28, 2022
by
JJ Kasper
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add experimental skipMiddlewareUrlNormalize flag
parent
927bd163
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
79 additions
and
6 deletions
+79
-6
webpack-config.ts
packages/next/build/webpack-config.ts
+3
-0
config-schema.ts
packages/next/server/config-schema.ts
+3
-0
config-shared.ts
packages/next/server/config-shared.ts
+1
-0
adapter.ts
packages/next/server/web/adapter.ts
+10
-6
middleware.js
test/e2e/skip-trailing-slash-redirect/app/middleware.js
+21
-0
index.test.ts
test/e2e/skip-trailing-slash-redirect/index.test.ts
+41
-0
No files found.
packages/next/build/webpack-config.ts
View file @
0ddb6c64
...
@@ -1529,6 +1529,9 @@ export default async function getBaseWebpackConfig(
...
@@ -1529,6 +1529,9 @@ export default async function getBaseWebpackConfig(
'process.env.__NEXT_NEW_LINK_BEHAVIOR'
:
JSON
.
stringify
(
'process.env.__NEXT_NEW_LINK_BEHAVIOR'
:
JSON
.
stringify
(
config
.
experimental
.
newNextLinkBehavior
config
.
experimental
.
newNextLinkBehavior
),
),
'process.env.__NEXT_NO_MIDDLEWARE_URL_NORMALIZE'
:
JSON
.
stringify
(
config
.
experimental
.
skipMiddlewareUrlNormalize
),
'process.env.__NEXT_OPTIMISTIC_CLIENT_CACHE'
:
JSON
.
stringify
(
'process.env.__NEXT_OPTIMISTIC_CLIENT_CACHE'
:
JSON
.
stringify
(
config
.
experimental
.
optimisticClientCache
config
.
experimental
.
optimisticClientCache
),
),
...
...
packages/next/server/config-schema.ts
View file @
0ddb6c64
...
@@ -355,6 +355,9 @@ const configSchema = {
...
@@ -355,6 +355,9 @@ const configSchema = {
sharedPool
:
{
sharedPool
:
{
type
:
'boolean'
,
type
:
'boolean'
,
},
},
skipMiddlewareUrlNormalize
:
{
type
:
'boolean'
,
},
skipTrailingSlashRedirect
:
{
skipTrailingSlashRedirect
:
{
type
:
'boolean'
,
type
:
'boolean'
,
},
},
...
...
packages/next/server/config-shared.ts
View file @
0ddb6c64
...
@@ -78,6 +78,7 @@ export interface NextJsWebpackConfig {
...
@@ -78,6 +78,7 @@ export interface NextJsWebpackConfig {
}
}
export
interface
ExperimentalConfig
{
export
interface
ExperimentalConfig
{
skipMiddlewareUrlNormalize
?:
boolean
skipTrailingSlashRedirect
?:
boolean
skipTrailingSlashRedirect
?:
boolean
optimisticClientCache
?:
boolean
optimisticClientCache
?:
boolean
legacyBrowsers
?:
boolean
legacyBrowsers
?:
boolean
...
...
packages/next/server/web/adapter.ts
View file @
0ddb6c64
...
@@ -103,9 +103,11 @@ export async function adapter(params: {
...
@@ -103,9 +103,11 @@ export async function adapter(params: {
nextConfig
:
params
.
request
.
nextConfig
,
nextConfig
:
params
.
request
.
nextConfig
,
})
})
if
(
rewriteUrl
.
host
===
request
.
nextUrl
.
host
)
{
if
(
!
process
.
env
.
__NEXT_NO_MIDDLEWARE_URL_NORMALIZE
)
{
rewriteUrl
.
buildId
=
buildId
||
rewriteUrl
.
buildId
if
(
rewriteUrl
.
host
===
request
.
nextUrl
.
host
)
{
response
.
headers
.
set
(
'x-middleware-rewrite'
,
String
(
rewriteUrl
))
rewriteUrl
.
buildId
=
buildId
||
rewriteUrl
.
buildId
response
.
headers
.
set
(
'x-middleware-rewrite'
,
String
(
rewriteUrl
))
}
}
}
/**
/**
...
@@ -140,9 +142,11 @@ export async function adapter(params: {
...
@@ -140,9 +142,11 @@ export async function adapter(params: {
*/
*/
response
=
new
Response
(
response
.
body
,
response
)
response
=
new
Response
(
response
.
body
,
response
)
if
(
redirectURL
.
host
===
request
.
nextUrl
.
host
)
{
if
(
!
process
.
env
.
__NEXT_NO_MIDDLEWARE_URL_NORMALIZE
)
{
redirectURL
.
buildId
=
buildId
||
redirectURL
.
buildId
if
(
redirectURL
.
host
===
request
.
nextUrl
.
host
)
{
response
.
headers
.
set
(
'Location'
,
String
(
redirectURL
))
redirectURL
.
buildId
=
buildId
||
redirectURL
.
buildId
response
.
headers
.
set
(
'Location'
,
String
(
redirectURL
))
}
}
}
/**
/**
...
...
test/e2e/skip-trailing-slash-redirect/app/middleware.js
0 → 100644
View file @
0ddb6c64
import
{
NextResponse
}
from
'next/server'
export
default
function
handler
(
req
)
{
if
(
req
.
nextUrl
.
pathname
===
'/middleware-rewrite-with-slash'
)
{
return
NextResponse
.
rewrite
(
new
URL
(
'/another/'
,
req
.
nextUrl
))
}
if
(
req
.
nextUrl
.
pathname
===
'/middleware-rewrite-without-slash'
)
{
return
NextResponse
.
rewrite
(
new
URL
(
'/another'
,
req
.
nextUrl
))
}
if
(
req
.
nextUrl
.
pathname
===
'/middleware-redirect-external-with'
)
{
return
NextResponse
.
redirect
(
'https://example.vercel.sh/somewhere/'
,
307
)
}
if
(
req
.
nextUrl
.
pathname
===
'/middleware-redirect-external-without'
)
{
return
NextResponse
.
redirect
(
'https://example.vercel.sh/somewhere'
,
307
)
}
return
NextResponse
.
next
()
}
test/e2e/skip-trailing-slash-redirect/index.test.ts
View file @
0ddb6c64
...
@@ -14,6 +14,7 @@ describe('skip-trailing-slash-redirect', () => {
...
@@ -14,6 +14,7 @@ describe('skip-trailing-slash-redirect', () => {
nextConfig
:
{
nextConfig
:
{
experimental
:
{
experimental
:
{
skipTrailingSlashRedirect
:
true
,
skipTrailingSlashRedirect
:
true
,
skipMiddlewareUrlNormalize
:
true
,
},
},
async
redirects
()
{
async
redirects
()
{
return
[
return
[
...
@@ -55,6 +56,46 @@ describe('skip-trailing-slash-redirect', () => {
...
@@ -55,6 +56,46 @@ describe('skip-trailing-slash-redirect', () => {
})
})
}
}
it
(
'should correct skip URL normalizing in middleware'
,
async
()
=>
{
let
res
=
await
fetchViaHTTP
(
next
.
url
,
'/middleware-rewrite-with-slash'
,
undefined
,
{
redirect
:
'manual'
,
headers
:
{
'x-nextjs-data'
:
'1'
}
}
)
expect
(
res
.
headers
.
get
(
'x-nextjs-rewrite'
).
endsWith
(
'/another/'
)).
toBe
(
true
)
res
=
await
fetchViaHTTP
(
next
.
url
,
'/middleware-rewrite-without-slash'
,
undefined
,
{
redirect
:
'manual'
,
headers
:
{
'x-nextjs-data'
:
'1'
}
}
)
expect
(
res
.
headers
.
get
(
'x-nextjs-rewrite'
).
endsWith
(
'/another'
)).
toBe
(
true
)
res
=
await
fetchViaHTTP
(
next
.
url
,
'/middleware-redirect-external-with'
,
undefined
,
{
redirect
:
'manual'
}
)
expect
(
res
.
status
).
toBe
(
307
)
expect
(
res
.
headers
.
get
(
'Location'
)).
toBe
(
'https://example.vercel.sh/somewhere/'
)
res
=
await
fetchViaHTTP
(
next
.
url
,
'/middleware-redirect-external-without'
,
undefined
,
{
redirect
:
'manual'
}
)
expect
(
res
.
status
).
toBe
(
307
)
expect
(
res
.
headers
.
get
(
'Location'
)).
toBe
(
'https://example.vercel.sh/somewhere'
)
})
it
(
'should apply config redirect correctly'
,
async
()
=>
{
it
(
'should apply config redirect correctly'
,
async
()
=>
{
const
res
=
await
fetchViaHTTP
(
next
.
url
,
'/redirect-me'
,
undefined
,
{
const
res
=
await
fetchViaHTTP
(
next
.
url
,
'/redirect-me'
,
undefined
,
{
redirect
:
'manual'
,
redirect
:
'manual'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment