Unverified Commit a44788fb authored by Joe Haddad's avatar Joe Haddad Committed by GitHub

Disable flying shuttle when building for `now dev` (#6998)

parent a1598b52
import path from 'path' import chalk from 'chalk'
import nanoid from 'next/dist/compiled/nanoid/index.js'
import loadConfig from 'next-server/next-config'
import { PHASE_PRODUCTION_BUILD } from 'next-server/constants' import { PHASE_PRODUCTION_BUILD } from 'next-server/constants'
import getBaseWebpackConfig from './webpack-config' import loadConfig from 'next-server/next-config'
import nanoid from 'next/dist/compiled/nanoid/index.js'
import path from 'path'
import formatWebpackMessages from '../client/dev-error-overlay/format-webpack-messages'
import { CompilerResult, runCompiler } from './compiler'
import { createEntrypoints, createPagesMapping } from './entries'
import { generateBuildId } from './generate-build-id' import { generateBuildId } from './generate-build-id'
import { writeBuildId } from './write-build-id'
import { isWriteable } from './is-writeable' import { isWriteable } from './is-writeable'
import { runCompiler, CompilerResult } from './compiler' import { collectPages, getSpecifiedPages, printTreeView } from './utils'
import { createPagesMapping, createEntrypoints } from './entries' import getBaseWebpackConfig from './webpack-config'
import formatWebpackMessages from '../client/dev-error-overlay/format-webpack-messages' import { writeBuildId } from './write-build-id'
import chalk from 'chalk'
import { collectPages, printTreeView, getSpecifiedPages } from './utils'
export default async function build(dir: string, conf = null): Promise<void> { export default async function build(dir: string, conf = null): Promise<void> {
if (!(await isWriteable(dir))) { if (!(await isWriteable(dir))) {
...@@ -37,15 +38,18 @@ export default async function build(dir: string, conf = null): Promise<void> { ...@@ -37,15 +38,18 @@ export default async function build(dir: string, conf = null): Promise<void> {
const distDir = path.join(dir, config.distDir) const distDir = path.join(dir, config.distDir)
const pagesDir = path.join(dir, 'pages') const pagesDir = path.join(dir, 'pages')
const flyingShuttle = Boolean(config.experimental.flyingShuttle) const isFlyingShuttle = Boolean(
config.experimental.flyingShuttle &&
!process.env.__NEXT_BUILDER_EXPERIMENTAL_PAGE
)
const selectivePageBuilding = Boolean( const selectivePageBuilding = Boolean(
flyingShuttle || process.env.__NEXT_BUILDER_EXPERIMENTAL_PAGE isFlyingShuttle || process.env.__NEXT_BUILDER_EXPERIMENTAL_PAGE
) )
if (selectivePageBuilding && config.target !== 'serverless') { if (selectivePageBuilding && config.target !== 'serverless') {
throw new Error( throw new Error(
`Cannot use ${ `Cannot use ${
flyingShuttle ? 'flying shuttle' : '`now dev`' isFlyingShuttle ? 'flying shuttle' : '`now dev`'
} without the serverless target.` } without the serverless target.`
) )
} }
......
import { Compiler, Plugin } from 'webpack' import { createHash } from 'crypto'
import path from 'path' import fs from 'fs'
import { CLIENT_STATIC_FILES_RUNTIME_MAIN } from 'next-server/constants'
import { EOL } from 'os' import { EOL } from 'os'
import path from 'path'
import { parse } from 'querystring' import { parse } from 'querystring'
import { CLIENT_STATIC_FILES_RUNTIME_MAIN } from 'next-server/constants' import { Compiler, Plugin } from 'webpack'
import fs from 'fs'
import { createHash } from 'crypto'
function getFiles(dir: string, modules: any[]): string[] { function getFiles(dir: string, modules: any[]): string[] {
if (!(modules && modules.length)) { if (!(modules && modules.length)) {
......
import fs from 'fs' import fs from 'fs'
import {promisify} from 'util' import { promisify } from 'util'
import {join} from 'path' import { join } from 'path'
import {BUILD_ID_FILE, HEAD_BUILD_ID_FILE} from 'next-server/constants' import { BUILD_ID_FILE, HEAD_BUILD_ID_FILE } from 'next-server/constants'
const writeFile = promisify(fs.writeFile) const writeFile = promisify(fs.writeFile)
export async function writeBuildId (distDir: string, buildId: string, headBuildId: boolean): Promise<void> { export async function writeBuildId(
distDir: string,
buildId: string,
headBuildId: boolean
): Promise<void> {
const buildIdPath = join(distDir, BUILD_ID_FILE) const buildIdPath = join(distDir, BUILD_ID_FILE)
await writeFile(buildIdPath, buildId, 'utf8') await writeFile(buildIdPath, buildId, 'utf8')
......
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