terribleplan/next.js
1
0
Fork 0
mirror of https://github.com/terribleplan/next.js.git synced 2024-01-19 02:48:18 +00:00
Code Issues Releases Wiki Activity

Get pages before entry function (#4089)

Browse source
This commit is contained in:
Tim Neutkens 2018-03-31 14:00:56 +02:00 committed by Arunoda Susiripala
parent 9ec81c00fa
commit 0b9b902a89
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
server/build/webpack.js
View file

@ -105,7 +105,15 @@ export default async function getBaseWebpackConfig (dir, {dev = false, isServer
.split(process.platform === 'win32' ? ';' : ':') .split(process.platform === 'win32' ? ';' : ':')
.filter((p) => !!p) .filter((p) => !!p)
let totalPages const pagesEntries = await getPages(dir, {dev, isServer, pageExtensions: config.pageExtensions.join('|')})
const totalPages = Object.keys(pagesEntries).length
const clientEntries = !isServer ? {
'main.js': [
dev && !isServer && path.join(__dirname, '..', '..', 'client', 'webpack-hot-middleware-client'),
dev && !isServer && path.join(__dirname, '..', '..', 'client', 'on-demand-entries-client'),
require.resolve(`../../client/next${dev ? '-dev' : ''}`)
].filter(Boolean)
} : {}
let webpackConfig = { let webpackConfig = {
devtool: dev ? 'source-map' : false, devtool: dev ? 'source-map' : false,
@ -114,20 +122,12 @@ export default async function getBaseWebpackConfig (dir, {dev = false, isServer
target: isServer ? 'node' : 'web', target: isServer ? 'node' : 'web',
externals: externalsConfig(dir, isServer), externals: externalsConfig(dir, isServer),
context: dir, context: dir,
// Kept as function to be backwards compatible
entry: async () => { entry: async () => {
const pages = await getPages(dir, {dev, isServer, pageExtensions: config.pageExtensions.join('|')})
totalPages = Object.keys(pages).length
const mainJS = require.resolve(`../../client/next${dev ? '-dev' : ''}`)
const clientConfig = !isServer ? {
'main.js': [
dev && !isServer && path.join(__dirname, '..', '..', 'client', 'webpack-hot-middleware-client'),
dev && !isServer && path.join(__dirname, '..', '..', 'client', 'on-demand-entries-client'),
mainJS
].filter(Boolean)
} : {}
return { return {
...clientConfig, ...clientEntries,
...pages // Only _error and _document when in development. The rest is handled by on-demand-entries
...pagesEntries
} }
}, },
output: { output: {