Commit 8d2bbf94 authored by alex newman's avatar alex newman Committed by Guillermo Rauch

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

parent 6e0e2307
import { tmpdir } from 'os' import { tmpdir } from 'os'
import { join } from 'path' import { join } from 'path'
import getConfig from '../config'
import fs from 'mz/fs' import fs from 'mz/fs'
import uuid from 'uuid' import uuid from 'uuid'
import del from 'del' import del from 'del'
...@@ -14,10 +13,8 @@ export default async function build (dir) { ...@@ -14,10 +13,8 @@ export default async function build (dir) {
try { try {
await runCompiler(compiler) await runCompiler(compiler)
await writeBuildStats(buildDir)
// Pass in both the buildDir and the dir to retrieve config await writeBuildId(buildDir)
await writeBuildStats(buildDir, dir)
await writeBuildId(buildDir, dir)
} catch (err) { } catch (err) {
console.error(`> Failed to build on ${buildDir}`) console.error(`> Failed to build on ${buildDir}`)
throw err throw err
...@@ -48,24 +45,22 @@ function runCompiler (compiler) { ...@@ -48,24 +45,22 @@ function runCompiler (compiler) {
}) })
} }
async function writeBuildStats (buildDir, dir) { async function writeBuildStats (dir) {
const dist = getConfig(dir).distDir
// Here we can't use hashes in webpack chunks. // Here we can't use hashes in webpack chunks.
// That's because the "app.js" is not tied to a chunk. // 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) // It's created by merging a few assets. (commons.js and main.js)
// So, we need to generate the hash ourself. // So, we need to generate the hash ourself.
const assetHashMap = { const assetHashMap = {
'app.js': { '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') await fs.writeFile(buildStatsPath, JSON.stringify(assetHashMap), 'utf8')
} }
async function writeBuildId (buildDir, dir) { async function writeBuildId (dir) {
const dist = getConfig(dir).distDir const buildIdPath = join(dir, '.next', 'BUILD_ID')
const buildIdPath = join(buildDir, dist, 'BUILD_ID')
const buildId = uuid.v4() const buildId = uuid.v4()
await fs.writeFile(buildIdPath, buildId, 'utf8') await fs.writeFile(buildIdPath, buildId, 'utf8')
} }
...@@ -4,10 +4,9 @@ import getConfig from '../config' ...@@ -4,10 +4,9 @@ import getConfig from '../config'
export default async function replaceCurrentBuild (dir, buildDir) { export default async function replaceCurrentBuild (dir, buildDir) {
const dist = getConfig(dir).distDir const dist = getConfig(dir).distDir
const buildDist = getConfig(buildDir).distDir
const _dir = join(dir, dist) const _dir = join(dir, dist)
const _buildDir = join(buildDir, dist) const _buildDir = join(buildDir, '.next')
const oldDir = join(buildDir, `${buildDist}.old`) const oldDir = join(buildDir, '.next.old')
try { try {
await move(_dir, oldDir) await move(_dir, oldDir)
......
...@@ -265,7 +265,7 @@ export default async function createCompiler (dir, { dev = false, quiet = false, ...@@ -265,7 +265,7 @@ export default async function createCompiler (dir, { dev = false, quiet = false,
context: dir, context: dir,
entry, entry,
output: { output: {
path: join(buildDir || dir, config.distDir), path: buildDir ? join(buildDir, '.next') : join(dir, config.distDir),
filename: '[name]', filename: '[name]',
libraryTarget: 'commonjs2', libraryTarget: 'commonjs2',
publicPath: '/_webpack/', publicPath: '/_webpack/',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment