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

Moved nanoid use from next-server to next/build (#5441)

Browse source
This commit is contained in:
Robert Sköld 2018-11-02 23:19:48 +01:00 committed by Tim Neutkens
parent dccbc1ea35
commit 123b46634a
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/next-server/server/config.js
View file

@ -27,11 +27,7 @@ const defaultConfig: NextConfig = {
assetPrefix: '', assetPrefix: '',
configOrigin: 'default', configOrigin: 'default',
useFileSystemPublicRoutes: true, useFileSystemPublicRoutes: true,
generateBuildId: () => { generateBuildId: () => null,
// nanoid is a small url-safe uuid generator
const nanoid = require('nanoid')
return nanoid()
},
generateEtags: true, generateEtags: true,
pageExtensions: ['jsx', 'js'] pageExtensions: ['jsx', 'js']
} }

8
packages/next/build/index.js
View file

@ -2,6 +2,7 @@ import { join } from 'path'
import promisify from '../lib/promisify' import promisify from '../lib/promisify'
import fs from 'fs' import fs from 'fs'
import webpack from 'webpack' import webpack from 'webpack'
import nanoid from 'nanoid'
import loadConfig from 'next-server/next-config' import loadConfig from 'next-server/next-config'
import { PHASE_PRODUCTION_BUILD, BUILD_ID_FILE } from 'next-server/constants' import { PHASE_PRODUCTION_BUILD, BUILD_ID_FILE } from 'next-server/constants'
import getBaseWebpackConfig from './webpack' import getBaseWebpackConfig from './webpack'
@ -11,9 +12,14 @@ const writeFile = promisify(fs.writeFile)
export default async function build (dir, conf = null) { export default async function build (dir, conf = null) {
const config = loadConfig(PHASE_PRODUCTION_BUILD, dir, conf) const config = loadConfig(PHASE_PRODUCTION_BUILD, dir, conf)
const buildId = await config.generateBuildId() // defaults to a uuid
const distDir = join(dir, config.distDir) const distDir = join(dir, config.distDir)
let buildId = await config.generateBuildId() // defaults to a uuid
if (buildId == null) {
// nanoid is a small url-safe uuid generator
buildId = nanoid()
}
try { try {
await access(dir, (fs.constants || fs).W_OK) await access(dir, (fs.constants || fs).W_OK)
} catch (err) { } catch (err) {