Skip to content

Commit 123b466

Browse files
slaskistimneutkens
authored andcommitted
Moved nanoid use from next-server to next/build (#5441)
1 parent dccbc1e commit 123b466

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

packages/next-server/server/config.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,7 @@ const defaultConfig: NextConfig = {
2727
assetPrefix: '',
2828
configOrigin: 'default',
2929
useFileSystemPublicRoutes: true,
30-
generateBuildId: () => {
31-
// nanoid is a small url-safe uuid generator
32-
const nanoid = require('nanoid')
33-
return nanoid()
34-
},
30+
generateBuildId: () => null,
3531
generateEtags: true,
3632
pageExtensions: ['jsx', 'js']
3733
}

packages/next/build/index.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { join } from 'path'
22
import promisify from '../lib/promisify'
33
import fs from 'fs'
44
import webpack from 'webpack'
5+
import nanoid from 'nanoid'
56
import loadConfig from 'next-server/next-config'
67
import { PHASE_PRODUCTION_BUILD, BUILD_ID_FILE } from 'next-server/constants'
78
import getBaseWebpackConfig from './webpack'
@@ -11,9 +12,14 @@ const writeFile = promisify(fs.writeFile)
1112

1213
export default async function build (dir, conf = null) {
1314
const config = loadConfig(PHASE_PRODUCTION_BUILD, dir, conf)
14-
const buildId = await config.generateBuildId() // defaults to a uuid
1515
const distDir = join(dir, config.distDir)
1616

17+
let buildId = await config.generateBuildId() // defaults to a uuid
18+
if (buildId == null) {
19+
// nanoid is a small url-safe uuid generator
20+
buildId = nanoid()
21+
}
22+
1723
try {
1824
await access(dir, (fs.constants || fs).W_OK)
1925
} catch (err) {

0 commit comments

Comments
 (0)