mirror of
https://github.com/LukeHagar/vercel.git
synced 2025-12-11 04:22:13 +00:00
[now-next] Disable running next export from export-intent (#3448)
As requested by @timneutkens after investigating we're disabling auto running `next export` for the user during a build since most users who want their app exported will define `next export` in their `build` script
This commit is contained in:
@@ -7,8 +7,8 @@ const { spawn } = require('child_process');
|
||||
const fetch = require('./fetch-retry.js');
|
||||
const { nowDeploy } = require('./now-deploy.js');
|
||||
|
||||
async function packAndDeploy (builderPath) {
|
||||
await spawnAsync('npm', [ '--loglevel', 'warn', 'pack' ], {
|
||||
async function packAndDeploy(builderPath) {
|
||||
await spawnAsync('npm', ['--loglevel', 'warn', 'pack'], {
|
||||
stdio: 'inherit',
|
||||
cwd: builderPath,
|
||||
});
|
||||
@@ -23,7 +23,7 @@ async function packAndDeploy (builderPath) {
|
||||
|
||||
const RANDOMNESS_PLACEHOLDER_STRING = 'RANDOMNESS_PLACEHOLDER';
|
||||
|
||||
async function testDeployment (
|
||||
async function testDeployment(
|
||||
{ builderUrl, buildUtilsUrl },
|
||||
fixturePath,
|
||||
buildDelegate
|
||||
@@ -85,7 +85,7 @@ async function testDeployment (
|
||||
for (const probe of nowJson.probes || []) {
|
||||
console.log('testing', JSON.stringify(probe));
|
||||
if (probe.delay) {
|
||||
await new Promise((resolve) => setTimeout(resolve, probe.delay));
|
||||
await new Promise(resolve => setTimeout(resolve, probe.delay));
|
||||
continue;
|
||||
}
|
||||
const probeUrl = `https://${deploymentUrl}${probe.path}`;
|
||||
@@ -109,31 +109,40 @@ async function testDeployment (
|
||||
}
|
||||
}
|
||||
|
||||
if (probe.mustContain) {
|
||||
if (!text.includes(probe.mustContain)) {
|
||||
if (probe.mustContain || probe.mustNotContain) {
|
||||
const shouldContain = !!probe.mustContain;
|
||||
const containsIt = text.includes(probe.mustContain);
|
||||
if (
|
||||
(!containsIt && probe.mustContain) ||
|
||||
(containsIt && probe.mustNotContain)
|
||||
) {
|
||||
fs.writeFileSync(path.join(__dirname, 'failed-page.txt'), text);
|
||||
const headers = Array.from(resp.headers.entries())
|
||||
.map(([ k, v ]) => ` ${k}=${v}`)
|
||||
.map(([k, v]) => ` ${k}=${v}`)
|
||||
.join('\n');
|
||||
throw new Error(
|
||||
`Fetched page ${probeUrl} does not contain ${probe.mustContain}.` +
|
||||
` Instead it contains ${text.slice(0, 60)}` +
|
||||
`Fetched page ${probeUrl} does${
|
||||
shouldContain ? ' not' : ''
|
||||
} contain ${
|
||||
shouldContain ? probe.mustContain : probe.mustNotContain
|
||||
}.` +
|
||||
(shouldContain ? ` Instead it contains ${text.slice(0, 60)}` : '') +
|
||||
` Response headers:\n ${headers}`
|
||||
);
|
||||
}
|
||||
} else if (probe.responseHeaders) {
|
||||
// eslint-disable-next-line no-loop-func
|
||||
Object.keys(probe.responseHeaders).forEach((header) => {
|
||||
Object.keys(probe.responseHeaders).forEach(header => {
|
||||
const actual = resp.headers.get(header);
|
||||
const expected = probe.responseHeaders[header];
|
||||
const isEqual = Array.isArray(expected)
|
||||
? expected.every((h) => actual.includes(h))
|
||||
? expected.every(h => actual.includes(h))
|
||||
: expected.startsWith('/') && expected.endsWith('/')
|
||||
? new RegExp(expected.slice(1, -1)).test(actual)
|
||||
: expected === actual;
|
||||
if (!isEqual) {
|
||||
const headers = Array.from(resp.headers.entries())
|
||||
.map(([ k, v ]) => ` ${k}=${v}`)
|
||||
.map(([k, v]) => ` ${k}=${v}`)
|
||||
.join('\n');
|
||||
|
||||
throw new Error(
|
||||
@@ -154,7 +163,7 @@ async function testDeployment (
|
||||
return { deploymentId, deploymentUrl };
|
||||
}
|
||||
|
||||
async function nowDeployIndexTgz (file) {
|
||||
async function nowDeployIndexTgz(file) {
|
||||
const bodies = {
|
||||
'index.tgz': fs.readFileSync(file),
|
||||
'now.json': Buffer.from(JSON.stringify({ version: 2 })),
|
||||
@@ -163,7 +172,7 @@ async function nowDeployIndexTgz (file) {
|
||||
return (await nowDeploy(bodies)).deploymentUrl;
|
||||
}
|
||||
|
||||
async function fetchDeploymentUrl (url, opts) {
|
||||
async function fetchDeploymentUrl(url, opts) {
|
||||
for (let i = 0; i < 50; i += 1) {
|
||||
const resp = await fetch(url, opts);
|
||||
const text = await resp.text();
|
||||
@@ -171,13 +180,13 @@ async function fetchDeploymentUrl (url, opts) {
|
||||
return { resp, text };
|
||||
}
|
||||
|
||||
await new Promise((r) => setTimeout(r, 1000));
|
||||
await new Promise(r => setTimeout(r, 1000));
|
||||
}
|
||||
|
||||
throw new Error(`Failed to wait for deployment READY. Url is ${url}`);
|
||||
}
|
||||
|
||||
async function fetchTgzUrl (url) {
|
||||
async function fetchTgzUrl(url) {
|
||||
for (let i = 0; i < 500; i += 1) {
|
||||
const resp = await fetch(url);
|
||||
if (resp.status === 200) {
|
||||
@@ -188,19 +197,19 @@ async function fetchTgzUrl (url) {
|
||||
}
|
||||
}
|
||||
|
||||
await new Promise((r) => setTimeout(r, 1000));
|
||||
await new Promise(r => setTimeout(r, 1000));
|
||||
}
|
||||
|
||||
throw new Error(`Failed to wait for builder url READY. Url is ${url}`);
|
||||
}
|
||||
|
||||
async function spawnAsync (...args) {
|
||||
async function spawnAsync(...args) {
|
||||
return await new Promise((resolve, reject) => {
|
||||
const child = spawn(...args);
|
||||
let result;
|
||||
if (child.stdout) {
|
||||
result = '';
|
||||
child.stdout.on('data', (chunk) => {
|
||||
child.stdout.on('data', chunk => {
|
||||
result += chunk.toString();
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user