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
72a322fc
Commit
72a322fc
authored
Oct 08, 2018
by
Tim Neutkens
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass pages through to getPages
parent
037c5cd4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
webpack.js
packages/next/build/webpack.js
+2
-2
No files found.
packages/next/build/webpack.js
View file @
72a322fc
...
@@ -123,7 +123,7 @@ type BaseConfigContext = {|
...
@@ -123,7 +123,7 @@ type BaseConfigContext = {|
config
:
NextConfig
config
:
NextConfig
|
}
|
}
export
default
async
function
getBaseWebpackConfig
(
dir
:
string
,
{
dev
=
false
,
isServer
=
false
,
buildId
,
config
}:
BaseConfigContext
)
{
export
default
async
function
getBaseWebpackConfig
(
dir
:
string
,
{
dev
=
false
,
isServer
=
false
,
buildId
,
config
,
pages
}:
BaseConfigContext
)
{
const
defaultLoaders
=
{
const
defaultLoaders
=
{
babel
:
{
babel
:
{
loader
:
'next-babel-loader'
,
loader
:
'next-babel-loader'
,
...
@@ -149,7 +149,7 @@ export default async function getBaseWebpackConfig (dir: string, {dev = false, i
...
@@ -149,7 +149,7 @@ export default async function getBaseWebpackConfig (dir: string, {dev = false, i
const
distDir
=
path
.
join
(
dir
,
config
.
distDir
)
const
distDir
=
path
.
join
(
dir
,
config
.
distDir
)
const
outputPath
=
path
.
join
(
distDir
,
isServer
?
SERVER_DIRECTORY
:
''
)
const
outputPath
=
path
.
join
(
distDir
,
isServer
?
SERVER_DIRECTORY
:
''
)
const
pagesEntries
=
await
getPages
(
dir
,
{
nextPagesDir
:
DEFAULT_PAGES_DIR
,
dev
,
buildId
,
isServer
,
pageExtensions
:
config
.
pageExtensions
.
join
(
'|'
)})
const
pagesEntries
=
await
getPages
(
dir
,
{
pages
,
nextPagesDir
:
DEFAULT_PAGES_DIR
,
dev
,
buildId
,
isServer
,
pageExtensions
:
config
.
pageExtensions
.
join
(
'|'
)})
const
totalPages
=
Object
.
keys
(
pagesEntries
).
length
const
totalPages
=
Object
.
keys
(
pagesEntries
).
length
const
clientEntries
=
!
isServer
?
{
const
clientEntries
=
!
isServer
?
{
// Backwards compatibility
// Backwards compatibility
...
...
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