Revert "break intentionally"

This reverts commit 7c9db4da39.

.github/workflows/cancel.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 2
     steps:
-      - uses: styfle/cancel-workflow-action@0.4.1
+      - uses: styfle/cancel-workflow-action@0.3.2
         with:
           workflow_id: 849295, 849296, 849297, 849298
           access_token: ${{ github.token }}

examples/redwoodjs/README.md

@@ -1,4 +1,4 @@
-![RedwoodJS Logo](https://github.com/vercel/vercel/blob/master/packages/frameworks/logos/redwoodjs.svg)
+![RedwoodJS Logo](https://github.com/vercel/vercel/blob/master/packages/frameworks/logos/redwood.svg)
 
 # RedwoodJS Example
 

examples/redwoodjs/api/package.json

@@ -3,6 +3,6 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "0.15.0"
+    "@redwoodjs/api": "0.14.0"
   }
 }

examples/redwoodjs/package.json

@@ -7,7 +7,7 @@
     ]
   },
   "devDependencies": {
-    "@redwoodjs/core": "0.15.0"
+    "@redwoodjs/core": "0.14.0"
   },
   "eslintConfig": {
     "extends": "@redwoodjs/eslint-config"

examples/redwoodjs/web/package.json

@@ -6,8 +6,8 @@
     "defaults"
   ],
   "dependencies": {
-    "@redwoodjs/router": "0.15.0",
-    "@redwoodjs/web": "0.15.0",
+    "@redwoodjs/router": "0.14.0",
+    "@redwoodjs/web": "0.14.0",
     "prop-types": "^15.7.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1"

examples/svelte/package.json

@@ -2,17 +2,17 @@
   "name": "svelte-app",
   "version": "1.0.0",
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^13.0.0",
-    "@rollup/plugin-node-resolve": "^8.1.0",
     "npm-run-all": "^4.1.5",
-    "rollup": "^2.18.0",
+    "rollup": "^1.10.1",
+    "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-livereload": "^1.0.0",
+    "rollup-plugin-node-resolve": "^4.2.3",
     "rollup-plugin-svelte": "^5.0.3",
-    "rollup-plugin-terser": "^6.1.0",
+    "rollup-plugin-terser": "^4.0.4",
     "svelte": "^3.0.0"
   },
   "dependencies": {
-    "sirv-cli": "^1.0.1"
+    "sirv-cli": "^0.4.4"
   },
   "scripts": {
     "build": "rollup -c",

examples/svelte/rollup.config.js

@@ -1,6 +1,6 @@
 import svelte from 'rollup-plugin-svelte';
-import resolve from '@rollup/plugin-node-resolve';
-import commonjs from '@rollup/plugin-commonjs';
+import resolve from 'rollup-plugin-node-resolve';
+import commonjs from 'rollup-plugin-commonjs';
 import livereload from 'rollup-plugin-livereload';
 import { terser } from 'rollup-plugin-terser';
 

packages/frameworks/frameworks.json

@@ -685,8 +685,7 @@
   {
     "name": "RedwoodJS",
     "slug": "redwoodjs",
-    "demo": "https://redwoodjs.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/redwoodjs.svg",
+    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/redwood.svg",
     "tagline": "RedwoodJS is a full-stack framework for the Jamstack.",
     "description": "A RedwoodJS app, bootstraped with create-redwood-app.",
     "website": "https://redwoodjs.com",
@@ -703,7 +702,7 @@
         "value": "yarn rw db up --no-db-client --auto-approve && yarn rw build"
       },
       "devCommand": {
-        "value": "yarn rw dev --fwd=\"--port=$PORT --open=false\""
+        "value": "yarn rw dev"
       },
       "outputDirectory": {
         "value": "RedwoodJS default"
@@ -832,7 +831,7 @@
     "description": "No framework or a unoptimized framework.",
     "settings": {
       "buildCommand": {
-        "placeholder": "`npm run vercel-build` or `npm run build`"
+        "placeholder": "`npm run now-build` or `npm run build`"
       },
       "devCommand": {
         "placeholder": "None"

packages/frameworks/logos/redwood.svg

@@ -0,0 +1 @@
+<svg fill="none" height="1000" viewBox="0 0 917 1000" width="917" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m249.557 144.582 194.171 132.54c4.383 2.918 9.502 4.516 14.755 4.606 5.261-.038 10.394-1.641 14.755-4.606l194.319-132.986c7.55-5.406 11.714-14.418 10.957-23.717-.757-9.298-6.322-17.507-14.646-21.6024l-194.171-96.13614c-7.366-3.573948-15.947-3.573948-23.313 0l-193.581 96.13614c-8.474 4.1174-14.113 12.4854-14.783 21.9354-.67 9.451 3.73 18.541 11.537 23.83zm274.879 174.144c.016 8.789 4.318 17.01 11.509 21.991l155.662 106.389c9.965 6.87 23.298 6.012 32.313-2.081l130.579-116.789c5.819-5.199 9.051-12.729 8.823-20.56s-3.892-15.158-10.004-20.005l-124.677-99.702c-9.062-7.199-21.704-7.68-31.28-1.189l-161.416 110.401c-7.064 4.89-11.35 12.914-11.509 21.545zm-387.163 144.724c6.292 5.652 9.526 13.988 8.706 22.437-.817 8.499-5.726 16.052-13.132 20.208l-92.9545 55.72c-9.4227 5.633-21.32 4.82-29.90183-2.041-8.5818-6.861-12.06543-18.346-8.75546-28.865l34.37839-108.172c2.6969-8.57 9.5328-15.175 18.1483-17.533 8.609-2.505 17.8924-.309 24.4928 5.795zm504.168 11.293-168.056-115.007c-8.931-6.01-20.578-6.01-29.509 0l-168.056 115.007c-6.684 4.626-10.919 12.061-11.509 20.208-.435 8.203 2.816 16.169 8.853 21.693l167.909 150.222c4.842 4.319 11.089 6.698 17.558 6.687 6.465-.002 12.708-2.38 17.558-6.687l167.908-150.222c6.056-5.501 9.265-13.5 8.705-21.693-.469-8.146-4.666-15.612-11.361-20.208zm-448.247-29.718-130.4316-116.79c-5.8687-5.331-9.1073-12.995-8.8528-20.95.1419-7.841 3.7705-15.204 9.8856-20.06l124.6768-100.296c9.126-7.179 21.793-7.658 31.428-1.189l161.269 110.401c7.484 4.908 11.998 13.293 11.998 22.288 0 8.994-4.514 17.38-11.998 22.288l-155.515 106.388c-10.025 6.841-23.376 5.985-32.46-2.08zm669.715 167.756-132.792-79.495c-9.862-5.943-22.415-4.739-30.985 2.972l-162.301 144.873c-6.846 6.114-10.062 15.362-8.499 24.441 1.563 9.08 7.681 16.698 16.171 20.135l225.157 91.233c3.088 1.283 6.397 1.939 9.738 1.932 10.449.033 19.936-6.142 24.197-15.751l69.79-156.314c5.68-12.37 1.157-27.062-10.476-34.026zm18.443-190.043 34.379 108.171h-.295c2.542 8.091 1.097 16.919-3.889 23.761-4.986 6.841-12.915 10.876-21.342 10.86-4.728.016-9.37-1.269-13.427-3.715l-93.102-55.72c-7.254-4.243-11.992-11.789-12.689-20.208-.87-8.456 2.373-16.814 8.705-22.436l59.019-52.6c6.668-5.976 15.881-8.156 24.493-5.795 8.609 2.459 15.423 9.098 18.148 17.682zm-492.511 282.761c1.587-9.042-1.597-18.266-8.41-24.368l-162.302-144.873c-8.57-7.711-21.123-8.915-30.985-2.972l-132.7921 79.495c-11.4977 6.995-16.0467 21.502-10.6233 33.878l69.9374 156.314c5.794 13.034 20.774 19.134 33.936 13.818l225.009-91.232c8.492-3.407 14.632-10.995 16.23-20.06zm79.675 44.577 180.598 73.105c8.83 3.779 14.93 12.084 15.935 21.694 1.143 9.729-3.178 19.291-11.214 24.814l-180.745 125.556c-4.331 3.043-9.473 4.7-14.754 4.755-5.277-.082-10.411-1.737-14.755-4.755l-180.597-125.556c-8.066-5.508-12.439-15.061-11.362-24.814 1.206-9.71 7.526-18.006 16.526-21.694l180.597-73.105c6.351-2.532 13.421-2.532 19.771 0z" fill="#bf4722" fill-rule="evenodd"/></svg>

packages/frameworks/logos/redwoodjs.svg

@@ -1 +0,0 @@
-<svg fill="none" width="48" height="48" viewBox="0 0 917 1000" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m249.557 144.582 194.171 132.54c4.383 2.918 9.502 4.516 14.755 4.606 5.261-.038 10.394-1.641 14.755-4.606l194.319-132.986c7.55-5.406 11.714-14.418 10.957-23.717-.757-9.298-6.322-17.507-14.646-21.6024l-194.171-96.13614c-7.366-3.573948-15.947-3.573948-23.313 0l-193.581 96.13614c-8.474 4.1174-14.113 12.4854-14.783 21.9354-.67 9.451 3.73 18.541 11.537 23.83zm274.879 174.144c.016 8.789 4.318 17.01 11.509 21.991l155.662 106.389c9.965 6.87 23.298 6.012 32.313-2.081l130.579-116.789c5.819-5.199 9.051-12.729 8.823-20.56s-3.892-15.158-10.004-20.005l-124.677-99.702c-9.062-7.199-21.704-7.68-31.28-1.189l-161.416 110.401c-7.064 4.89-11.35 12.914-11.509 21.545zm-387.163 144.724c6.292 5.652 9.526 13.988 8.706 22.437-.817 8.499-5.726 16.052-13.132 20.208l-92.9545 55.72c-9.4227 5.633-21.32 4.82-29.90183-2.041-8.5818-6.861-12.06543-18.346-8.75546-28.865l34.37839-108.172c2.6969-8.57 9.5328-15.175 18.1483-17.533 8.609-2.505 17.8924-.309 24.4928 5.795zm504.168 11.293-168.056-115.007c-8.931-6.01-20.578-6.01-29.509 0l-168.056 115.007c-6.684 4.626-10.919 12.061-11.509 20.208-.435 8.203 2.816 16.169 8.853 21.693l167.909 150.222c4.842 4.319 11.089 6.698 17.558 6.687 6.465-.002 12.708-2.38 17.558-6.687l167.908-150.222c6.056-5.501 9.265-13.5 8.705-21.693-.469-8.146-4.666-15.612-11.361-20.208zm-448.247-29.718-130.4316-116.79c-5.8687-5.331-9.1073-12.995-8.8528-20.95.1419-7.841 3.7705-15.204 9.8856-20.06l124.6768-100.296c9.126-7.179 21.793-7.658 31.428-1.189l161.269 110.401c7.484 4.908 11.998 13.293 11.998 22.288 0 8.994-4.514 17.38-11.998 22.288l-155.515 106.388c-10.025 6.841-23.376 5.985-32.46-2.08zm669.715 167.756-132.792-79.495c-9.862-5.943-22.415-4.739-30.985 2.972l-162.301 144.873c-6.846 6.114-10.062 15.362-8.499 24.441 1.563 9.08 7.681 16.698 16.171 20.135l225.157 91.233c3.088 1.283 6.397 1.939 9.738 1.932 10.449.033 19.936-6.142 24.197-15.751l69.79-156.314c5.68-12.37 1.157-27.062-10.476-34.026zm18.443-190.043 34.379 108.171h-.295c2.542 8.091 1.097 16.919-3.889 23.761-4.986 6.841-12.915 10.876-21.342 10.86-4.728.016-9.37-1.269-13.427-3.715l-93.102-55.72c-7.254-4.243-11.992-11.789-12.689-20.208-.87-8.456 2.373-16.814 8.705-22.436l59.019-52.6c6.668-5.976 15.881-8.156 24.493-5.795 8.609 2.459 15.423 9.098 18.148 17.682zm-492.511 282.761c1.587-9.042-1.597-18.266-8.41-24.368l-162.302-144.873c-8.57-7.711-21.123-8.915-30.985-2.972l-132.7921 79.495c-11.4977 6.995-16.0467 21.502-10.6233 33.878l69.9374 156.314c5.794 13.034 20.774 19.134 33.936 13.818l225.009-91.232c8.492-3.407 14.632-10.995 16.23-20.06zm79.675 44.577 180.598 73.105c8.83 3.779 14.93 12.084 15.935 21.694 1.143 9.729-3.178 19.291-11.214 24.814l-180.745 125.556c-4.331 3.043-9.473 4.7-14.754 4.755-5.277-.082-10.411-1.737-14.755-4.755l-180.597-125.556c-8.066-5.508-12.439-15.061-11.362-24.814 1.206-9.71 7.526-18.006 16.526-21.694l180.597-73.105c6.351-2.532 13.421-2.532 19.771 0z" fill="#bf4722" fill-rule="evenodd"/></svg>

packages/frameworks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/frameworks",
-  "version": "0.0.18-canary.3",
+  "version": "0.0.18-canary.0",
   "main": "frameworks.json",
   "license": "UNLICENSED",
   "scripts": {

packages/now-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "20.0.0-canary.13",
+  "version": "20.0.0-canary.4",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -64,10 +64,10 @@
   "dependencies": {
     "@vercel/build-utils": "2.4.3-canary.2",
     "@vercel/go": "1.1.5-canary.0",
-    "@vercel/next": "2.6.19",
-    "@vercel/node": "1.7.5-canary.1",
+    "@vercel/next": "2.6.14-canary.1",
+    "@vercel/node": "1.7.4-canary.0",
     "@vercel/python": "1.2.2",
-    "@vercel/redwood": "0.0.2-canary.3",
+    "@vercel/redwood": "0.0.2-canary.1",
     "@vercel/ruby": "1.2.3",
     "@vercel/static-build": "0.17.7-canary.1",
     "update-notifier": "4.1.0"

packages/now-cli/src/commands/certs/rm.ts

@@ -7,7 +7,7 @@ import * as ERRORS from '../../util/errors-ts';
 import { Output } from '../../util/output';
 import deleteCertById from '../../util/certs/delete-cert-by-id';
 import getCertById from '../../util/certs/get-cert-by-id';
-import { getCustomCertsForDomain } from '../../util/certs/get-custom-certs-for-domain';
+import getCertsForDomain from '../../util/certs/get-certs-for-domain';
 import Client from '../../util/client';
 import getScope from '../../util/get-scope';
 import stamp from '../../util/output/stamp';
@@ -66,17 +66,9 @@ async function rm(
   }
 
   if (certs.length === 0) {
-    if (id.includes('.')) {
-      output.error(
-        `No custom certificates found for "${id}" under ${chalk.bold(
-          contextName
-        )}`
-      );
-    } else {
-      output.error(
-        `No certificates found by id "${id}" under ${chalk.bold(contextName)}`
-      );
-    }
+    output.error(
+      `No certificates found by id "${id}" under ${chalk.bold(contextName)}`
+    );
     return 1;
   }
 
@@ -109,7 +101,7 @@ async function getCertsToDelete(
 ) {
   const cert = await getCertById(client, id);
   if (cert instanceof ERRORS.CertNotFound) {
-    const certs = await getCustomCertsForDomain(client, contextName, id);
+    const certs = await getCertsForDomain(output, client, contextName, id);
     if (certs instanceof ERRORS.CertsPermissionDenied) {
       return certs;
     }
@@ -133,7 +125,12 @@ function readConfirmation(output: Output, msg: string, certs: Cert[]) {
     process.stdin
       .on('data', d => {
         process.stdin.pause();
-        resolve(d.toString().trim().toLowerCase() === 'y');
+        resolve(
+          d
+            .toString()
+            .trim()
+            .toLowerCase() === 'y'
+        );
       })
       .resume();
   });

packages/now-cli/src/commands/deploy/latest.js

@@ -669,7 +669,7 @@ export default async function main(
     }
 
     if (err instanceof BuildError) {
-      output.error(err.message || 'Build failed');
+      output.error('Build failed');
       output.error(
         `Check your logs at https://${now.url}/_logs or run ${getCommandName(
           `logs ${now.url}`,

packages/now-cli/src/commands/domains/add.ts

@@ -128,7 +128,7 @@ export default async function add(
     return 1;
   }
 
-  const domainConfig = await getDomainConfig(client, domainName);
+  const domainConfig = await getDomainConfig(client, contextName, domainName);
 
   if (domainConfig.misconfigured) {
     output.warn(
@@ -142,7 +142,7 @@ export default async function add(
     );
     output.print(
       `  ${chalk.grey('b)')} ` +
-        `Change your Domains's nameservers to the intended set`
+        `Change your domain nameservers to the intended set`
     );
     output.print(
       `\n${formatNSTable(

packages/now-cli/src/commands/domains/buy.ts

@@ -71,9 +71,8 @@ export default async function buy(
 
   const availableStamp = stamp();
   const domainPrice = await getDomainPrice(client, domainName);
-
-  if (domainPrice instanceof Error) {
-    output.prettyError(domainPrice);
+  if (domainPrice instanceof ERRORS.UnsupportedTLD) {
+    output.error(`The TLD for ${param(domainName)} is not supported.`);
     return 1;
   }
 

packages/now-cli/src/commands/domains/index.ts

@@ -14,7 +14,6 @@ import inspect from './inspect';
 import ls from './ls';
 import rm from './rm';
 import move from './move';
-import verify from './verify';
 import { getPkgName } from '../../util/pkg-name';
 
 const help = () => {
@@ -82,7 +81,6 @@ const COMMAND_CONFIG = {
   move: ['move'],
   rm: ['rm', 'remove'],
   transferIn: ['transfer-in'],
-  verify: ['verify'],
 };
 
 export default async function main(ctx: NowContext) {
@@ -121,8 +119,6 @@ export default async function main(ctx: NowContext) {
       return rm(ctx, argv, args, output);
     case 'transferIn':
       return transferIn(ctx, argv, args, output);
-    case 'verify':
-      return verify(ctx, argv, args, output);
     default:
       return ls(ctx, argv, args, output);
   }

packages/now-cli/src/commands/domains/inspect.ts

@@ -14,8 +14,6 @@ import getDomainPrice from '../../util/domains/get-domain-price';
 import { getCommandName } from '../../util/pkg-name';
 import { getDomainConfig } from '../../util/domains/get-domain-config';
 import code from '../../util/output/code';
-import wait from '../../util/output/wait';
-import { getDomainRegistrar } from '../../util/domains/get-domain-registrar';
 
 type Options = {
   '--debug': boolean;
@@ -69,26 +67,38 @@ export default async function inspect(
   }
 
   output.debug(`Fetching domain info`);
-
-  const cancelWait = wait(
-    `Fetching domain ${domainName} under ${chalk.bold(contextName)}`
-  );
-
-  const information = await fetchInformation({
-    output,
-    client,
-    contextName,
-    domainName,
-    cancelWait,
-  }).finally(() => {
-    cancelWait();
-  });
-
-  if (typeof information === 'number') {
-    return information;
+  const [domain, renewalPrice] = await Promise.all([
+    getDomainByName(client, contextName, domainName),
+    getDomainPrice(client, domainName, 'renewal')
+      .then(res => (res instanceof Error ? null : res.price))
+      .catch(() => null),
+  ]);
+  if (!domain || domain instanceof DomainNotFound) {
+    output.error(
+      `Domain not found by "${domainName}" under ${chalk.bold(contextName)}`
+    );
+    output.log(`Run ${getCommandName(`domains ls`)} to see your domains.`);
+    return 1;
   }
 
-  const { domain, projects, renewalPrice, domainConfig } = information;
+  if (domain instanceof DomainPermissionDenied) {
+    output.error(
+      `You don't have access to the domain ${domainName} under ${chalk.bold(
+        contextName
+      )}`
+    );
+    output.log(`Run ${getCommandName(`domains ls`)} to see your domains.`);
+    return 1;
+  }
+
+  const projects = await findProjectsForDomain(client, domainName);
+
+  if (projects instanceof Error) {
+    output.prettyError(projects);
+    return 1;
+  }
+
+  const domainConfig = await getDomainConfig(client, contextName, domainName);
 
   output.log(
     `Domain ${domainName} found under ${chalk.bold(contextName)} ${chalk.gray(
@@ -98,27 +108,46 @@ export default async function inspect(
   output.print('\n');
   output.print(chalk.bold('  General\n\n'));
   output.print(`    ${chalk.cyan('Name')}\t\t\t${domain.name}\n`);
+  output.print(`    ${chalk.cyan('Service Type')}\t\t${domain.serviceType}\n`);
   output.print(
-    `    ${chalk.cyan('Registrar')}\t\t\t${getDomainRegistrar(domain)}\n`
+    `    ${chalk.cyan('Ordered At')}\t\t\t${formatDate(domain.orderedAt)}\n`
+  );
+  output.print(
+    `    ${chalk.cyan('Transfer Started At')}\t\t${formatDate(
+      domain.transferStartedAt
+    )}\n`
+  );
+  output.print(
+    `    ${chalk.cyan('Created At')}\t\t\t${formatDate(domain.createdAt)}\n`
+  );
+  output.print(
+    `    ${chalk.cyan('Bought At')}\t\t\t${formatDate(domain.boughtAt)}\n`
+  );
+  output.print(
+    `    ${chalk.cyan('Transferred At')}\t\t${formatDate(
+      domain.transferredAt
+    )}\n`
   );
   output.print(
     `    ${chalk.cyan('Expires At')}\t\t\t${formatDate(domain.expiresAt)}\n`
   );
-  output.print(`    ${chalk.cyan('Edge Network')}\t\t${true}\n`);
+  output.print(
+    `    ${chalk.cyan('NS Verified At')}\t\t${formatDate(
+      domain.nsVerifiedAt
+    )}\n`
+  );
+  output.print(
+    `    ${chalk.cyan('TXT Verified At')}\t\t${formatDate(
+      domain.txtVerifiedAt
+    )}\n`
+  );
 
   if (renewalPrice && domain.boughtAt) {
     output.print(
       `    ${chalk.cyan('Renewal Price')}\t\t$${renewalPrice} USD\n`
     );
   }
-
-  output.print(
-    `    ${chalk.cyan('Creator')}\t\t\t${domain.creator.username}\n`
-  );
-  output.print(
-    `    ${chalk.cyan('Created At')}\t\t\t${formatDate(domain.createdAt)}\n`
-  );
-
+  output.print(`    ${chalk.cyan('CDN Enabled')}\t\t\t${true}\n`);
   output.print('\n');
 
   output.print(chalk.bold('  Nameservers\n\n'));
@@ -129,6 +158,26 @@ export default async function inspect(
   );
   output.print('\n');
 
+  if (domainConfig.misconfigured) {
+    output.warn(
+      `This domain is not configured properly. To configure it you should either:`
+    );
+    output.print(
+      `  ${chalk.grey('a)')} ` +
+        `Set the following record on your DNS provider to continue: ` +
+        `${code(`A ${domainName} 76.76.21.21`)} ` +
+        `${chalk.grey('[recommended]')}\n`
+    );
+    output.print(
+      `  ${chalk.grey('b)')} ` +
+        `Change your domain nameservers to the intended set detailed above.\n\n`
+    );
+    output.print(
+      `  We will run a verification for you and you will receive an email upon completion.\n`
+    );
+    output.print('  Read more: https://vercel.link/domain-configuration\n\n');
+  }
+
   if (Array.isArray(projects) && projects.length > 0) {
     output.print(chalk.bold('  Projects\n'));
 
@@ -159,109 +208,8 @@ export default async function inspect(
         .join('\n')
     );
 
-    output.print('\n');
-  }
-
-  if (domainConfig.misconfigured) {
-    output.warn(
-      `This domain is not configured properly. To configure it you should either:`,
-      null,
-      null,
-      null,
-      {
-        boxen: {
-          margin: {
-            left: 2,
-            right: 0,
-            bottom: 0,
-            top: 0,
-          },
-        },
-      }
-    );
-    output.print(
-      `  ${chalk.grey('a)')} ` +
-        `Set the following record on your DNS provider to continue: ` +
-        `${code(`A ${domainName} 76.76.21.21`)} ` +
-        `${chalk.grey('[recommended]')}\n`
-    );
-    output.print(
-      `  ${chalk.grey('b)')} ` +
-        `Change your Domains's nameservers to the intended set detailed above.\n\n`
-    );
-    output.print(
-      `  We will run a verification for you and you will receive an email upon completion.\n`
-    );
-
-    const contextNameConst = contextName;
-    const projectNames = Array.from(
-      new Set(projects.map(project => project.name))
-    );
-
-    if (projectNames.length) {
-      projectNames.forEach((name, index) => {
-        const prefix = index === 0 ? '  Read more:' : ' '.repeat(12);
-        output.print(
-          `${prefix} https://vercel.com/${contextNameConst}/${name}/settings/domains\n`
-        );
-      });
-    } else {
-      output.print(`  Read more: https://vercel.link/domain-configuration\n`);
-    }
-
-    output.print('\n');
+    output.print('\n\n');
   }
 
   return null;
 }
-
-async function fetchInformation({
-  output,
-  client,
-  contextName,
-  domainName,
-  cancelWait,
-}: {
-  output: Output;
-  client: Client;
-  contextName: string;
-  domainName: string;
-  cancelWait: () => void;
-}) {
-  const [domain, renewalPrice] = await Promise.all([
-    getDomainByName(client, contextName, domainName, { ignoreWait: true }),
-    getDomainPrice(client, domainName, 'renewal')
-      .then(res => (res instanceof Error ? null : res.price))
-      .catch(() => null),
-  ]);
-
-  if (domain instanceof DomainNotFound) {
-    cancelWait();
-    output.prettyError(domain);
-    return 1;
-  }
-
-  if (domain instanceof DomainPermissionDenied) {
-    cancelWait();
-    output.prettyError(domain);
-    output.log(`Run ${getCommandName(`domains ls`)} to see your domains.`);
-    return 1;
-  }
-
-  const projects = await findProjectsForDomain(client, domainName);
-
-  if (projects instanceof Error) {
-    cancelWait();
-    output.prettyError(projects);
-    return 1;
-  }
-
-  const domainConfig = await getDomainConfig(client, domainName);
-
-  return {
-    domain,
-    projects,
-    renewalPrice,
-    domainConfig,
-  };
-}

packages/now-cli/src/commands/domains/ls.ts

@@ -1,8 +1,8 @@
 import ms from 'ms';
+import psl from 'psl';
 import chalk from 'chalk';
 import plural from 'pluralize';
 
-import wait from '../../util/output/wait';
 import Client from '../../util/client';
 import getDomains from '../../util/domains/get-domains';
 import getScope from '../../util/get-scope';
@@ -10,17 +10,28 @@ import stamp from '../../util/output/stamp';
 import { Output } from '../../util/output';
 import formatTable from '../../util/format-table';
 import { formatDateWithoutTime } from '../../util/format-date';
-import { Domain, NowContext } from '../../types';
+import { Domain, Project, NowContext } from '../../types';
+import { getProjectsWithDomains } from '../../util/projects/get-projects-with-domains';
 import getCommandFlags from '../../util/get-command-flags';
 import { getCommandName } from '../../util/pkg-name';
 import isDomainExternal from '../../util/domains/is-domain-external';
-import { getDomainRegistrar } from '../../util/domains/get-domain-registrar';
+import { isPublicSuffix } from '../../util/domains/is-public-suffix';
 
 type Options = {
   '--debug': boolean;
   '--next': number;
 };
 
+interface DomainInfo {
+  domain: string;
+  apexDomain: string;
+  projectName: string | null;
+  dns: 'Vercel' | 'External';
+  configured: boolean;
+  expiresAt: number | null;
+  createdAt: number | null;
+}
+
 export default async function ls(
   ctx: NowContext,
   opts: Options,
@@ -64,21 +75,29 @@ export default async function ls(
     return 1;
   }
 
-  const cancelWait = wait(`Fetching domains under ${chalk.bold(contextName)}`);
+  const [{ domains, pagination }, projects] = await Promise.all([
+    getDomains(client, contextName),
+    getProjectsWithDomains(client),
+  ] as const);
 
-  const { domains, pagination } = await getDomains(client).finally(() => {
-    cancelWait();
-  });
+  if (projects instanceof Error) {
+    output.prettyError(projects);
+    return 1;
+  }
+
+  const domainsInfo = createDomainsInfo(domains, projects);
 
   output.log(
-    `${plural('Domain', domains.length, true)} found under ${chalk.bold(
-      contextName
-    )} ${chalk.gray(lsStamp())}`
+    `${plural(
+      'project domain',
+      domainsInfo.length,
+      true
+    )} found under ${chalk.bold(contextName)} ${chalk.gray(lsStamp())}`
   );
 
-  if (domains.length > 0) {
+  if (domainsInfo.length > 0) {
     output.print(
-      formatDomainsTable(domains).replace(/^(.*)/gm, `${' '.repeat(1)}$1`)
+      formatDomainsTable(domainsInfo).replace(/^(.*)/gm, `${' '.repeat(3)}$1`)
     );
     output.print('\n\n');
   }
@@ -86,7 +105,7 @@ export default async function ls(
   if (pagination && pagination.count === 20) {
     const flags = getCommandFlags(opts, ['_', '--next']);
     output.log(
-      `To display the next page, run ${getCommandName(
+      `To display the next page run ${getCommandName(
         `domains ls${flags} --next ${pagination.next}`
       )}`
     );
@@ -95,26 +114,92 @@ export default async function ls(
   return 0;
 }
 
-function formatDomainsTable(domains: Domain[]) {
+function createDomainsInfo(domains: Domain[], projects: Project[]) {
+  const info = new Map<string, DomainInfo>();
+
+  domains.forEach(domain => {
+    info.set(domain.name, {
+      domain: domain.name,
+      apexDomain: domain.name,
+      projectName: null,
+      expiresAt: domain.expiresAt || null,
+      createdAt: domain.createdAt,
+      configured: Boolean(domain.verified),
+      dns: isDomainExternal(domain) ? 'External' : 'Vercel',
+    });
+
+    projects.forEach(project => {
+      (project.alias || []).forEach(target => {
+        if (!target.domain.endsWith(domain.name)) return;
+
+        info.set(target.domain, {
+          domain: target.domain,
+          apexDomain: domain.name,
+          projectName: project.name,
+          expiresAt: domain.expiresAt || null,
+          createdAt: domain.createdAt || target.createdAt || null,
+          configured: Boolean(domain.verified),
+          dns: isDomainExternal(domain) ? 'External' : 'Vercel',
+        });
+      });
+    });
+  });
+
+  projects.forEach(project => {
+    (project.alias || []).forEach(target => {
+      if (info.has(target.domain)) return;
+
+      const { domain: apexDomain } = psl.parse(
+        target.domain
+      ) as psl.ParsedDomain;
+
+      info.set(target.domain, {
+        domain: target.domain,
+        apexDomain: apexDomain || target.domain,
+        projectName: project.name,
+        expiresAt: null,
+        createdAt: target.createdAt || null,
+        configured: isPublicSuffix(target.domain),
+        dns: isPublicSuffix(target.domain) ? 'Vercel' : 'External',
+      });
+    });
+  });
+
+  const list = Array.from(info.values());
+
+  return list.sort((a, b) => {
+    if (a.apexDomain === b.apexDomain) {
+      if (a.apexDomain === a.domain) return -1;
+      if (b.apexDomain === b.domain) return 1;
+      return a.domain.localeCompare(b.domain);
+    }
+
+    return a.apexDomain.localeCompare(b.apexDomain);
+  });
+}
+
+function formatDomainsTable(domainsInfo: DomainInfo[]) {
   const current = Date.now();
 
-  const rows: string[][] = domains.map(domain => {
-    const expiration = formatDateWithoutTime(domain.expiresAt);
-    const age = domain.createdAt ? ms(current - domain.createdAt) : '-';
+  const rows: string[][] = domainsInfo.map(info => {
+    const expiration = formatDateWithoutTime(info.expiresAt);
+    const age = info.createdAt ? ms(current - info.createdAt) : '-';
 
     return [
-      domain.name,
-      getDomainRegistrar(domain),
-      isDomainExternal(domain) ? 'Third Party' : 'Vercel',
+      info.domain,
+      info.projectName || '-',
+      info.dns,
       expiration,
-      domain.creator.username,
+      info.configured.toString(),
       chalk.gray(age),
     ];
   });
 
-  return formatTable(
-    ['Domain', 'Registrar', 'Nameservers', 'Expiration', 'Creator', 'Age'],
+  const table = formatTable(
+    ['domain', 'project', 'dns', 'expiration', 'configured', 'age'],
     ['l', 'l', 'l', 'l', 'l', 'l'],
     [{ rows }]
   );
+
+  return table;
 }

packages/now-cli/src/commands/domains/transfer-in.ts

@@ -71,8 +71,8 @@ export default async function transferIn(
     checkTransfer(client, domainName),
   ]);
 
-  if (domainPrice instanceof Error) {
-    output.prettyError(domainPrice);
+  if (domainPrice instanceof ERRORS.UnsupportedTLD) {
+    output.error(`The TLD for ${param(domainName)} is not supported.`);
     return 1;
   }
 

packages/now-cli/src/commands/domains/verify.ts

@@ -1,33 +0,0 @@
-import { NowContext } from '../../types';
-import { Output } from '../../util/output';
-import { NowBuildError } from '@vercel/build-utils';
-import { getCommandName } from '../../util/pkg-name';
-
-export default async function verify(
-  _ctx: NowContext,
-  _opts: {},
-  args: string[],
-  output: Output
-) {
-  const [domainName] = args;
-
-  if (!domainName) {
-    output.error(
-      `${getCommandName(`domains verify <domain>`)} expects one argument`
-    );
-
-    return 1;
-  }
-
-  const error = new NowBuildError({
-    code: 'domains_verify_command_deprecated',
-    message: `It's not necessary to verify Domains anymore. Instead, you can run ${getCommandName(
-      `domains inspect ${domainName}`
-    )} to see what you need to do in order to configure it properly.`,
-    link: 'https://vercel.link/domain-verification-via-cli',
-  });
-
-  output.prettyError(error);
-
-  return 0;
-}

packages/now-cli/src/index.js

@@ -640,11 +640,6 @@ const main = async argv_ => {
       return 1;
     }
 
-    if (err.code === 'NOT_AUTHORIZED' || err.code === 'TEAM_DELETED') {
-      output.prettyError(err);
-      return 1;
-    }
-
     if (err instanceof APIError && 400 <= err.status && err.status <= 499) {
       err.message = err.serverMessage;
       output.prettyError(err);

packages/now-cli/src/util/certs/delete-cert-by-id.ts

@@ -6,7 +6,7 @@ export default async function deleteCertById(
   client: Client,
   id: string
 ) {
-  return client.fetch(`/v5/now/certs/${id}`, {
-    method: 'DELETE',
+  return client.fetch(`/v3/now/certs/${id}`, {
+    method: 'DELETE'
   });
 }

packages/now-cli/src/util/certs/get-cert-by-id.ts

@@ -4,7 +4,7 @@ import * as ERRORS from '../errors-ts';
 
 export default async function getCertById(client: Client, id: string) {
   try {
-    return await client.fetch<Cert>(`/v5/now/certs/${id}`);
+    return await client.fetch<Cert>(`/v3/now/certs/${id}`);
   } catch (error) {
     if (error.code === 'cert_not_found') {
       return new ERRORS.CertNotFound(id);

packages/now-cli/src/util/certs/get-certs-for-domain.ts

@@ -1,5 +1,6 @@
 import { stringify } from 'querystring';
 import { Cert } from '../../types';
+import { Output } from '../output';
 import * as ERRORS from '../errors-ts';
 import Client from '../client';
 
@@ -7,14 +8,15 @@ type Response = {
   certs: Cert[];
 };
 
-export async function getCustomCertsForDomain(
+export default async function getCertsForDomain(
+  output: Output,
   client: Client,
   context: string,
   domain: string
 ) {
   try {
     const { certs } = await client.fetch<Response>(
-      `/v5/now/certs?${stringify({ domain, custom: true })}`
+      `/v3/now/certs?${stringify({ domain })}`
     );
     return certs;
   } catch (error) {

packages/now-cli/src/util/dev/router.ts

@@ -118,16 +118,7 @@ export async function devRouter(
           continue;
         }
 
-        // if the destination is an external URL (rewrite or redirect)
-        const isDestUrl = isURL(destPath);
-
-        if (
-          routeConfig.check &&
-          devServer &&
-          nowConfig &&
-          phase !== 'hit' &&
-          !isDestUrl
-        ) {
+        if (routeConfig.check && devServer && nowConfig && phase !== 'hit') {
           const { pathname = '/' } = url.parse(destPath);
           const hasDestFile = await devServer.hasFilesystem(
             pathname,
@@ -165,6 +156,7 @@ export async function devRouter(
           }
         }
 
+        const isDestUrl = isURL(destPath);
         if (isDestUrl) {
           result = {
             found: true,

packages/now-cli/src/util/dev/server.ts

@@ -1578,13 +1578,6 @@ export default class DevServer {
       debug(
         `Checking build result's ${buildResult.routes.length} \`routes\` to match ${newUrl}`
       );
-      for (const r of buildResult.routes) {
-        // This replace is necessary for `@vercel/redwood` but might be relevant
-        // for builders that wish to return routes and work with zero config.
-        if (r.dest) {
-          r.dest = r.dest.replace(/\$PORT/g, `${this.devProcessPort}`);
-        }
-      }
       const matchedRoute = await devRouter(
         newUrl,
         req.method,

packages/now-cli/src/util/dns/get-dns-records.ts

@@ -4,8 +4,6 @@ import { Output } from '../output';
 import Client from '../client';
 import getDomainDNSRecords from './get-domain-dns-records';
 import getDomains from '../domains/get-domains';
-import wait from '../output/wait';
-import chalk from 'chalk';
 
 export type DomainRecordsItem = {
   domainName: string;
@@ -60,11 +58,6 @@ async function getDomainNames(
   contextName: string,
   next?: number
 ) {
-  const cancelWait = wait(`Fetching domains under ${chalk.bold(contextName)}`);
-  try {
-    const { domains, pagination } = await getDomains(client, next);
-    return { domainNames: domains.map(domain => domain.name), pagination };
-  } finally {
-    cancelWait();
-  }
+  const { domains, pagination } = await getDomains(client, contextName, next);
+  return { domainNames: domains.map(domain => domain.name), pagination };
 }

packages/now-cli/src/util/dns/import-zonefile.ts

@@ -38,7 +38,7 @@ export default async function importZonefile(
   } catch (error) {
     cancelWait();
     if (error.code === 'not_found') {
-      return new DomainNotFound(domain, contextName);
+      return new DomainNotFound(domain);
     }
 
     if (error.code === 'invalid_domain') {

packages/now-cli/src/util/domains/get-domain-by-name.ts

@@ -8,26 +8,24 @@ type Response = {
   domain: Domain;
 };
 
-export default async function getDomainByName(
+async function getDomainByName(
   client: Client,
   contextName: string,
-  domainName: string,
-  options: {
-    ignoreWait?: boolean;
-  } = {}
+  domainName: string
 ) {
-  const cancelWait = options.ignoreWait
-    ? null
-    : wait(`Fetching domain ${domainName} under ${chalk.bold(contextName)}`);
+  const cancelWait = wait(
+    `Fetching domain ${domainName} under ${chalk.bold(contextName)}`
+  );
   try {
     const { domain } = await client.fetch<Response>(
       `/v4/domains/${encodeURIComponent(domainName)}`
     );
-
+    cancelWait();
     return domain;
   } catch (error) {
+    cancelWait();
     if (error.status === 404) {
-      return new DomainNotFound(domainName, contextName);
+      return new DomainNotFound(domainName);
     }
 
     if (error.status === 403) {
@@ -35,7 +33,7 @@ export default async function getDomainByName(
     }
 
     throw error;
-  } finally {
-    cancelWait?.();
   }
 }
+
+export default getDomainByName;

packages/now-cli/src/util/domains/get-domain-config.ts

@@ -1,7 +1,16 @@
+import chalk from 'chalk';
 import Client from '../client';
+import wait from '../output/wait';
 import { DomainConfig } from '../../types';
 
-export async function getDomainConfig(client: Client, domainName: string) {
+export async function getDomainConfig(
+  client: Client,
+  contextName: string,
+  domainName: string
+) {
+  const cancelWait = wait(
+    `Fetching domain config ${domainName} under ${chalk.bold(contextName)}`
+  );
   try {
     const config = await client.fetch<DomainConfig>(
       `/v4/domains/${domainName}/config`
@@ -14,5 +23,7 @@ export async function getDomainConfig(client: Client, domainName: string) {
     }
 
     throw error;
+  } finally {
+    cancelWait();
   }
 }

packages/now-cli/src/util/domains/get-domain-price.ts

@@ -19,11 +19,6 @@ export default async function getDomainPrice(
     if (error.code === 'unsupported_tld') {
       return new UnsupportedTLD(name);
     }
-
-    if (error.status < 500) {
-      return error;
-    }
-
     throw error;
   }
 }

packages/now-cli/src/util/domains/get-domain-registrar.ts

@@ -1,15 +0,0 @@
-import { Domain } from '../../types';
-
-export type DomainRegistrar = 'Vercel' | 'Purchase in Process' | 'Third Party';
-
-export function getDomainRegistrar(domain: Domain): DomainRegistrar {
-  if (domain.boughtAt) {
-    return 'Vercel';
-  }
-
-  if (typeof domain.orderedAt === 'number' && !domain.boughtAt) {
-    return 'Purchase in Process';
-  }
-
-  return 'Third Party';
-}

packages/now-cli/src/util/domains/get-domains.ts

@@ -1,15 +1,24 @@
+import chalk from 'chalk';
 import { Domain, PaginationOptions } from '../../types';
 import Client from '../client';
+import wait from '../output/wait';
 
 type Response = {
   domains: Domain[];
   pagination: PaginationOptions;
 };
 
-export default async function getDomains(client: Client, next?: number) {
+export default async function getDomains(
+  client: Client,
+  contextName: string,
+  next?: number
+) {
   let domainUrl = `/v5/domains?limit=20`;
   if (next) {
     domainUrl += `&until=${next}`;
   }
-  return await client.fetch<Response>(domainUrl);
+  const cancelWait = wait(`Fetching domains under ${chalk.bold(contextName)}`);
+  const domains = await client.fetch<Response>(domainUrl);
+  cancelWait();
+  return domains;
 }

packages/now-cli/src/util/domains/purchase-domain-if-available.ts

@@ -30,19 +30,12 @@ export default async function purchaseDomainIfAvailable(
     }
 
     output.debug(`Domain ${domain} is available to be purchased`);
-
-    const domainPrice = await getDomainPrice(client, domain).finally(() => {
-      cancelWait();
-    });
-
+    const domainPrice = await getDomainPrice(client, domain);
+    cancelWait();
     if (domainPrice instanceof ERRORS.UnsupportedTLD) {
       return domainPrice;
     }
 
-    if (domainPrice instanceof Error) {
-      throw domainPrice;
-    }
-
     const { price, period } = domainPrice;
     output.log(
       `Domain not found, but you can buy it under ${chalk.bold(
@@ -75,5 +68,6 @@ export default async function purchaseDomainIfAvailable(
   }
 
   output.debug(`Domain ${domain} is not available to be purchased`);
+  cancelWait();
   return false;
 }

packages/now-cli/src/util/errors-ts.ts

@@ -4,7 +4,6 @@ import { NowBuildError } from '@vercel/build-utils';
 import { NowError } from './now-error';
 import code from './output/code';
 import { getCommandName } from './pkg-name';
-import chalk from 'chalk';
 
 /**
  * This error is thrown when there is an API error with a payload. The error
@@ -69,9 +68,7 @@ export class InvalidToken extends NowError<'NOT_AUTHORIZED', {}> {
   constructor() {
     super({
       code: `NOT_AUTHORIZED`,
-      message: `The specified token is not valid. Use ${getCommandName(
-        `login`
-      )} to generate a new token.`,
+      message: `The specified token is not valid`,
       meta: {},
     });
   }
@@ -186,13 +183,11 @@ export class DomainNotFound extends NowError<
   'DOMAIN_NOT_FOUND',
   { domain: string }
 > {
-  constructor(domain: string, contextName?: string) {
+  constructor(domain: string) {
     super({
       code: 'DOMAIN_NOT_FOUND',
       meta: { domain },
-      message: `Domain not found by "${domain}"${
-        contextName ? ` under ${chalk.bold(contextName)}` : ''
-      }.`,
+      message: `The domain ${domain} can't be found.`,
     });
   }
 }

packages/now-cli/src/util/link/setup-and-link.ts

@@ -1,7 +1,7 @@
 import { join, basename } from 'path';
 import chalk from 'chalk';
 import { remove } from 'fs-extra';
-import { NowContext, ProjectLinkResult, ProjectSettings } from '../../types';
+import { NowContext, ProjectLinkResult } from '../../types';
 import { NowConfig } from '../dev/types';
 import { Output } from '../output';
 import {
@@ -142,75 +142,69 @@ export default async function setupAndLink(
   if (ctx.localConfig && !(ctx.localConfig instanceof Error)) {
     localConfig = ctx.localConfig;
   }
-
   client.currentTeam = org.type === 'team' ? org.id : undefined;
-  const isZeroConfig = !localConfig.builds || localConfig.builds.length === 0;
+  const now = new Now({
+    apiUrl,
+    token,
+    debug,
+    currentTeam: client.currentTeam,
+  });
+  let deployment = null;
 
   try {
-    let settings: ProjectSettings = {};
+    const createArgs: any = {
+      name: newProjectName,
+      env: {},
+      build: { env: {} },
+      forceNew: undefined,
+      withCache: undefined,
+      quiet,
+      wantsPublic: localConfig.public,
+      isFile,
+      type: null,
+      nowConfig: localConfig,
+      regions: undefined,
+      meta: {},
+      deployStamp: stamp(),
+      target: undefined,
+      skipAutoDetectionConfirmation: false,
+    };
 
-    if (isZeroConfig) {
-      const now = new Now({
-        apiUrl,
-        token,
-        debug,
-        currentTeam: client.currentTeam,
-      });
-      const createArgs: any = {
-        name: newProjectName,
-        env: {},
-        build: { env: {} },
-        forceNew: undefined,
-        withCache: undefined,
-        quiet,
-        wantsPublic: localConfig.public,
-        isFile,
-        type: null,
-        nowConfig: localConfig,
-        regions: undefined,
-        meta: {},
-        deployStamp: stamp(),
-        target: undefined,
-        skipAutoDetectionConfirmation: false,
-      };
+    deployment = await createDeploy(
+      output,
+      now,
+      client.currentTeam || 'current user',
+      [sourcePath],
+      createArgs,
+      org,
+      !isFile,
+      path
+    );
 
-      const deployment = await createDeploy(
-        output,
-        now,
-        client.currentTeam || 'current user',
-        [sourcePath],
-        createArgs,
-        org,
-        !isFile,
-        path
-      );
-
-      if (
-        !deployment ||
-        !('code' in deployment) ||
-        deployment.code !== 'missing_project_settings'
-      ) {
-        output.error('Failed to detect project settings. Please try again.');
-        if (output.isDebugEnabled()) {
-          console.log(deployment);
-        }
-        return { status: 'error', exitCode: 1 };
+    if (
+      !deployment ||
+      !('code' in deployment) ||
+      deployment.code !== 'missing_project_settings'
+    ) {
+      output.error('Failed to detect project settings. Please try again.');
+      if (output.isDebugEnabled()) {
+        console.log(deployment);
       }
-
-      const { projectSettings, framework } = deployment;
-
-      settings = await editProjectSettings(
-        output,
-        projectSettings,
-        framework,
-        autoConfirm
-      );
+      return { status: 'error', exitCode: 1 };
     }
 
+    const { projectSettings, framework } = deployment;
+
     if (rootDirectory) {
-      settings.rootDirectory = rootDirectory;
+      projectSettings.rootDirectory = rootDirectory;
     }
 
+    const settings = await editProjectSettings(
+      output,
+      projectSettings,
+      framework,
+      autoConfirm
+    );
     const project = await createProject(client, newProjectName);
     await updateProject(client, project.id, settings);
     Object.assign(project, settings);

packages/now-cli/src/util/output/create-output.ts

@@ -28,11 +28,15 @@ export default function createOutput({ debug: debugEnabled = false } = {}) {
     str: string,
     slug: string | null = null,
     link: string | null = null,
-    action: string | null = 'Learn More',
-    options?: {
-      boxen?: boxen.Options;
-    }
+    action: string = 'Learn More'
   ) {
+    const prevTerm = process.env.TERM;
+
+    if (!prevTerm) {
+      // workaround for https://github.com/sindresorhus/term-size/issues/13
+      process.env.TERM = 'xterm';
+    }
+
     const details = slug ? `https://err.sh/now/${slug}` : link;
 
     print(
@@ -48,11 +52,12 @@ export default function createOutput({ debug: debugEnabled = false } = {}) {
             right: 1,
           },
           borderColor: 'yellow',
-          ...options?.boxen,
         }
       )
     );
     print('\n');
+
+    process.env.TERM = prevTerm;
   }
 
   function note(str: string) {

packages/now-cli/src/util/projects/find-projects-for-domain.ts

@@ -1,4 +1,6 @@
+import chalk from 'chalk';
 import Client from '../client';
+import wait from '../output/wait';
 import { Project } from '../../types';
 import { URLSearchParams } from 'url';
 
@@ -6,6 +8,9 @@ export async function findProjectsForDomain(
   client: Client,
   domainName: string
 ): Promise<Project[] | Error> {
+  const cancelWait = wait(
+    `Searching project for domain ${chalk.bold(domainName)}`
+  );
   try {
     const limit = 50;
     let result: Project[] = [];
@@ -25,7 +30,7 @@ export async function findProjectsForDomain(
       }
 
       const [latest] = response.sort((a, b) => b.updatedAt - a.updatedAt);
-      query.set('from', latest.updatedAt.toString());
+      query.append('from', latest.updatedAt.toString());
     }
 
     return result;
@@ -35,5 +40,7 @@ export async function findProjectsForDomain(
     }
 
     throw err;
+  } finally {
+    cancelWait();
   }
 }

packages/now-cli/src/util/projects/get-projects-with-domains.ts

@@ -0,0 +1,39 @@
+import Client from '../client';
+import wait from '../output/wait';
+import { Project } from '../../types';
+import { URLSearchParams } from 'url';
+
+export async function getProjectsWithDomains(
+  client: Client
+): Promise<Project[] | Error> {
+  const cancelWait = wait(`Fetching projects with domains`);
+  try {
+    const limit = 50;
+    let result: Project[] = [];
+
+    const query = new URLSearchParams({
+      hasProductionDomains: '1',
+      limit: limit.toString(),
+    });
+
+    for (let i = 0; i < 1000; i++) {
+      const response = await client.fetch<Project[]>(`/v2/projects/?${query}`);
+      result.push(...response);
+
+      const [latest] = response.sort((a, b) => b.updatedAt - a.updatedAt);
+      query.append('from', latest.updatedAt.toString());
+
+      if (response.length !== limit) break;
+    }
+
+    return result;
+  } catch (err) {
+    if (err.status < 500) {
+      return err;
+    }
+
+    throw err;
+  } finally {
+    cancelWait();
+  }
+}

packages/now-cli/src/util/projects/link.ts

@@ -244,12 +244,11 @@ export async function linkFolderToProject(
     const gitIgnore = await readFile(gitIgnorePath)
       .then(buf => buf.toString())
       .catch(() => null);
-    const EOL = gitIgnore && gitIgnore.includes('\r\n') ? '\r\n' : '\n';
 
-    if (!gitIgnore || !gitIgnore.split(EOL).includes(VERCEL_DIR)) {
+    if (!gitIgnore || !gitIgnore.split('\n').includes(VERCEL_DIR)) {
       await writeFile(
         gitIgnorePath,
-        gitIgnore ? `${gitIgnore}${EOL}${VERCEL_DIR}${EOL}` : `${VERCEL_DIR}${EOL}`
+        gitIgnore ? `${gitIgnore}\n${VERCEL_DIR}` : VERCEL_DIR
       );
       isGitIgnoreUpdated = true;
     }

packages/now-cli/test/dev/fixtures/test-external-rewrites-and-redirects/vercel.json

@@ -1,14 +0,0 @@
-{
-  "version": 2,
-  "rewrites": [
-    { "source": "/rewrite", "destination": "https://vercel.com/robots.txt" }
-  ],
-  "redirects": [
-    { "source": "/redirect", "destination": "https://vercel.com/robots.txt" },
-    {
-      "source": "/tempRedirect",
-      "destination": "https://vercel.com/robots.txt",
-      "permanent": false
-    }
-  ]
-}

packages/now-cli/test/dev/integration.js

@@ -20,8 +20,6 @@ let port = 3000;
 const binaryPath = resolve(__dirname, `../../scripts/start.js`);
 const fixture = name => join('test', 'dev', 'fixtures', name);
 const fixtureAbsolute = name => join(__dirname, 'fixtures', name);
-const exampleAbsolute = name =>
-  join(__dirname, '..', '..', '..', '..', 'examples', name);
 
 let processCounter = 0;
 const processList = new Map();
@@ -113,7 +111,7 @@ async function exec(directory, args = []) {
 }
 
 async function runNpmInstall(fixturePath) {
-  if (await fs.pathExists(join(fixturePath, 'package.json'))) {
+  if (await fs.exists(join(fixturePath, 'package.json'))) {
     await execa('yarn', ['install'], {
       cwd: fixturePath,
       shell: true,
@@ -129,10 +127,9 @@ async function testPath(
   path,
   expectedText,
   headers = {},
-  method = 'GET',
-  body = undefined
+  method = 'GET'
 ) {
-  const opts = { redirect: 'manual-dont-change', method, body };
+  const opts = { redirect: 'manual-dont-change', method };
   const url = `${origin}${path}`;
   const res = await fetch(url, opts);
   const msg = `Testing response from ${method} ${url}`;
@@ -233,18 +230,10 @@ async function testFixture(directory, opts = {}, args = []) {
 function testFixtureStdio(
   directory,
   fn,
-  { expectedCode = 0, skipDeploy, isExample } = {}
+  { expectedCode = 0, skipDeploy } = {}
 ) {
   return async t => {
-    const nodeMajor = Number(process.versions.node.split('.')[0]);
-    if (isExample && nodeMajor < 12) {
-      console.log(`Skipping ${directory} on Node ${process.version}`);
-      t.pass();
-      return;
-    }
-    const cwd = isExample
-      ? exampleAbsolute(directory)
-      : fixtureAbsolute(directory);
+    const cwd = fixtureAbsolute(directory);
     const token = await fetchTokenWithRetry();
     let deploymentUrl;
 
@@ -380,21 +369,6 @@ test.afterEach(async () => {
   );
 });
 
-test(
-  '[vercel dev] redwoodjs example',
-  testFixtureStdio(
-    'redwoodjs',
-    async testPath => {
-      await testPath(200, '/', /<div id="redwood-app">/m);
-      await testPath(200, '/about', /<div id="redwood-app">/m);
-      const reqBody = '{"query":"{redwood{version}}"}';
-      const resBody = '{"data":{"redwood":{"version":"0.15.0"}}}';
-      await testPath(200, '/api/graphql', resBody, {}, 'POST', reqBody);
-    },
-    { isExample: true }
-  )
-);
-
 test('[vercel dev] prints `npm install` errors', async t => {
   const dir = fixture('runtime-not-installed');
   const result = await exec(dir);
@@ -843,20 +817,6 @@ test(
   })
 );
 
-test(
-  '[vercel dev] test rewrites and redirects serve correct external content',
-  testFixtureStdio('test-external-rewrites-and-redirects', async testPath => {
-    const vcRobots = `https://vercel.com/robots.txt`;
-    await testPath(200, '/rewrite', /User-Agent: \*/m);
-    await testPath(308, '/redirect', `Redirecting to ${vcRobots} (308)`, {
-      Location: vcRobots,
-    });
-    await testPath(307, '/tempRedirect', `Redirecting to ${vcRobots} (307)`, {
-      Location: vcRobots,
-    });
-  })
-);
-
 test(
   '[vercel dev] test rewrites and redirects is case sensitive',
   testFixtureStdio('test-routing-case-sensitive', async testPath => {
@@ -1175,8 +1135,7 @@ test(
     await testPath(200, '/api/date', new RegExp(new Date().getFullYear()));
     await testPath(200, '/contact', /Contact Page/);
     await testPath(200, '/support', /Contact Page/);
-    // TODO: Fix this test assertion that fails intermittently
-    // await testPath(404, '/nothing', /Custom Next 404/);
+    await testPath(404, '/nothing', /Custom Next 404/);
   })
 );
 

packages/now-cli/test/helpers/prepare.js

@@ -500,21 +500,14 @@ CMD ["node", "index.js"]`,
         },
       }),
     },
-    'project-link-deploy': {
-      'package.json': '{}',
-    },
-    'project-link-zeroconf': {
-      'package.json': '{}',
+    'project-link': {
+      'package.json': JSON.stringify({}),
     },
     'project-link-confirm': {
-      'package.json': '{}',
+      'package.json': JSON.stringify({}),
     },
     'project-link-dev': {
-      'package.json': '{}',
-    },
-    'project-link-legacy': {
-      'index.html': 'Hello',
-      'vercel.json': '{"builds":[{"src":"*.html","use":"@vercel/static"}]}',
+      'package.json': JSON.stringify({}),
     },
     'dev-proxy-headers-and-env': {
       'package.json': JSON.stringify({}),

packages/now-cli/test/integration.js

@@ -1885,6 +1885,7 @@ test('deploying a file should not show prompts and display deprecation', async t
   // Test if the output is really a URL
   const { href, host } = new URL(stdout);
   t.is(host.split('-')[0], 'files');
+  console.log('static-single-file/first.png: stdout', stdout);
 
   // Send a test request to the deployment
   const response = await fetch(href);
@@ -2321,11 +2322,7 @@ test('render build errors', async t => {
   console.log(output.exitCode);
 
   t.is(output.exitCode, 1, formatOutput(output));
-  t.regex(
-    output.stderr,
-    /Command "yarn run build" exited with 1/gm,
-    formatOutput(output)
-  );
+  t.regex(output.stderr, /Build failed/gm, formatOutput(output));
 });
 
 test('invalid deployment, projects and alias names', async t => {
@@ -2554,18 +2551,6 @@ test('deploy a Lambda with a specific runtime', async t => {
   t.is(build.use, 'vercel-php@0.1.0', JSON.stringify(build, null, 2));
 });
 
-test('fail to deploy a Lambda with a specific runtime but without a locked version', async t => {
-  const directory = fixture('lambda-with-invalid-runtime');
-  const output = await execute([directory, '--confirm']);
-
-  t.is(output.exitCode, 1, formatOutput(output));
-  t.regex(
-    output.stderr,
-    /Function Runtimes must have a valid version/gim,
-    formatOutput(output)
-  );
-});
-
 test('fail to add a domain without a project', async t => {
   const output = await execute(['domains', 'add', 'my-domain.now.sh']);
   t.is(output.exitCode, 1, formatOutput(output));
@@ -2621,6 +2606,39 @@ test('assign a domain to a project', async t => {
   t.is(removeResponse.exitCode, 0, formatOutput(removeResponse));
 });
 
+test('list project domains', async t => {
+  const domain = `project-domain.${contextName}.now.sh`;
+  const directory = fixture('static-deployment');
+
+  const deploymentOutput = await execute([directory, '--public', '--confirm']);
+  t.is(deploymentOutput.exitCode, 0, formatOutput(deploymentOutput));
+
+  const host = deploymentOutput.stdout.trim().replace('https://', '');
+  const deployment = await apiFetch(
+    `/v10/now/deployments/unknown?url=${host}`
+  ).then(resp => resp.json());
+
+  t.is(typeof deployment.name, 'string', JSON.stringify(deployment, null, 2));
+  const project = deployment.name;
+
+  const addOutput = await execute([
+    'domains',
+    'add',
+    domain,
+    project,
+    '--force',
+  ]);
+  t.is(addOutput.exitCode, 0, formatOutput(addOutput));
+
+  const output = await execute(['domains', 'ls']);
+  t.is(output.exitCode, 0, formatOutput(output));
+  t.regex(output.stderr, new RegExp(domain), formatOutput(output));
+  t.regex(output.stderr, new RegExp(project), formatOutput(output));
+
+  const removeResponse = await execute(['rm', project, '-y']);
+  t.is(removeResponse.exitCode, 0, formatOutput(removeResponse));
+});
+
 test('ensure `github` and `scope` are not sent to the API', async t => {
   const directory = fixture('github-and-scope-config');
   const output = await execute([directory, '--confirm']);
@@ -2628,9 +2646,9 @@ test('ensure `github` and `scope` are not sent to the API', async t => {
   t.is(output.exitCode, 0, formatOutput(output));
 });
 
-test('should show prompts to set up project during first deploy', async t => {
-  const directory = fixture('project-link-deploy');
-  const projectName = `project-link-deploy-${
+test('should show prompts to set up project', async t => {
+  const directory = fixture('project-link');
+  const projectName = `project-link-${
     Math.random().toString(36).split('.')[1]
   }`;
 
@@ -2701,7 +2719,7 @@ test('should show prompts to set up project during first deploy', async t => {
   // Ensure .gitignore is created
   t.is(
     (await readFile(path.join(directory, '.gitignore'))).toString(),
-    '.vercel\n'
+    '.vercel'
   );
 
   // Ensure .vercel/project.json and .vercel/README.txt are created
@@ -3255,8 +3273,8 @@ test('reject deploying with wrong team .vercel config', async t => {
 });
 
 test('[vc link] should show prompts to set up project', async t => {
-  const dir = fixture('project-link-zeroconf');
-  const projectName = `project-link-zeroconf-${
+  const dir = fixture('project-link');
+  const projectName = `project-link-${
     Math.random().toString(36).split('.')[1]
   }`;
 
@@ -3321,7 +3339,7 @@ test('[vc link] should show prompts to set up project', async t => {
   t.is(output.exitCode, 0, formatOutput(output));
 
   // Ensure .gitignore is created
-  t.is((await readFile(path.join(dir, '.gitignore'))).toString(), '.vercel\n');
+  t.is((await readFile(path.join(dir, '.gitignore'))).toString(), '.vercel');
 
   // Ensure .vercel/project.json and .vercel/README.txt are created
   t.is(
@@ -3355,7 +3373,7 @@ test('[vc link --confirm] should not show prompts and autolink', async t => {
   t.regex(stderr, /Linked to /m);
 
   // Ensure .gitignore is created
-  t.is((await readFile(path.join(dir, '.gitignore'))).toString(), '.vercel\n');
+  t.is((await readFile(path.join(dir, '.gitignore'))).toString(), '.vercel');
 
   // Ensure .vercel/project.json and .vercel/README.txt are created
   t.is(
@@ -3439,7 +3457,7 @@ test('[vc dev] should show prompts to set up project', async t => {
   await waitForPrompt(dev, chunk => chunk.includes('Linked to'));
 
   // Ensure .gitignore is created
-  t.is((await readFile(path.join(dir, '.gitignore'))).toString(), '.vercel\n');
+  t.is((await readFile(path.join(dir, '.gitignore'))).toString(), '.vercel');
 
   // Ensure .vercel/project.json and .vercel/README.txt are created
   t.is(
@@ -3465,61 +3483,6 @@ test('[vc dev] should show prompts to set up project', async t => {
   }
 });
 
-test('[vc link] should show project prompts but not framework when `builds` defined', async t => {
-  const dir = fixture('project-link-legacy');
-  const projectName = `project-link-legacy-${
-    Math.random().toString(36).split('.')[1]
-  }`;
-
-  // remove previously linked project if it exists
-  await remove(path.join(dir, '.vercel'));
-
-  const vc = execa(binaryPath, ['link', ...defaultArgs], { cwd: dir });
-
-  await waitForPrompt(vc, chunk => /Set up [^?]+\?/.test(chunk));
-  vc.stdin.write('yes\n');
-
-  await waitForPrompt(vc, chunk =>
-    chunk.includes('Which scope should contain your project?')
-  );
-  vc.stdin.write('\n');
-
-  await waitForPrompt(vc, chunk => chunk.includes('Link to existing project?'));
-  vc.stdin.write('no\n');
-
-  await waitForPrompt(vc, chunk =>
-    chunk.includes('What’s your project’s name?')
-  );
-  vc.stdin.write(`${projectName}\n`);
-
-  await waitForPrompt(vc, chunk =>
-    chunk.includes('In which directory is your code located?')
-  );
-  vc.stdin.write('\n');
-
-  await waitForPrompt(vc, chunk => chunk.includes('Linked to'));
-
-  const output = await vc;
-
-  // Ensure the exit code is right
-  t.is(output.exitCode, 0, formatOutput(output));
-
-  // Ensure .gitignore is created
-  t.is((await readFile(path.join(dir, '.gitignore'))).toString(), '.vercel\n');
-
-  // Ensure .vercel/project.json and .vercel/README.txt are created
-  t.is(
-    await exists(path.join(dir, '.vercel', 'project.json')),
-    true,
-    'project.json should be created'
-  );
-  t.is(
-    await exists(path.join(dir, '.vercel', 'README.txt')),
-    true,
-    'README.txt should be created'
-  );
-});
-
 test('[vc dev] should send the platform proxy request headers to frontend dev server ', async t => {
   const dir = fixture('dev-proxy-headers-and-env');
   const port = 58353;

packages/now-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/client",
-  "version": "8.2.2-canary.4",
+  "version": "8.2.2-canary.3",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "homepage": "https://vercel.com",

packages/now-client/src/create-deployment.ts

@@ -80,11 +80,7 @@ export default function buildCreateDeployment(version: number) {
       rootFiles = [path];
     }
 
-    let { fileList } = await buildFileTree(
-      path,
-      clientOptions.isDirectory,
-      debug
-    );
+    let fileList = await buildFileTree(path, clientOptions.isDirectory, debug);
 
     let configPath: string | undefined;
     if (!nowConfig) {

packages/now-client/src/index.ts

@@ -1,6 +1,6 @@
 import buildCreateDeployment from './create-deployment';
 
-export { getVercelIgnore, buildFileTree } from './utils/index';
+export { getVercelIgnore } from './utils/index';
 export const createDeployment = buildCreateDeployment(2);
 export const createLegacyDeployment = buildCreateDeployment(1);
 export * from './errors';

packages/now-client/src/utils/index.ts

@@ -35,7 +35,7 @@ const EVENTS_ARRAY = [
   'canceled',
 ] as const;
 
-export type DeploymentEventType = typeof EVENTS_ARRAY[number];
+export type DeploymentEventType = (typeof EVENTS_ARRAY)[number];
 export const EVENTS = new Set(EVENTS_ARRAY);
 
 export function getApiDeploymentsUrl(
@@ -69,7 +69,7 @@ export async function parseVercelConfig(filePath?: string): Promise<NowConfig> {
   }
 }
 
-const maybeRead = async function <T>(path: string, default_: T) {
+const maybeRead = async function<T>(path: string, default_: T) {
   try {
     return await readFile(path, 'utf8');
   } catch (err) {
@@ -81,26 +81,19 @@ export async function buildFileTree(
   path: string | string[],
   isDirectory: boolean,
   debug: Debug
-): Promise<{ fileList: string[]; ignoreList: string[] }> {
-  const ignoreList: string[] = [];
+): Promise<string[]> {
   let fileList: string[];
-  let { ig, ignores } = await getVercelIgnore(path);
+  let { ig } = await getVercelIgnore(path);
 
-  debug(`Found ${ignores.length} rules in .vercelignore`);
+  debug(`Found ${ig.ignores.length} rules in .vercelignore`);
   debug('Building file tree...');
 
   if (isDirectory && !Array.isArray(path)) {
     // Directory path
-    const ignores = (absPath: string) => {
-      const rel = relative(path, absPath);
-      const ignored = ig.ignores(rel);
-      if (ignored) {
-        ignoreList.push(rel);
-      }
-      return ignored;
-    };
+    const cwd = process.cwd();
+    const ignores = (absPath: string) => ig.ignores(relative(cwd, absPath));
     fileList = await readdir(path, [ignores]);
-    debug(`Found ${fileList.length} files in the specified directory`);
+    debug(`Read ${fileList.length} files in the specified directory`);
   } else if (Array.isArray(path)) {
     // Array of file paths
     fileList = path;
@@ -111,7 +104,7 @@ export async function buildFileTree(
     debug(`Deploying the provided path as single file`);
   }
 
-  return { fileList, ignoreList };
+  return fileList;
 }
 
 export async function getVercelIgnore(

packages/now-client/tests/unit.utils.test.ts

@@ -14,30 +14,18 @@ const normalizeWindowsPaths = (files: string[]) => {
 const toAbsolutePaths = (cwd: string, files: string[]) =>
   files.map(p => join(cwd, p));
 
-describe('buildFileTree()', () => {
+describe('buildFileTree', () => {
   it('should exclude files using `.nowignore` blocklist', async () => {
     const cwd = fixture('nowignore');
-    const { fileList, ignoreList } = await buildFileTree(cwd, true, noop);
-
-    const expectedFileList = toAbsolutePaths(cwd, ['.nowignore', 'index.txt']);
-    expect(normalizeWindowsPaths(expectedFileList).sort()).toEqual(
-      normalizeWindowsPaths(fileList).sort()
-    );
-
-    const expectedIgnoreList = [
-      'ignore.txt',
-      'folder/ignore.txt',
-      'node_modules/ignore.txt',
-    ];
-    expect(normalizeWindowsPaths(expectedIgnoreList).sort()).toEqual(
-      normalizeWindowsPaths(ignoreList).sort()
+    const expected = toAbsolutePaths(cwd, ['.nowignore', 'index.txt']);
+    const actual = await buildFileTree(cwd, true, noop);
+    expect(normalizeWindowsPaths(expected).sort()).toEqual(
+      normalizeWindowsPaths(actual).sort()
     );
   });
 
   it('should include the node_modules using `.vercelignore` allowlist', async () => {
     const cwd = fixture('vercelignore-allow-nodemodules');
-    const { fileList, ignoreList } = await buildFileTree(cwd, true, noop);
-
     const expected = toAbsolutePaths(cwd, [
       'node_modules/one.txt',
       'sub/node_modules/two.txt',
@@ -45,13 +33,9 @@ describe('buildFileTree()', () => {
       '.vercelignore',
       'hello.txt',
     ]);
+    const actual = await buildFileTree(cwd, true, noop);
     expect(normalizeWindowsPaths(expected).sort()).toEqual(
-      normalizeWindowsPaths(fileList).sort()
-    );
-
-    const expectedIgnoreList = ['.env.local', 'exclude.txt'];
-    expect(normalizeWindowsPaths(expectedIgnoreList).sort()).toEqual(
-      normalizeWindowsPaths(ignoreList).sort()
+      normalizeWindowsPaths(actual).sort()
     );
   });
 });

packages/now-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "2.6.19",
+  "version": "2.6.14-canary.1",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -26,7 +26,7 @@
     "@types/resolve-from": "5.0.1",
     "@types/semver": "6.0.0",
     "@types/yazl": "2.4.1",
-    "@zeit/node-file-trace": "0.8.2",
+    "@zeit/node-file-trace": "0.8.0",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",
     "escape-string-regexp": "3.0.0",

packages/now-next/src/index.ts

@@ -1,3 +1,20 @@
+import buildUtils from './build-utils';
+import url from 'url';
+const {
+  createLambda,
+  debug,
+  download,
+  getLambdaOptionsFromFunction,
+  getNodeVersion,
+  getSpawnOptions,
+  getScriptName,
+  glob,
+  runNpmInstall,
+  runPackageJsonScript,
+  execCommand,
+  getNodeBinPath,
+} = buildUtils;
+
 import {
   BuildOptions,
   Config,
@@ -17,17 +34,13 @@ import {
   convertRewrites,
 } from '@vercel/routing-utils/dist/superstatic';
 import { nodeFileTrace, NodeFileTraceReasons } from '@zeit/node-file-trace';
-import { Sema } from 'async-sema';
 import { ChildProcess, fork } from 'child_process';
 import escapeStringRegexp from 'escape-string-regexp';
-import findUp from 'find-up';
 import { lstat, pathExists, readFile, remove, writeFile } from 'fs-extra';
 import os from 'os';
 import path from 'path';
 import resolveFrom from 'resolve-from';
 import semver from 'semver';
-import url from 'url';
-import buildUtils from './build-utils';
 import createServerlessConfig from './create-serverless-config';
 import nextLegacyVersions from './legacy-versions';
 import {
@@ -53,20 +66,8 @@ import {
   syncEnvVars,
   validateEntrypoint,
 } from './utils';
-const {
-  createLambda,
-  debug,
-  download,
-  getLambdaOptionsFromFunction,
-  getNodeVersion,
-  getSpawnOptions,
-  getScriptName,
-  glob,
-  runNpmInstall,
-  runPackageJsonScript,
-  execCommand,
-  getNodeBinPath,
-} = buildUtils;
+import findUp from 'find-up';
+import { Sema } from 'async-sema';
 
 interface BuildParamsMeta {
   isDev: boolean | undefined;
@@ -234,7 +235,7 @@ export const build = async ({
 
   await download(files, workPath, meta);
 
-  let pkg = await readPackageJson(entryPath);
+  const pkg = await readPackageJson(entryPath);
   const nextVersionRange = await getNextVersionRange(entryPath);
   const nodeVersion = await getNodeVersion(entryPath, undefined, config, meta);
   const spawnOpts = getSpawnOptions(meta, nodeVersion);
@@ -330,17 +331,17 @@ export const build = async ({
     ]);
 
     debug('Normalizing package.json');
-    pkg = normalizePackageJson(pkg);
-    debug('Normalized package.json result: ', pkg);
-    await writePackageJson(entryPath, pkg);
+    const packageJson = normalizePackageJson(pkg);
+    debug('Normalized package.json result: ', packageJson);
+    await writePackageJson(entryPath, packageJson);
   }
 
-  let buildScriptName = getScriptName(pkg, [
+  const buildScriptName = getScriptName(pkg, [
     'vercel-build',
     'now-build',
     'build',
   ]);
-  const { buildCommand } = config;
+  let { buildCommand } = config;
 
   if (!buildScriptName && !buildCommand) {
     console.log(
@@ -348,15 +349,7 @@ export const build = async ({
         'If you need to define a different build step, please create a `vercel-build` script in your `package.json` ' +
         '(e.g. `{ "scripts": { "vercel-build": "npm run prepare && next build" } }`).'
     );
-
-    await writePackageJson(entryPath, {
-      ...pkg,
-      scripts: {
-        'vercel-build': 'next build',
-        ...pkg.scripts,
-      },
-    });
-    buildScriptName = 'vercel-build';
+    buildCommand = 'next build';
   }
 
   if (process.env.NPM_AUTH_TOKEN) {
@@ -445,7 +438,7 @@ export const build = async ({
           for (const dataRoute of routesManifest.dataRoutes) {
             const ssgDataRoute =
               prerenderManifest.fallbackRoutes[dataRoute.page] ||
-              prerenderManifest.blockingFallbackRoutes[dataRoute.page];
+              prerenderManifest.legacyBlockingRoutes[dataRoute.page];
 
             // we don't need to add routes for non-lazy SSG routes since
             // they have outputs which would override the routes anyways
@@ -885,15 +878,9 @@ export const build = async ({
         initialRevalidate === false &&
         !canUsePreviewMode &&
         !prerenderManifest.fallbackRoutes[route] &&
-        !prerenderManifest.blockingFallbackRoutes[route]
+        !prerenderManifest.legacyBlockingRoutes[route]
       ) {
-        // if the 404 page used getStaticProps we need to update static404Page
-        // since it wasn't populated from the staticPages group
-        if (route === '/404') {
-          static404Page = path.join(entryDirectory, '404');
-        }
-
-        nonLambdaSsgPages.add(route === '/' ? '/index' : route);
+        nonLambdaSsgPages.add(route);
       }
     };
 
@@ -1130,7 +1117,7 @@ export const build = async ({
           src: `^${escapeStringRegexp(outputName).replace(
             /\/index$/,
             '(/|/index|)'
-          )}/?$`,
+          )}$`,
           dest: `${path.join('/', currentLambdaGroup.lambdaIdentifier)}`,
           headers: {
             'x-nextjs-page': outputName,
@@ -1310,7 +1297,7 @@ export const build = async ({
                   if (!toRender) {
                     try {
                       const { pathname } = url.parse(req.url)
-                      toRender = pathname.replace(/\\/$/, '')
+                      toRender = pathname
                     } catch (_) {
                       // handle failing to parse url
                       res.statusCode = 400
@@ -1465,7 +1452,7 @@ export const build = async ({
       if (isFallback || isBlocking) {
         const pr = isFallback
           ? prerenderManifest.fallbackRoutes[routeKey]
-          : prerenderManifest.blockingFallbackRoutes[routeKey];
+          : prerenderManifest.legacyBlockingRoutes[routeKey];
         initialRevalidate = 1; // TODO: should Next.js provide this default?
         // @ts-ignore
         if (initialRevalidate === false) {
@@ -1556,7 +1543,7 @@ export const build = async ({
     Object.keys(prerenderManifest.fallbackRoutes).forEach(route =>
       onPrerenderRoute(route, { isBlocking: false, isFallback: true })
     );
-    Object.keys(prerenderManifest.blockingFallbackRoutes).forEach(route =>
+    Object.keys(prerenderManifest.legacyBlockingRoutes).forEach(route =>
       onPrerenderRoute(route, { isBlocking: true, isFallback: false })
     );
 
@@ -1566,7 +1553,7 @@ export const build = async ({
       // Dynamic pages for lazy routes should be handled by the lambda flow.
       [
         ...Object.entries(prerenderManifest.fallbackRoutes),
-        ...Object.entries(prerenderManifest.blockingFallbackRoutes),
+        ...Object.entries(prerenderManifest.legacyBlockingRoutes),
       ].forEach(([, { dataRouteRegex, dataRoute }]) => {
         dataRoutes.push({
           // Next.js provided data route regex

packages/now-next/src/utils.ts

@@ -1,15 +1,15 @@
-import { FileFsRef, Files } from '@vercel/build-utils';
-import { NowHeader, NowRewrite, Route, Source } from '@vercel/routing-utils';
-import { Sema } from 'async-sema';
-import crc32 from 'buffer-crc32';
-import fs from 'fs-extra';
+import zlib from 'zlib';
 import path from 'path';
-import resolveFrom from 'resolve-from';
+import fs from 'fs-extra';
 import semver from 'semver';
 import { ZipFile } from 'yazl';
-import zlib from 'zlib';
+import crc32 from 'buffer-crc32';
+import { Sema } from 'async-sema';
+import resolveFrom from 'resolve-from';
 import buildUtils from './build-utils';
 const { streamToBuffer, Lambda, NowBuildError, isSymbolicLink } = buildUtils;
+import { Files, FileFsRef } from '@vercel/build-utils';
+import { Route, Source, NowHeader, NowRewrite } from '@vercel/routing-utils';
 
 type stringMap = { [key: string]: string };
 
@@ -198,7 +198,7 @@ async function getRoutes(
   // If default pages dir isn't found check for `src/pages`
   if (
     !pagesDir &&
-    fileKeys.some(file =>
+    fileKeys.some((file) =>
       file.startsWith(path.join(entryDirectory, 'src/pages'))
     )
   ) {
@@ -260,7 +260,7 @@ async function getRoutes(
       entryDirectory,
       dynamicPages,
       true
-    ).then(arr =>
+    ).then((arr) =>
       arr.map((route: Source) => {
         // convert to make entire RegExp match as one group
         route.src = route.src
@@ -287,7 +287,7 @@ async function getRoutes(
     };
 
     // Only add the route if a page is not already using it
-    if (!routes.some(r => (r as Source).src === route.src)) {
+    if (!routes.some((r) => (r as Source).src === route.src)) {
       routes.push(route);
     }
   }
@@ -420,7 +420,7 @@ export async function getDynamicRoutes(
               dest: `${!isDev ? path.join('/', entryDirectory, page) : page}${
                 routeKeys
                   ? `?${Object.keys(routeKeys)
-                      .map(key => `${routeKeys[key]}=$${key}`)
+                      .map((key) => `${routeKeys[key]}=$${key}`)
                       .join('&')}`
                   : ''
               }`,
@@ -479,13 +479,13 @@ export async function getDynamicRoutes(
     });
   }
 
-  const pageMatchers = getSortedRoutes(dynamicPages).map(pageName => ({
+  const pageMatchers = getSortedRoutes(dynamicPages).map((pageName) => ({
     pageName,
     matcher: getRouteRegex && getRouteRegex(pageName).re,
   }));
 
   const routes: Source[] = [];
-  pageMatchers.forEach(pageMatcher => {
+  pageMatchers.forEach((pageMatcher) => {
     // in `vercel dev` we don't need to prefix the destination
     const dest = !isDev
       ? path.join('/', entryDirectory, pageMatcher.pageName)
@@ -693,7 +693,7 @@ export type NextPrerenderedRoutes = {
     };
   };
 
-  blockingFallbackRoutes: {
+  legacyBlockingRoutes: {
     [route: string]: {
       routeRegex: string;
       dataRoute: string;
@@ -797,7 +797,7 @@ export async function getPrerenderManifest(
   if (!hasManifest) {
     return {
       staticRoutes: {},
-      blockingFallbackRoutes: {},
+      legacyBlockingRoutes: {},
       fallbackRoutes: {},
       bypassToken: null,
       omittedRoutes: [],
@@ -855,14 +855,14 @@ export async function getPrerenderManifest(
 
       const ret: NextPrerenderedRoutes = {
         staticRoutes: {},
-        blockingFallbackRoutes: {},
+        legacyBlockingRoutes: {},
         fallbackRoutes: {},
         bypassToken:
           (manifest.preview && manifest.preview.previewModeId) || null,
         omittedRoutes: [],
       };
 
-      routes.forEach(route => {
+      routes.forEach((route) => {
         const {
           initialRevalidateSeconds,
           dataRoute,
@@ -878,7 +878,7 @@ export async function getPrerenderManifest(
         };
       });
 
-      lazyRoutes.forEach(lazyRoute => {
+      lazyRoutes.forEach((lazyRoute) => {
         const {
           routeRegex,
           fallback,
@@ -894,7 +894,7 @@ export async function getPrerenderManifest(
             dataRouteRegex,
           };
         } else {
-          ret.blockingFallbackRoutes[lazyRoute] = {
+          ret.legacyBlockingRoutes[lazyRoute] = {
             routeRegex,
             dataRoute,
             dataRouteRegex,
@@ -910,13 +910,13 @@ export async function getPrerenderManifest(
 
       const ret: NextPrerenderedRoutes = {
         staticRoutes: {},
-        blockingFallbackRoutes: {},
+        legacyBlockingRoutes: {},
         fallbackRoutes: {},
         bypassToken: manifest.preview.previewModeId,
         omittedRoutes: [],
       };
 
-      routes.forEach(route => {
+      routes.forEach((route) => {
         const {
           initialRevalidateSeconds,
           dataRoute,
@@ -932,7 +932,7 @@ export async function getPrerenderManifest(
         };
       });
 
-      lazyRoutes.forEach(lazyRoute => {
+      lazyRoutes.forEach((lazyRoute) => {
         const {
           routeRegex,
           fallback,
@@ -940,24 +940,19 @@ export async function getPrerenderManifest(
           dataRouteRegex,
         } = manifest.dynamicRoutes[lazyRoute];
 
-        if (typeof fallback === 'string') {
-          ret.fallbackRoutes[lazyRoute] = {
-            routeRegex,
-            fallback,
-            dataRoute,
-            dataRouteRegex,
-          };
-        } else if (fallback === null) {
-          ret.blockingFallbackRoutes[lazyRoute] = {
-            routeRegex,
-            dataRoute,
-            dataRouteRegex,
-          };
-        } else {
+        if (!fallback) {
           // Fallback behavior is disabled, all routes would've been provided
           // in the top-level `routes` key (`staticRoutes`).
           ret.omittedRoutes.push(lazyRoute);
+          return;
         }
+
+        ret.fallbackRoutes[lazyRoute] = {
+          routeRegex,
+          fallback,
+          dataRoute,
+          dataRouteRegex,
+        };
       });
 
       return ret;
@@ -965,7 +960,7 @@ export async function getPrerenderManifest(
     default: {
       return {
         staticRoutes: {},
-        blockingFallbackRoutes: {},
+        legacyBlockingRoutes: {},
         fallbackRoutes: {},
         bypassToken: null,
         omittedRoutes: [],

packages/now-next/test/fixtures/00-trailing-slash-add/next.config.js

@@ -1,6 +1 @@
-module.exports = {
-  generateBuildId() {
-    return 'testing-build-id';
-  },
-  trailingSlash: true,
-};
+module.exports = { trailingSlash: true };

packages/now-next/test/fixtures/00-trailing-slash-add/now.json

@@ -33,48 +33,6 @@
       "path": "/test.txt",
       "status": 200,
       "mustContain": "this is a file"
-    },
-    {
-      "fetchOptions": { "redirect": "manual" },
-      "path": "/blog/post-1",
-      "status": 308,
-      "responseHeaders": {
-        "refresh": "/url=/blog/post-1/$/"
-      }
-    },
-    {
-      "fetchOptions": { "redirect": "manual" },
-      "path": "/blog/post-1/",
-      "status": 200,
-      "mustContain": "post: <!-- -->post-1"
-    },
-    {
-      "fetchOptions": { "redirect": "manual" },
-      "path": "/_next/data/testing-build-id/blog/post-1.json/",
-      "status": 308,
-      "responseHeaders": {
-        "refresh": "/url=/_next/data/testing-build-id/blog/post-1.json$/"
-      }
-    },
-    {
-      "fetchOptions": { "redirect": "manual" },
-      "path": "/_next/data/testing-build-id/blog/post-1.json",
-      "status": 200,
-      "mustContain": "\"post-1\""
-    },
-    {
-      "fetchOptions": { "redirect": "manual" },
-      "path": "/api/hello",
-      "status": 308,
-      "responseHeaders": {
-        "refresh": "/url=/api/hello/$/"
-      }
-    },
-    {
-      "fetchOptions": { "redirect": "manual" },
-      "path": "/api/hello/",
-      "status": 200,
-      "mustContain": "hello from API"
     }
   ]
 }

packages/now-next/test/fixtures/00-trailing-slash-add/pages/abc/def.js

@@ -1,11 +1,3 @@
 export default function Page() {
   return <p>nested page</p>;
 }
-
-export const getServerSideProps = () => {
-  return {
-    props: {
-      hello: 'world',
-    },
-  };
-};

packages/now-next/test/fixtures/00-trailing-slash-add/pages/api/hello.js

@@ -1,3 +0,0 @@
-export default (req, res) => {
-  res.end('hello from API');
-};

packages/now-next/test/fixtures/00-trailing-slash-add/pages/blog/[post].js

@@ -1,11 +0,0 @@
-export default function Page({ post }) {
-  return <p>post: {post}</p>;
-}
-
-export const getServerSideProps = ({ params }) => {
-  return {
-    props: {
-      post: params.post,
-    },
-  };
-};

packages/now-next/test/fixtures/01-cache-headers/now.json

@@ -3,13 +3,13 @@
   "builds": [{ "src": "package.json", "use": "@vercel/next" }],
   "probes": [
     {
-      "path": "/_next/__NEXT_SCRIPT__(/)",
+      "path": "/_next/static/testing-build-id/pages/index.js",
       "responseHeaders": {
         "cache-control": "public,max-age=31536000,immutable"
       }
     },
     {
-      "path": "/_next/static/invalid-build-id/pages/non-existent.js",
+      "path": "/_next/static/invalid-build-id/pages/index.js",
       "notResponseHeaders": {
         "cache-control": "public,max-age=31536000,immutable"
       }

packages/now-next/test/fixtures/01-cache-headers/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "next": "canary",
+    "next": "latest",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"
   }

packages/now-next/test/fixtures/06-lambda-with-memory/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "next": "canary",
+    "next": "^9.1.2-canary.8",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"
   }

packages/now-next/test/fixtures/17-static-404/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "next": "canary",
+    "next": "9.2.1-canary.3",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"
   }

packages/now-next/test/fixtures/19-pages-404/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "next": "canary",
+    "next": "latest",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"
   }

packages/now-next/test/fixtures/24-custom-output-dir/package.json

@@ -3,7 +3,7 @@
     "build": "next build"
   },
   "dependencies": {
-    "next": "canary",
+    "next": "^9.1.2-canary.8",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"
   }

packages/now-next/test/fixtures/25-index-routes/next.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-  generateBuildId() {
-    return 'testing-build-id';
-  },
-};

packages/now-next/test/fixtures/25-index-routes/now.json

@@ -1,42 +0,0 @@
-{
-  "version": 2,
-  "builds": [{ "src": "package.json", "use": "@now/next" }],
-  "probes": [
-    {
-      "path": "/",
-      "mustContain": "hello from index"
-    },
-    {
-      "path": "/index",
-      "mustContain": "hello from index"
-    },
-    {
-      "path": "/nested-index/index",
-      "mustContain": "hello from nested index"
-    },
-    {
-      "path": "/sub",
-      "mustContain": "hello from sub index"
-    },
-    {
-      "path": "/sub/index",
-      "mustContain": "hello from sub id"
-    },
-    {
-      "path": "/sub/another",
-      "mustContain": "hello from sub id"
-    },
-    {
-      "path": "/api/sub",
-      "mustContain": "hi from sub index"
-    },
-    {
-      "path": "/api/sub/index",
-      "mustContain": "hi from sub id"
-    },
-    {
-      "path": "/api/sub/another",
-      "mustContain": "hi from sub id"
-    }
-  ]
-}

packages/now-next/test/fixtures/25-index-routes/package.json

@@ -1,7 +0,0 @@
-{
-  "dependencies": {
-    "next": "latest",
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6"
-  }
-}

packages/now-next/test/fixtures/25-index-routes/pages/api/sub/[id].js

@@ -1 +0,0 @@
-export default (req, res) => res.end('hi from sub id')

packages/now-next/test/fixtures/25-index-routes/pages/api/sub/index.js

@@ -1 +0,0 @@
-export default (req, res) => res.end('hi from sub index');

packages/now-next/test/fixtures/25-index-routes/pages/index.js

@@ -1,2 +0,0 @@
-const page = () => 'hello from index';
-export default page;

packages/now-next/test/fixtures/25-index-routes/pages/nested-index/index/index.js

@@ -1 +0,0 @@
-export default () => 'hello from nested index';

packages/now-next/test/fixtures/25-index-routes/pages/sub/[id].js

@@ -1,3 +0,0 @@
-const page = () => "hello from sub id"
-page.getInitialProps = () => ({ hello: 'hi' })
-export default page

packages/now-next/test/fixtures/25-index-routes/pages/sub/index.js

@@ -1,3 +0,0 @@
-const page = () => 'hello from sub index';
-page.getInitialProps = () => ({ hello: 'hi' });
-export default page;

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/next.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-  generateBuildId() {
-    return 'testing-build-id';
-  },
-};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/now.json

@@ -1,113 +0,0 @@
-{
-  "version": 2,
-  "uploadNowJson": true,
-  "builds": [{ "src": "package.json", "use": "@vercel/next" }],
-  "probes": [
-    {
-      "path": "/forever",
-      "status": 200,
-      "mustContain": "hello"
-    },
-    {
-      "path": "/blog/post-1",
-      "status": 200,
-      "mustContain": "post-1"
-    },
-    {
-      "path": "/blog/post-2",
-      "status": 200,
-      "mustContain": "post-2"
-    },
-    {
-      "path": "/_next/data/testing-build-id/blog/post-1.json",
-      "status": 200,
-      "mustContain": "post-1"
-    },
-    {
-      "path": "/_next/data/testing-build-id/blog/post-2.json",
-      "status": 200,
-      "mustContain": "post-2"
-    },
-
-    {
-      "path": "/blog/post-1/comment-1",
-      "status": 200,
-      "mustContain": "comment-1"
-    },
-    {
-      "path": "/blog/post-2/comment-2",
-      "status": 200,
-      "mustContain": "comment-2"
-    },
-    {
-      "path": "/_next/data/testing-build-id/blog/post-1/comment-1.json",
-      "status": 200,
-      "mustContain": "comment-1"
-    },
-    {
-      "path": "/_next/data/testing-build-id/blog/post-2/comment-2.json",
-      "status": 200,
-      "mustContain": "comment-2"
-    },
-
-    {
-      "path": "/_next/data/testing-build-id/forever.json",
-      "status": 200,
-      "mustContain": "world"
-    },
-    {
-      "path": "/_next/data/testing-build-id/another2.json",
-      "status": 200,
-      "mustContain": "world"
-    },
-    {
-      "path": "/nofallback/one",
-      "status": 200,
-      "mustContain": "one"
-    },
-    {
-      "path": "/nofallback/two",
-      "status": 200,
-      "mustContain": "two"
-    },
-    {
-      "path": "/nofallback/nope",
-      "status": 404,
-      "mustContain": "page not <!-- -->found"
-    },
-    {
-      "path": "/_next/data/testing-build-id/nofallback/one.json",
-      "status": 200,
-      "mustContain": "one"
-    },
-    {
-      "path": "/_next/data/testing-build-id/nofallback/two.json",
-      "status": 200,
-      "mustContain": "two"
-    },
-    {
-      "path": "/_next/data/testing-build-id/nofallback/nope.json",
-      "status": 404
-    },
-    {
-      "path": "/404",
-      "status": 404,
-      "mustContain": "page not <!-- -->found"
-    },
-    {
-      "logMustNotContain": "WARNING: your application is being opted out of @vercel/next's optimized lambdas mode due to legacy routes"
-    },
-    {
-      "logMustNotContain": "WARNING: Your application is being opted out of \"@vercel/next\" optimized lambdas mode due to `functions` config"
-    },
-    {
-      "logMustNotContain": "Traced Next.js serverless functions for external files in"
-    },
-    {
-      "logMustNotContain": "All serverless functions created in"
-    },
-    {
-      "logMustNotContain": "Compressed shared serverless function files"
-    }
-  ]
-}

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/package.json

@@ -1,7 +0,0 @@
-{
-  "dependencies": {
-    "next": "canary",
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6"
-  }
-}

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/404.js

@@ -1,11 +0,0 @@
-export default function Page({ found }) {
-  return <p>page not {found}</p>;
-}
-
-export const getStaticProps = () => {
-  return {
-    props: {
-      found: 'found',
-    },
-  };
-};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/another.js

@@ -1,22 +0,0 @@
-import React from 'react';
-
-// eslint-disable-next-line camelcase
-export async function getStaticProps() {
-  return {
-    props: {
-      world: 'world',
-      random: Math.random(),
-      time: new Date().getTime(),
-    },
-  };
-}
-
-export default ({ world, time, random }) => {
-  return (
-    <>
-      <p id="hello">hello: {world}</p>
-      <span id="time">time: {time}</span>
-      <span id="random">random: {random}</span>
-    </>
-  );
-};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/another2.js

@@ -1,20 +0,0 @@
-import React from 'react';
-
-// eslint-disable-next-line camelcase
-export async function getStaticProps() {
-  return {
-    props: {
-      world: 'world',
-      time: new Date().getTime(),
-    },
-  };
-}
-
-export default ({ world, time }) => {
-  return (
-    <>
-      <p>hello: {world}</p>
-      <span>time: {time}</span>
-    </>
-  );
-};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/blog/[post]/[comment].js

@@ -1,39 +0,0 @@
-import React from 'react';
-
-// eslint-disable-next-line camelcase
-export async function getStaticPaths() {
-  return {
-    paths: [
-      '/blog/post-1/comment-1',
-      { params: { post: 'post-2', comment: 'comment-2' } },
-      '/blog/post-1337/comment-1337',
-      '/blog/post-123/comment-321',
-    ],
-    fallback: false,
-  };
-}
-
-// eslint-disable-next-line camelcase
-export async function getStaticProps({ params }) {
-  return {
-    props: {
-      post: params.post,
-      random: Math.random(),
-      comment: params.comment,
-      time: new Date().getTime(),
-    },
-  };
-}
-
-export default ({ post, comment, time, random }) => {
-  if (!post) return <p>loading...</p>;
-
-  return (
-    <>
-      <p id="post">Post: {post}</p>
-      <p id="comment">Comment: {comment}</p>
-      <span id="time">time: {time}</span>
-      <span id="random">random: {random}</span>
-    </>
-  );
-};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/blog/[post]/index.js

@@ -1,38 +0,0 @@
-import React from 'react';
-
-// eslint-disable-next-line camelcase
-export async function getStaticPaths() {
-  return {
-    paths: ['/blog/post-1', { params: { post: 'post-2' } }, '/blog/post-123'],
-    fallback: false,
-  };
-}
-
-// eslint-disable-next-line camelcase
-export async function getStaticProps({ params }) {
-  if (params.post === 'post-10') {
-    await new Promise(resolve => {
-      setTimeout(() => resolve(), 1000);
-    });
-  }
-
-  return {
-    props: {
-      post: params.post,
-      random: Math.random(),
-      time: (await import('perf_hooks')).performance.now(),
-    },
-  };
-}
-
-export default ({ post, time, random }) => {
-  if (!post) return <p>loading...</p>;
-
-  return (
-    <>
-      <p id="post">Post: {post}</p>
-      <span id="time">time: {time}</span>
-      <span id="random">random: {random}</span>
-    </>
-  );
-};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/forever.js

@@ -1,21 +0,0 @@
-import React from 'react';
-
-// eslint-disable-next-line camelcase
-export async function getStaticProps() {
-  return {
-    props: {
-      world: 'world',
-      time: new Date().getTime(),
-    },
-    revalidate: false,
-  };
-}
-
-export default ({ world, time }) => {
-  return (
-    <>
-      <p>hello: {world}</p>
-      <span>time: {time}</span>
-    </>
-  );
-};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/index.js

@@ -1,9 +0,0 @@
-export default () => 'Hi';
-
-export const getStaticProps = () => {
-  return {
-    props: {
-      hello: 'world',
-    },
-  };
-};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/nofallback/[slug].js

@@ -1,30 +0,0 @@
-import React from 'react';
-
-// eslint-disable-next-line camelcase
-export async function getStaticPaths() {
-  return {
-    paths: ['/nofallback/one', { params: { slug: 'two' } }],
-    fallback: false,
-  };
-}
-
-// eslint-disable-next-line camelcase
-export async function getStaticProps({ params }) {
-  return {
-    props: {
-      slug: params.slug,
-      time: (await import('perf_hooks')).performance.now(),
-    },
-  };
-}
-
-export default ({ slug, time }) => {
-  return (
-    <>
-      <p>
-        Slug ({slug.length}): {slug}
-      </p>
-      <span>time: {time}</span>
-    </>
-  );
-};

packages/now-next/test/fixtures/29-ssg-all-static/pages/another-index/index.js

@@ -1,9 +0,0 @@
-export default () => 'Hi';
-
-export const getStaticProps = () => {
-  return {
-    props: {
-      hello: 'world',
-    },
-  };
-};

packages/now-next/test/fixtures/29-ssg-all-static/pages/index.js

@@ -1,9 +1 @@
 export default () => 'Hi';
-
-export const getStaticProps = () => {
-  return {
-    props: {
-      hello: 'world',
-    },
-  };
-};

packages/now-next/test/fixtures/30-monorepo-no-script/.gitignore

@@ -1,108 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-*.lcov
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
-
-# TypeScript cache
-*.tsbuildinfo
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Microbundle cache
-.rpt2_cache/
-.rts2_cache_cjs/
-.rts2_cache_es/
-.rts2_cache_umd/
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-.env.test
-
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-
-# Next.js build output
-.next
-
-# Nuxt.js build / generate output
-.nuxt
-dist
-
-# Gatsby files
-.cache/
-# Comment in the public line in if your project uses Gatsby and *not* Next.js
-# https://nextjs.org/blog/next-9-1#public-directory-support
-# public
-
-# vuepress build output
-.vuepress/dist
-
-# Serverless directories
-.serverless/
-
-# FuseBox cache
-.fusebox/
-
-# DynamoDB Local files
-.dynamodb/
-
-# TernJS port file
-.tern-port
-
-# IDEA
-.idea/
-*.iml

packages/now-next/test/fixtures/30-monorepo-no-script/babel.config.js

@@ -1,7 +0,0 @@
-module.exports = api => {
-  api.cache(true);
-
-  const presets = [require.resolve('next/babel')];
-
-  return { presets, plugins: [] };
-};

packages/now-next/test/fixtures/30-monorepo-no-script/now.json

@@ -1,31 +0,0 @@
-{
-  "version": 2,
-  "uploadNowJson": true,
-  "builds": [{ "src": "packages/www/package.json", "use": "@vercel/next" }],
-  "routes": [{ "src": "/(.*)", "dest": "/packages/www/$1" }],
-  "probes": [
-    {
-      "path": "/",
-      "status": 200,
-      "mustContain": "Hello World"
-    },
-    {
-      "logMustContain": "Your application is being built using `next build`"
-    },
-    {
-      "logMustContain": "WARNING: your application is being opted out of @vercel/next's optimized lambdas mode due to legacy routes"
-    },
-    {
-      "logMustNotContain": "WARNING: Your application is being opted out of \"@vercel/next\" optimized lambdas mode due to `functions` config"
-    },
-    {
-      "logMustNotContain": "Traced Next.js serverless functions for external files in"
-    },
-    {
-      "logMustNotContain": "All serverless functions created in"
-    },
-    {
-      "logMustNotContain": "Compressed shared serverless function files"
-    }
-  ]
-}

packages/now-next/test/fixtures/30-monorepo-no-script/package.json

@@ -1,11 +0,0 @@
-{
-  "private": true,
-  "workspaces": [
-    "packages/*"
-  ],
-  "dependencies": {
-    "next": "9.5.1",
-    "react": "16.13.1",
-    "react-dom": "16.13.1"
-  }
-}

packages/now-next/test/fixtures/30-monorepo-no-script/packages/www/next.config.js

@@ -1,8 +0,0 @@
-module.exports = {
-  poweredByHeader: false,
-
-  webpack: (config, { defaultLoaders }) => {
-    defaultLoaders.babel.options.rootMode = 'upward';
-    return config;
-  },
-};

packages/now-next/test/fixtures/30-monorepo-no-script/packages/www/package.json

@@ -1,6 +0,0 @@
-{
-  "name": "@vercel-crash-demo/www",
-  "version": "1.0.0",
-  "private": true,
-  "sideEffects": false
-}

packages/now-next/test/fixtures/30-monorepo-no-script/packages/www/pages/index.jsx

@@ -1,7 +0,0 @@
-import React from 'react';
-
-const HelloWorld = () => (
-    <h1>Hello World</h1>
-);
-
-export default HelloWorld;

packages/now-next/test/fixtures/31-blocking-fallback/additional.js

@@ -1,54 +0,0 @@
-/* eslint-env jest */
-const fetch = require('node-fetch');
-const cheerio = require('cheerio');
-
-module.exports = function (ctx) {
-  it('should revalidate content properly from dynamic pathname', async () => {
-    // wait for revalidation to expire
-    await new Promise(resolve => setTimeout(resolve, 2000));
-
-    const res = await fetch(`${ctx.deploymentUrl}/regenerated/blue`);
-    expect(res.status).toBe(200);
-
-    let $ = cheerio.load(await res.text());
-    const initialTime = $('#time').text();
-    expect($('#slug').text()).toBe('blue');
-
-    // wait for revalidation to occur
-    await new Promise(resolve => setTimeout(resolve, 2000));
-
-    const res2 = await fetch(`${ctx.deploymentUrl}/regenerated/blue`);
-    expect(res2.status).toBe(200);
-
-    $ = cheerio.load(await res2.text());
-    expect($('#slug').text()).toBe('blue');
-    expect(initialTime).not.toBe($('#time').text());
-  });
-
-  it('should revalidate content properly from /_next/data dynamic pathname', async () => {
-    // wait for revalidation to expire
-    await new Promise(resolve => setTimeout(resolve, 2000));
-
-    const res = await fetch(
-      `${ctx.deploymentUrl}/_next/data/testing-build-id/regenerated/blue.json`
-    );
-    expect(res.status).toBe(200);
-
-    const { pageProps: data } = await res.json();
-    const initialTime = data.time;
-    expect(data.slug).toBe('blue');
-    expect(isNaN(initialTime)).toBe(false);
-
-    // wait for revalidation to occur
-    await new Promise(resolve => setTimeout(resolve, 2000));
-
-    const res2 = await fetch(
-      `${ctx.deploymentUrl}/_next/data/testing-build-id/regenerated/blue.json`
-    );
-    expect(res2.status).toBe(200);
-
-    const { pageProps: data2 } = await res2.json();
-    expect(data2.slug).toBe('blue');
-    expect(initialTime).not.toBe(data2.time);
-  });
-};

packages/now-next/test/fixtures/31-blocking-fallback/next.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-  generateBuildId() {
-    return 'testing-build-id';
-  },
-};

packages/now-next/test/fixtures/31-blocking-fallback/now.json

@@ -1,62 +0,0 @@
-{
-  "version": 2,
-  "builds": [
-    {
-      "src": "package.json",
-      "use": "@vercel/next"
-    }
-  ],
-  "probes": [
-    {
-      "path": "/fixed/yellow",
-      "status": 200,
-      "mustContain": "yellow"
-    },
-    { "delay": 2000 },
-    {
-      "path": "/fixed/yellow",
-      "status": 200,
-      "responseHeaders": {
-        "x-vercel-cache": "HIT"
-      }
-    },
-    {
-      "path": "/_next/data/testing-build-id/fixed/yellow.json",
-      "status": 200,
-      "responseHeaders": {
-        "x-vercel-cache": "HIT"
-      }
-    },
-    {
-      "path": "/fixed/yellow",
-      "status": 200,
-      "mustContain": "yellow"
-    },
-    {
-      "path": "/_next/data/testing-build-id/fixed/yellow.json",
-      "status": 200,
-      "mustContain": "yellow"
-    },
-
-    {
-      "path": "/regenerated/blue",
-      "status": 200,
-      "mustContain": "blue"
-    },
-    { "delay": 2000 },
-    {
-      "path": "/regenerated/blue",
-      "status": 200,
-      "responseHeaders": {
-        "x-vercel-cache": "/HIT|STALE/"
-      }
-    },
-    {
-      "path": "/_next/data/testing-build-id/regenerated/blue.json",
-      "status": 200,
-      "responseHeaders": {
-        "x-vercel-cache": "/HIT|STALE/"
-      }
-    }
-  ]
-}

packages/now-next/test/fixtures/31-blocking-fallback/package.json

@@ -1,7 +0,0 @@
-{
-  "dependencies": {
-    "next": "canary",
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6"
-  }
-}

packages/now-next/test/fixtures/31-blocking-fallback/pages/fixed/[slug].js

@@ -1,23 +0,0 @@
-export default function TestPage({ slug, time }) {
-  return (
-    <>
-      Slug: <div id="slug">{slug}</div>
-      <br />
-      Time: <div id="time">{time}</div>
-    </>
-  );
-}
-
-export function getStaticProps({ params }) {
-  return {
-    props: {
-      slug: params.slug,
-      time: new Date().getTime(),
-    },
-    revalidate: false,
-  };
-}
-
-export function getStaticPaths() {
-  return { paths: [], fallback: 'unstable_blocking' };
-}