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
28f65ff4
Unverified
Commit
28f65ff4
authored
Feb 09, 2022
by
JJ Kasper
Committed by
GitHub
Feb 09, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix image-optimizer requires in next-server (#34141)
parent
2e0598d0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
11 deletions
+23
-11
next-server.ts
packages/next/server/next-server.ts
+20
-11
required-server-files.test.ts
test/production/required-server-files.test.ts
+3
-0
No files found.
packages/next/server/next-server.ts
View file @
28f65ff4
...
...
@@ -95,7 +95,7 @@ export interface NodeRequestHandler {
}
export
default
class
NextNodeServer
extends
BaseServer
{
private
imageResponseCache
:
ResponseCache
private
imageResponseCache
?
:
ResponseCache
constructor
(
options
:
Options
)
{
// Initialize super class
...
...
@@ -117,15 +117,17 @@ export default class NextNodeServer extends BaseServer {
process
.
env
.
__NEXT_OPTIMIZE_CSS
=
JSON
.
stringify
(
true
)
}
const
{
ImageOptimizerCache
}
=
require
(
'./image-optimizer'
)
as
typeof
import
(
'./image-optimizer'
)
if
(
!
this
.
minimalMode
)
{
const
{
ImageOptimizerCache
}
=
require
(
'./image-optimizer'
)
as
typeof
import
(
'./image-optimizer'
)
this
.
imageResponseCache
=
new
ResponseCache
(
new
ImageOptimizerCache
({
distDir
:
this
.
distDir
,
nextConfig
:
this
.
nextConfig
,
})
)
this
.
imageResponseCache
=
new
ResponseCache
(
new
ImageOptimizerCache
({
distDir
:
this
.
distDir
,
nextConfig
:
this
.
nextConfig
,
})
)
}
}
private
compression
=
...
...
@@ -170,8 +172,6 @@ export default class NextNodeServer extends BaseServer {
}
protected
generateImageRoutes
():
Route
[]
{
const
{
getHash
,
ImageOptimizerCache
,
sendResponse
,
ImageError
}
=
require
(
'./image-optimizer'
)
as
typeof
import
(
'./image-optimizer'
)
return
[
{
match
:
route
(
'/_next/image'
),
...
...
@@ -185,6 +185,15 @@ export default class NextNodeServer extends BaseServer {
finished
:
true
,
}
}
const
{
getHash
,
ImageOptimizerCache
,
sendResponse
,
ImageError
}
=
require
(
'./image-optimizer'
)
as
typeof
import
(
'./image-optimizer'
)
if
(
!
this
.
imageResponseCache
)
{
throw
new
Error
(
'invariant image optimizer cache was not initialized'
)
}
const
imagesConfig
=
this
.
nextConfig
.
images
if
(
imagesConfig
.
loader
!==
'default'
)
{
...
...
test/production/required-server-files.test.ts
View file @
28f65ff4
...
...
@@ -21,6 +21,9 @@ describe('should set-up next', () => {
let
requiredFilesManifest
beforeAll
(
async
()
=>
{
// test build against environment with next support
process
.
env
.
NOW_BUILDER
=
'1'
next
=
await
createNext
({
files
:
{
pages
:
new
FileRef
(
join
(
__dirname
,
'required-server-files/pages'
)),
...
...
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