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

Refactor the build server to remove tie to fs (#1656)

Browse source
This commit is contained in:
alex newman 2017-04-07 17:52:12 +01:00 committed by Guillermo Rauch
parent 6e0e2307da
commit 8d2bbf940d
3 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
server/build/index.js
View file

@ -1,6 +1,5 @@
import { tmpdir } from 'os'
import { join } from 'path'
import getConfig from '../config'
import fs from 'mz/fs'
import uuid from 'uuid'
import del from 'del'
@ -14,10 +13,8 @@ export default async function build (dir) {
try {
await runCompiler(compiler)
// Pass in both the buildDir and the dir to retrieve config
await writeBuildStats(buildDir, dir)
await writeBuildId(buildDir, dir)
await writeBuildStats(buildDir)
await writeBuildId(buildDir)
} catch (err) {
console.error(`> Failed to build on ${buildDir}`)
throw err
@ -48,24 +45,22 @@ function runCompiler (compiler) {
})
}
async function writeBuildStats (buildDir, dir) {
const dist = getConfig(dir).distDir
async function writeBuildStats (dir) {
// Here we can't use hashes in webpack chunks.
// That's because the "app.js" is not tied to a chunk.
// It's created by merging a few assets. (commons.js and main.js)
// So, we need to generate the hash ourself.
const assetHashMap = {
'app.js': {
hash: await md5File(join(buildDir, dist, 'app.js'))
hash: await md5File(join(dir, '.next', 'app.js'))
}
}
const buildStatsPath = join(buildDir, dist, 'build-stats.json')
const buildStatsPath = join(dir, '.next', 'build-stats.json')
await fs.writeFile(buildStatsPath, JSON.stringify(assetHashMap), 'utf8')
}
async function writeBuildId (buildDir, dir) {
const dist = getConfig(dir).distDir
const buildIdPath = join(buildDir, dist, 'BUILD_ID')
async function writeBuildId (dir) {
const buildIdPath = join(dir, '.next', 'BUILD_ID')
const buildId = uuid.v4()
await fs.writeFile(buildIdPath, buildId, 'utf8')
}

5
server/build/replace.js
View file

@ -4,10 +4,9 @@ import getConfig from '../config'
export default async function replaceCurrentBuild (dir, buildDir) {
const dist = getConfig(dir).distDir
const buildDist = getConfig(buildDir).distDir
const _dir = join(dir, dist)
const _buildDir = join(buildDir, dist)
const oldDir = join(buildDir, `${buildDist}.old`)
const _buildDir = join(buildDir, '.next')
const oldDir = join(buildDir, '.next.old')
try {
await move(_dir, oldDir)

2
server/build/webpack.js
View file

@ -265,7 +265,7 @@ export default async function createCompiler (dir, { dev = false, quiet = false,
context: dir,
entry,
output: {
path: join(buildDir || dir, config.distDir),
path: buildDir ? join(buildDir, '.next') : join(dir, config.distDir),
filename: '[name]',
libraryTarget: 'commonjs2',
publicPath: '/_webpack/',