Publish Canary

- @vercel/build-utils@2.5.4-canary.0
 - vercel@20.1.2-canary.5
 - @vercel/client@9.0.3-canary.0

.github/CONTRIBUTING.md

@@ -68,12 +68,12 @@ In such cases you can visit the URL of the failed deployment and append `/_logs`
 
 The logs of this deployment will contain the actual error which may help you to understand what went wrong.
 
-### @zeit/node-file-trace
+### @vercel/nft
 
-Some of the Builders use `@zeit/node-file-trace` to tree-shake files before deployment. If you suspect an error with this tree-shaking mechanism, you can create the following script in your project:
+Some of the Builders use `@vercel/nft` to tree-shake files before deployment. If you suspect an error with this tree-shaking mechanism, you can create the following script in your project:
 
 ```js
-const trace = require('@zeit/node-file-trace');
+const trace = require('@vercel/nft');
 trace(['path/to/entrypoint.js'], {
   ts: true,
   mixedModules: true,
@@ -82,7 +82,7 @@ trace(['path/to/entrypoint.js'], {
   .then(e => console.error(e));
 ```
 
-When you run this script, you'll see all imported files. If anything file is missing, the bug is in [@zeit/node-file-trace](https://github.com/vercel/node-file-trace) and not the Builder.
+When you run this script, you'll see all imported files. If anything file is missing, the bug is in [@vercel/nft](https://github.com/vercel/nft) and not the Builder.
 
 ## Deploy a Builder with existing project
 

.github/workflows/publish.yml

@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@v1
     - uses: actions/setup-node@v1
       with:
-        node-version: 10
+        node-version: 12
     - name: Install
       run: yarn install --check-files --frozen-lockfile
     - name: Build

errors/deploy-invalid-dc.md

@@ -2,8 +2,8 @@
 
 #### Why This Error Occurred
 
-When supplying `regions` or `scale` settings, you
-used an unknown or invalid dc identifier.
+When supplying `regions` configuration, you
+used an unknown or invalid DC identifier.
 
 #### Possible Ways to Fix It
 
@@ -19,7 +19,7 @@ and DCs have to be in _lowercase_.
 - `gru`
 - `iad`
 
-In `now-cli`, they currently are transformed to
+In Vercel CLI, they currently are transformed to
 DC identifiers before being sent to our APIs.
 
 **Valid DC identifiers**:

errors/missing-dotenv-target.md

@@ -1,9 +0,0 @@
-# Missing `--dotenv` Target
-
-#### Why This Error Occurred
-
-You specified a path as the value for the `--dotenv` flag, but the target of the path doesn't exist.
-
-#### Possible Ways to Fix It
-
-Make sure the target file you've specified exists and is readable by Vercel CLI. In addition, please ensure that the filename starts with a dot (example: `.env`) - then it should work.

errors/now-next-no-serverless-pages-built.md

@@ -2,7 +2,7 @@
 
 #### Why This Error Occurred
 
-This error occurs when you have your application is not configured for Serverless Next.js build output.
+This error occurs when your application is not configured for Serverless Next.js build output.
 
 #### Possible Ways to Fix It
 

errors/regions-and-scale-at-once.md

@@ -1,32 +0,0 @@
-# Can't Set `regions` and `scale` Options Simultaneously
-
-#### Why This Error Occurred
-
-Your deployment's configuration contains a `regions` and `scale`
-configuration simultaneously.
-
-#### Possible Ways to Fix It
-
-The `regions` setting is intended to be used to scale the
-deployment to the supplied regions or datacenters identifiers
-with default scale settings.
-
-```json
-{
-  "regions": ["sfo", "bru", "gru", "iad"]
-}
-```
-
-The `scale` object allows you to be more granular: you can decide a
-`min` and `max` number of instances per region:
-
-```json
-{
-  "scale": {
-    "sfo": { "min": 0, "max": 10 }
-  }
-}
-```
-
-To solve this problem, use only one of the two ways of deciding
-where to scale your deployment to.

errors/scale-invalid-dc.md

@@ -1,36 +0,0 @@
-# Invalid Region or DC Identifier
-
-#### Why This Error Occurred
-
-When supplying a region or DC identifier in `vercel scale`,
-we weren't able to recognize the value as valid.
-
-#### Possible Ways to Fix It
-
-Check your `vercel scale` command make sure you are using a
-valid string after the URL. Regions
-and DCs have to be in _lowercase_.
-
-**Valid region identifiers**:
-
-- `all` (special, used to scale to all DCs, can only appear once)
-- `sfo`
-- `bru`
-- `gru`
-- `iad`
-
-In Vercel CLI, they currently are transformed to
-DC identifiers before being sent to our APIs.
-
-**Valid DC identifiers**:
-
-- `sfo1`
-- `bru1`
-- `gru1`
-- `iad1`
-
-To pass multiple ones, use a comma:
-
-```
-vercel scale my-url-123.now.sh sfo,bru,gru 1 5
-```

errors/scale-ls.md

@@ -1,30 +0,0 @@
-# `vercel scale ls` is deprecated
-
-#### Why This Error Occurred
-
-We have stopped supporting this command, in favor of
-better alternatives.
-
-`vercel scale ls` used to list all the scaling rules
-for all your deployments. The output would be too long,
-and it would often be hard to find the information
-you needed in a long list of items.
-
-#### Possible Ways to Fix It
-
-Instead of using `vercel scale ls` to list all your deployments
-and their scaling rules, first use `vercel ls` to find
-your deployment:
-
-```console
-vercel ls
-```
-
-Then, select the URL of your deployment, which uniquely identifies it, and run:
-
-```console
-vercel inspect my-deployment-12345.now.sh
-```
-
-The `inspect` subcommand will give you your deployment's scale information, including what datacenters it's enabled on, the
-current number of instances and minimums/maximums.

errors/scaling-path-alias.md

@@ -1,12 +0,0 @@
-# Scaling path alias
-
-#### Why This Error Occurred
-
-You tried to use `vercel scale` on a path alias (`vercel alias -r rules.json`).
-
-#### Possible Ways to Fix It
-
-Path aliases are routes to instances. Instances can be scaled independent from each other.
-You can view path aliases by running `vercel alias ls <id>`.
-
-Documentation for Path Aliases can be found [here](https://vercel.com/docs/features/path-aliases).

errors/v2-no-min.md

@@ -1,16 +0,0 @@
-# No minimum scale settings on Cloud v2 deployments
-
-#### Why This Error Occurred
-
-An attempt was made at scaling a Cloud v2 deployment with a `min` scale
-setting. This isn't supported yet.
-
-#### Possible Ways to Fix It
-
-Ensure your scale settings (in `vercel.json`, the command you're running
-or from a previous deployment who's alias you're trying to overwrite) has
-the `min` scale setting set to `0`. You can do this by running
-
-```
-vercel scale <deployment> 0 10
-```

errors/verification-timeout.md

@@ -1,29 +0,0 @@
-# Verification Timeout
-
-#### Why This Error Occurred
-
-After the deployment build completed and the deployment state was set to `READY`,
-instances failed to initialize properly.
-
-The CLI attempted to verify that the scale settings of your instances matched,
-but it couldn't do so within the allotted time (defaults to 2 minutes).
-
-#### Possible Ways to Fix It
-
-Instance verification is the process of ensuring that after
-your deployment is ready, we can actually run (instantiate) your code.
-
-If you configured [regions or scale](https://vercel.com/docs/features/scaling),
-we ensure the minimums and maximums are met for the regions you enabled.
-
-If you think your code is taking too long to instantiate, this can be due
-to slow boot up times. You can supply `--no-verify` to skip verification
-if you are confident your code runs properly.
-
-If your application is not listening on a HTTP port, we might be failing to
-instantiate your deployment as well. It might not be showing any errors,
-but the deployment instance is effectively not routable and cannot be
-verified.
-
-If your instances are crashing before an HTTP port is exposed, verification
-will fail as well. Double check your logs (e.g.: by running `vercel logs <url>`)

examples/amp/README.md

@@ -17,11 +17,3 @@ To get started deploying AMP with Vercel, you can use the [Vercel CLI](https://v
 ```shell
 $ vercel init amp
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new AMP project with a single command from your terminal using Vercel CLI:
-
-```shell
-$ vercel
-```

examples/angular/README.md

@@ -19,11 +19,3 @@ To get started with Angular, you can use the [Angular CLI](https://cli.angular.i
 ```shell
 $ ng new
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Angular project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/blitzjs/README.md

@@ -1,21 +1,19 @@
 ![Blitz Logo](https://github.com/vercel/vercel/blob/master/packages/frameworks/logos/blitz.svg)
 
-This is a [Blitz.js](https://blitzjs.com/) project bootstrapped with `npx blitz new`.
+# Blitz.js Example
 
-## Getting Started
+This directory is a brief example of a [Blitz.js](https://blitzjs.com/) project that can be deployed with Vercel and zero configuration.
 
-First, run the development server:
+## Deploy Your Own
 
-```bash
-npx blitz start
+Deploy your own Blitz.js project with Vercel by viewing the [documentation on deploying to Vercel](https://blitzjs.com/docs/deploy-vercel)
+
+[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/import/project?template=https://github.com/vercel/vercel/tree/master/examples/blitzjs)
+
+### How We Created This Example
+
+To get started with Blitz.js, you can use [npx](https://www.npmjs.com/package/npx) to initialize the project:
+
+```shell
+$ npx blitz new
 ```
-
-Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
-
-## Learn More
-
-To learn more about Blitz.js, view [Blitzjs.com](https://blitzjs.com)
-
-## Deploy on Vercel
-
-View the [documentation on deploying to Vercel](https://blitzjs.com/docs/deploy-vercel)

examples/brunch/README.md

@@ -17,11 +17,3 @@ To get started deploying Brunch with Vercel, you can use the [Brunch CLI](https:
 ```shell
 $ brunch new project-name -s es6
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Brunch project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/create-react-app/README.md

@@ -19,11 +19,3 @@ To get started with React, along with [Serverless Functions](https://vercel.com/
 ```shell
 $ npx create-react-app my-app
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new React project, along with [Serverless Functions](https://vercel.com/docs/v2/serverless-functions/introduction), with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/custom-build/README.md

@@ -17,11 +17,3 @@ To get started deploying a Custom Built project with Vercel, you can use the [Ve
 ```shell
 $ vercel init custom-build
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Custom Built project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/docusaurus-2/README.md

@@ -15,11 +15,3 @@ To get started with Docusaurus on Vercel, you can use the [Docusaurus CLI](https
 ```shell
 $ npx @docusaurus/init@next init my-website classic
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Docusaurus project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/docusaurus/README.md

@@ -19,11 +19,3 @@ To get started with Docusaurus for deployment with Vercel, you can use the [Docu
 ```shell
 $ docusaurus-init
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Docusaurus project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/dojo/README.md

@@ -15,11 +15,3 @@ To get started with Dojo on Vercel, you can use the [Dojo CLI](https://github.co
 ```shell
 $ vercel init dojo
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Dojo project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/eleventy/README.md

@@ -19,11 +19,3 @@ To get started with Eleventy for deployment with Vercel, you can use [npx](https
 ```shell
 $ npx degit 11ty/eleventy-base-blog my-11ty-project
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Eleventy project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/ember/.gitignore

@@ -27,3 +27,6 @@
 # Environment Variables
 .env
 .env.build
+
+# Vercel
+.vercel

examples/ember/README.md

@@ -19,11 +19,3 @@ To get started with Ember for deployment with Vercel, you can use the [Ember CLI
 ```shell
 $ npx ember-cli new ember-project
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Ember project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/ember/public/robots.txt

@@ -0,0 +1,3 @@
+# http://www.robotstxt.org
+User-agent: *
+Disallow:

examples/gatsby/README.md

@@ -19,11 +19,3 @@ To get started with Gatsby on Vercel, you can use the [Gatsby CLI](https://www.g
 ```shell
 $ gatsby new gatsby-site
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Gatsby project, along with [Serverless Functions](https://vercel.com/docs/v2/serverless-functions/introduction), with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/gatsby/src/pages/index.js

@@ -31,7 +31,7 @@ function Index() {
       </h2>
       <p>
         <a
-          href="https://github.com/vercel/vercel/blob/master/gatsby"
+          href="https://github.com/vercel/vercel/tree/master/examples/gatsby"
           target="_blank"
           rel="noreferrer noopener"
         >

examples/gridsome/README.md

@@ -19,11 +19,3 @@ To get started with Gridsome for deployment with Vercel, you can use the [Gridso
 ```shell
 $ gridsome create my-website
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Gridsome project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/hexo/README.md

@@ -19,11 +19,3 @@ To get started with Hexo for deployment with Vercel, you can use the [Hexo CLI](
 ```shell
 $ hexo init project-name
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Hexo project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/hugo/README.md

@@ -17,11 +17,3 @@ To get started with Hugo for deployment with Vercel, you can use the [Hugo CLI](
 ```shell
 $ hugo new site project-name
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Hugo project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/ionic-angular/README.md

@@ -17,11 +17,3 @@ To get started with Ionic Angular deployed with Vercel, you can use the [Ionic C
 ```shell
 $ npx @ionic/cli start [project-name] conference --type angular && cd [project-name]
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Ionic Angular project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/ionic-angular/src/app/pages/map/map.ts

@@ -27,7 +27,7 @@ export class MapPage implements AfterViewInit {
     }
 
     const googleMaps = await getGoogleMaps(
-      'AIzaSyB8pf6ZdFQj5qw7rc_HSGrhUwQKfIe9ICw'
+      'YOUR_API_KEY_HERE'
     );
 
     let map;

examples/ionic-react/readme.md

@@ -17,11 +17,3 @@ To get started with Ionic React deployed with Vercel, you can use the [Ionic CLI
 ```shell
 $ npx ionic start [project-name] conference --type react && cd [project-name]
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Ionic React project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/jekyll/README.md

@@ -17,11 +17,3 @@ To get started with Jekyll for deployment with Vercel, you can use the [Jekyll C
 ```shell
 $ jekyll new my-blog
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Jekyll project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/middleman/README.md

@@ -17,11 +17,3 @@ To get started with Middleman for deployment with Vercel, you can use the [Middl
 ```shell
 $ middleman init project-name
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Middleman project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/nuxtjs/README.md

@@ -19,11 +19,3 @@ $ npx create-nuxt-app my-app
 ```
 
 > The only change made is to amend the output directory in `nuxt.config.js` to `"/public"`.
-
-### Deploying From Your Terminal
-
-You can deploy your new Nuxt.js project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/polymer/README.md

@@ -19,11 +19,3 @@ To get started with Polymer deployed with Vercel, you can use the [Polymer CLI](
 ```shell
 $ polymer init
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Polymer project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/preact/README.md

@@ -19,11 +19,3 @@ To get started with Preact for deployment with Vercel, you can use the [Preact C
 ```shell
 $ preact create default my-project
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Preact project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/redwoodjs/README.md

@@ -19,11 +19,3 @@ To get started with RedwoodJS on Vercel, you can [use Yarn to initialize](https:
 ```shell
 $ yarn create redwood-app ./my-redwood-app
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new RedwoodJS project, along with [Serverless Functions](https://vercel.com/docs/v2/serverless-functions/introduction), with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/saber/README.md

@@ -19,11 +19,3 @@ To get started with Saber on Vercel, you can use [`npm init`](https://docs.npmjs
 ```shell
 $ npm init site my-saber-site
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Saber project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/sapper/README.md

@@ -19,11 +19,3 @@ $ npx degit "sveltejs/sapper-template#webpack" my-sapper-app
 ```
 
 > The only change made is to change the build script in `package.json` to be `"sapper export"`.
-
-### Deploying From Your Terminal
-
-You can deploy your new Sapper project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/scully/README.md

@@ -19,11 +19,3 @@ To get started deploying Scully with Vercel, you can use the [Vercel CLI](https:
 ```shell
 $ vercel init scully
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Scully project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/stencil/readme.md

@@ -17,11 +17,3 @@ To get started with Stencil deployed with Vercel, you can use the [Stencil proje
 ```shell
 $ npm init stencil
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Stencil project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/svelte/README.md

@@ -17,11 +17,3 @@ To get started with Svelte, along with [Serverless Functions](https://vercel.com
 ```shell
 $ npx degit sveltejs/template my-svelte-project
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new Svelte project, along with [Serverless Functions](https://vercel.com/docs/v2/serverless-functions/introduction), with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

examples/umijs/README.md

@@ -19,11 +19,3 @@ To get started with UmiJS deployed with Vercel, you can use the [Umi CLI](https:
 ```shell
 $ yarn create umi app-name
 ```
-
-### Deploying From Your Terminal
-
-You can deploy your new UmiJS project with a single command from your terminal using [Vercel CLI](https://vercel.com/download):
-
-```shell
-$ vercel
-```

package.json

@@ -17,7 +17,7 @@
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "2.0.0",
     "@typescript-eslint/parser": "2.0.0",
-    "@zeit/ncc": "0.20.4",
+    "@vercel/ncc": "0.24.0",
     "async-retry": "1.2.3",
     "buffer-replace": "1.0.0",
     "cheerio": "1.0.0-rc.3",
@@ -27,7 +27,7 @@
     "husky": "3.0.4",
     "json5": "2.1.1",
     "lint-staged": "9.2.5",
-    "node-fetch": "2.6.0",
+    "node-fetch": "2.6.1",
     "npm-package-arg": "6.1.0",
     "prettier": "2.0.5"
   },

packages/frameworks/frameworks.json

@@ -59,7 +59,7 @@
     }
   },
   {
-    "name": "Gatsby",
+    "name": "Gatsby.js",
     "slug": "gatsby",
     "demo": "https://gatsby.now-examples.now.sh",
     "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/gatsby.svg",
@@ -261,7 +261,7 @@
     }
   },
   {
-    "name": "Ember",
+    "name": "Ember.js",
     "slug": "ember",
     "demo": "https://ember.now-examples.now.sh",
     "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/ember.svg",

packages/frameworks/package.json

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

packages/now-build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.4.3-canary.4",
+  "version": "2.5.4-canary.0",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -29,7 +29,8 @@
     "@types/node-fetch": "^2.1.6",
     "@types/semver": "6.0.0",
     "@types/yazl": "^2.4.1",
-    "@vercel/frameworks": "0.0.18-canary.5",
+    "@vercel/frameworks": "0.1.1",
+    "@vercel/ncc": "0.24.0",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",
     "async-sema": "2.1.4",
@@ -43,7 +44,7 @@
     "js-yaml": "3.13.1",
     "minimatch": "3.0.4",
     "multistream": "2.1.1",
-    "node-fetch": "2.2.0",
+    "node-fetch": "2.6.1",
     "semver": "6.1.1",
     "ts-jest": "24.1.0",
     "typescript": "3.9.3",

packages/now-build-utils/src/detect-builders.ts

@@ -26,6 +26,7 @@ interface Options {
     devCommand?: string | null;
     buildCommand?: string | null;
     outputDirectory?: string | null;
+    createdAt?: number;
   };
   cleanUrls?: boolean;
   trailingSlash?: boolean;
@@ -434,6 +435,7 @@ function detectFrontBuilder(
 ): Builder {
   const { tag, projectSettings = {} } = options;
   const withTag = tag ? `@${tag}` : '';
+  const { createdAt = 0 } = projectSettings;
   let { framework } = projectSettings;
 
   const config: Config = {
@@ -456,7 +458,10 @@ function detectFrontBuilder(
     config.outputDirectory = projectSettings.outputDirectory;
   }
 
-  if (pkg && framework !== null) {
+  if (
+    pkg &&
+    (framework === undefined || createdAt < Date.parse('2020-03-01'))
+  ) {
     const deps: PackageJson['dependencies'] = {
       ...pkg.dependencies,
       ...pkg.devDependencies,
@@ -929,11 +934,10 @@ function getRouteResult(
   const redirectRoutes: Route[] = [];
   const rewriteRoutes: Route[] = [];
   const errorRoutes: Route[] = [];
-  const isNextjs =
-    frontendBuilder &&
-    ((frontendBuilder.use && frontendBuilder.use.startsWith('@vercel/next')) ||
-      (frontendBuilder.config &&
-        frontendBuilder.config.framework === 'nextjs'));
+  const framework = frontendBuilder?.config?.framework || '';
+  const use = frontendBuilder?.use || '';
+  const isNextjs = framework === 'nextjs' || use.startsWith('@vercel/next');
+  const ignoreRuntimes = slugToFramework.get(framework)?.ignoreRuntimes;
 
   if (apiRoutes && apiRoutes.length > 0) {
     if (options.featHandleMiss) {
@@ -971,11 +975,18 @@ function getRouteResult(
       }
 
       rewriteRoutes.push(...dynamicRoutes);
-      rewriteRoutes.push({
-        src: '^/api(/.*)?$',
-        status: 404,
-        continue: true,
-      });
+
+      if (typeof ignoreRuntimes === 'undefined') {
+        // This route is only necessary to hide the directory listing
+        // to avoid enumerating serverless function names.
+        // But it causes issues in `vc dev` for frameworks that handle
+        // their own functions such as redwood, so we ignore.
+        rewriteRoutes.push({
+          src: '^/api(/.*)?$',
+          status: 404,
+          continue: true,
+        });
+      }
     } else {
       defaultRoutes.push(...apiRoutes);
 

packages/now-build-utils/src/types.ts

@@ -107,6 +107,13 @@ export interface BuildOptions {
    */
   workPath: string;
 
+  /**
+   * The "Root Directory" is assigned to the `workPath` so the `repoRootPath`
+   * is the Git Repository Root. This is only relevant for Monorepos.
+   * See https://vercel.com/blog/monorepos
+   */
+  repoRootPath?: string;
+
   /**
    * An arbitrary object passed by the user in the build definition defined
    * in `vercel.json`.

packages/now-build-utils/test/unit.builds-and-routes-detector.test.ts

@@ -1080,7 +1080,47 @@ describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
     expect(errorRoutes).toStrictEqual([]);
   });
 
-  it('Using "Other" framework with Storybook should NOT autodetect Next.js', async () => {
+  it('Using "Create React App" framework with `next` in dependencies should NOT autodetect Next.js for new projects', async () => {
+    const pkg = {
+      scripts: {
+        dev: 'react-scripts start',
+        build: 'react-scripts build',
+      },
+      dependencies: {
+        next: '9.3.5',
+        react: '16.13.1',
+        'react-dom': '16.13.1',
+        'react-scripts': '2.1.1',
+      },
+    };
+    const files = ['package.json', 'src/index.js', 'public/favicon.ico'];
+    const projectSettings = {
+      framework: 'create-react-app',
+      buildCommand: 'react-scripts build',
+      createdAt: Date.parse('2020-07-01'),
+    };
+
+    const { builders, errorRoutes } = await detectBuilders(files, pkg, {
+      projectSettings,
+      featHandleMiss,
+    });
+
+    expect(builders).toEqual([
+      {
+        use: '@vercel/static-build',
+        src: 'package.json',
+        config: {
+          zeroConfig: true,
+          framework: projectSettings.framework,
+          buildCommand: projectSettings.buildCommand,
+        },
+      },
+    ]);
+    expect(errorRoutes!.length).toBe(1);
+    expect((errorRoutes![0] as Source).status).toBe(404);
+  });
+
+  it('Using "Other" framework with Storybook should NOT autodetect Next.js for new projects', async () => {
     const pkg = {
       scripts: {
         dev: 'next dev',
@@ -1104,6 +1144,7 @@ describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
     const projectSettings = {
       framework: null, // Selected "Other" framework
       buildCommand: 'yarn build-storybook',
+      createdAt: Date.parse('2020-07-01'),
     };
 
     const { builders, errorRoutes } = await detectBuilders(files, pkg, {
@@ -1125,6 +1166,41 @@ describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
     expect((errorRoutes![0] as Source).status).toBe(404);
   });
 
+  it('Using "Other" framework should autodetect Next.js for old projects', async () => {
+    const pkg = {
+      scripts: {
+        dev: 'next dev',
+        build: 'next build',
+      },
+      dependencies: {
+        next: '9.3.5',
+        react: '16.13.1',
+        'react-dom': '16.13.1',
+      },
+    };
+    const files = ['package.json', 'pages/api/foo.js', 'index.html'];
+    const projectSettings = {
+      framework: null, // Selected "Other" framework
+      createdAt: Date.parse('2020-02-01'),
+    };
+
+    const { builders, errorRoutes } = await detectBuilders(files, pkg, {
+      projectSettings,
+      featHandleMiss,
+    });
+
+    expect(builders).toEqual([
+      {
+        use: '@vercel/next',
+        src: 'package.json',
+        config: {
+          zeroConfig: true,
+        },
+      },
+    ]);
+    expect(errorRoutes).toStrictEqual([]);
+  });
+
   it('api + raw static', async () => {
     const files = ['api/endpoint.js', 'index.html', 'favicon.ico'];
 
@@ -1905,7 +1981,7 @@ describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
     ]);
   });
 
-  it('RedwoodJS should allow usage of non-js API', async () => {
+  it('RedwoodJS should allow usage of non-js API and not add 404 api route', async () => {
     const files = [...redwoodFiles, 'api/golang.go', 'api/python.py'].sort();
     const projectSettings = {
       framework: 'redwoodjs',
@@ -1953,13 +2029,7 @@ describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
         check: true,
       },
     ]);
-    expect(rewriteRoutes).toStrictEqual([
-      {
-        status: 404,
-        src: '^/api(/.*)?$',
-        continue: true,
-      },
-    ]);
+    expect(rewriteRoutes).toStrictEqual([]);
     expect(errorRoutes).toStrictEqual([
       {
         status: 404,

packages/now-cli/@types/which-promise/index.d.ts

@@ -1,3 +0,0 @@
-declare module 'which-promise' {
-  export default function (name: string): Promise<string>;
-}

packages/now-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "20.0.0-canary.21",
+  "version": "20.1.2-canary.5",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -61,14 +61,11 @@
     "node": ">= 10"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.4.3-canary.4",
-    "@vercel/go": "1.1.5-canary.0",
-    "@vercel/next": "2.6.20-canary.1",
-    "@vercel/node": "1.7.5-canary.1",
-    "@vercel/python": "1.2.2",
-    "@vercel/redwood": "0.0.2-canary.7",
-    "@vercel/ruby": "1.2.3",
-    "@vercel/static-build": "0.17.7-canary.3",
+    "@vercel/build-utils": "2.5.4-canary.0",
+    "@vercel/go": "1.1.6",
+    "@vercel/node": "1.8.4-canary.0",
+    "@vercel/python": "1.2.3",
+    "@vercel/ruby": "1.2.4",
     "update-notifier": "4.1.0"
   },
   "devDependencies": {
@@ -103,9 +100,9 @@
     "@types/universal-analytics": "0.4.2",
     "@types/which": "1.3.2",
     "@types/write-json-file": "2.2.1",
-    "@vercel/frameworks": "0.0.18-canary.5",
+    "@vercel/frameworks": "0.1.1",
+    "@vercel/ncc": "0.24.0",
     "@zeit/fun": "0.11.2",
-    "@zeit/ncc": "0.18.5",
     "@zeit/source-map-support": "0.6.2",
     "ajv": "6.12.2",
     "alpha-sort": "2.0.1",
@@ -124,13 +121,9 @@
     "cpy": "7.2.0",
     "credit-card": "3.0.1",
     "date-fns": "1.29.0",
-    "death": "1.1.0",
     "debug": "3.1.0",
-    "deployment-type": "1.0.1",
-    "docker-file-parser": "1.0.2",
     "dot": "1.1.3",
     "dotenv": "4.0.0",
-    "download": "6.2.5",
     "email-prompt": "0.3.2",
     "email-validator": "1.1.1",
     "epipebomb": "1.0.0",
@@ -141,8 +134,7 @@
     "fs-extra": "7.0.1",
     "get-port": "5.1.1",
     "glob": "7.1.2",
-    "http-proxy": "1.17.0",
-    "ignore": "4.0.6",
+    "http-proxy": "1.18.1",
     "inquirer": "7.0.4",
     "is-port-reachable": "3.0.0",
     "is-url": "1.2.2",
@@ -155,20 +147,17 @@
     "mri": "1.1.5",
     "ms": "2.1.2",
     "nanoid": "3.0.2",
-    "node-fetch": "2.6.0",
+    "node-fetch": "2.6.1",
     "npm-package-arg": "6.1.0",
     "nyc": "13.2.0",
     "ora": "3.4.0",
     "pcre-to-regexp": "1.0.0",
     "pluralize": "7.0.0",
-    "printf": "0.2.5",
     "progress": "2.0.3",
     "promisepipe": "3.0.0",
     "psl": "1.1.31",
     "qr-image": "3.2.0",
     "raw-body": "2.4.1",
-    "read-pkg": "2.0.0",
-    "rx-lite-aggregates": "4.0.8",
     "semver": "5.5.0",
     "serve-handler": "6.1.1",
     "sinon": "4.4.2",
@@ -177,17 +166,14 @@
     "tar-fs": "1.16.3",
     "test-listen": "1.1.0",
     "text-table": "0.2.0",
-    "then-sleep": "1.0.1",
-    "through2": "2.0.3",
     "title": "3.4.1",
     "tmp-promise": "1.0.3",
-    "tree-kill": "1.2.1",
+    "tree-kill": "1.2.2",
     "ts-node": "8.3.0",
     "typescript": "3.9.3",
     "universal-analytics": "0.4.20",
     "utility-types": "2.1.0",
     "which": "2.0.2",
-    "which-promise": "1.0.0",
     "write-json-file": "2.2.0",
     "xdg-app-paths": "5.1.0"
   }

packages/now-cli/scripts/build.ts

@@ -49,18 +49,12 @@ async function main() {
   // Do the initial `ncc` build
   console.log();
   const src = join(dirRoot, 'src');
-  const args = [
-    '@zeit/ncc',
-    'build',
-    '--source-map',
-    '--external',
-    'update-notifier',
-  ];
-  if (!isDev) {
-    args.push('--minify');
+  const args = ['ncc', 'build', '--external', 'update-notifier'];
+  if (isDev) {
+    args.push('--source-map');
   }
   args.push(src);
-  await execa('npx', args, { stdio: 'inherit' });
+  await execa('yarn', args, { stdio: 'inherit' });
 
   // `ncc` has some issues with `@zeit/fun`'s runtime files:
   //   - Executable bits on the `bootstrap` files appear to be lost:

packages/now-cli/src/commands/alias/index.js

@@ -18,7 +18,7 @@ const help = () => {
 
   ${chalk.dim('Commands:')}
 
-    ls    [app]                  Show all aliases (or per app name)
+    ls                           Show all aliases
     set   <deployment> <alias>   Create a new alias
     rm    <alias>                Remove an alias using its hostname
 
@@ -39,19 +39,19 @@ const help = () => {
     -N, --next                          Show next page of results
   ${chalk.dim('Examples:')}
 
-  ${chalk.gray('–')} Add a new alias to ${chalk.underline('my-api.now.sh')}
+  ${chalk.gray('–')} Add a new alias to ${chalk.underline('my-api.vercel.app')}
 
       ${chalk.cyan(
         `$ ${getPkgName()} alias set ${chalk.underline(
-          'api-ownv3nc9f8.now.sh'
-        )} ${chalk.underline('my-api.now.sh')}`
+          'api-ownv3nc9f8.vercel.app'
+        )} ${chalk.underline('my-api.vercel.app')}`
       )}
 
       Custom domains work as alias targets
 
       ${chalk.cyan(
         `$ ${getPkgName()} alias set ${chalk.underline(
-          'api-ownv3nc9f8.now.sh'
+          'api-ownv3nc9f8.vercel.app'
         )} ${chalk.underline('my-api.com')}`
       )}
 

packages/now-cli/src/commands/alias/ls.js

@@ -1,6 +1,5 @@
 import chalk from 'chalk';
 import ms from 'ms';
-import plural from 'pluralize';
 import table from 'text-table';
 import Now from '../../util';
 import Client from '../../util/client.ts';
@@ -52,21 +51,17 @@ export default async function ls(ctx, opts, args, output) {
   const lsStamp = stamp();
   let cancelWait;
 
-  if (args.length > 1) {
+  if (args.length > 0) {
     output.error(
       `Invalid number of arguments. Usage: ${chalk.cyan(
-        `${getCommandName('alias ls [alias]')}`
+        `${getCommandName('alias ls')}`
       )}`
     );
     return 1;
   }
 
   cancelWait = output.spinner(
-    args[0]
-      ? `Fetching alias details for "${args[0]}" under ${chalk.bold(
-          contextName
-        )}`
-      : `Fetching aliases under ${chalk.bold(contextName)}`
+    `Fetching aliases under ${chalk.bold(contextName)}`
   );
 
   const { aliases, pagination } = await getAliases(
@@ -76,32 +71,8 @@ export default async function ls(ctx, opts, args, output) {
   );
   if (cancelWait) cancelWait();
 
-  if (args[0]) {
-    const alias = aliases.find(
-      item => item.uid === args[0] || item.alias === args[0]
-    );
-    if (!alias) {
-      output.error(`Could not match path alias for: ${args[0]}`);
-      now.close();
-      return 1;
-    }
-
-    if (opts['--json']) {
-      console.log(JSON.stringify({ rules: alias.rules }, null, 2));
-    } else {
-      const rules = alias.rules || [];
-      output.log(
-        `${rules.length} path alias ${plural(
-          'rule',
-          rules.length
-        )} found under ${chalk.bold(contextName)} ${lsStamp()}`
-      );
-      output.print(`${printPathAliasTable(rules)}\n`);
-    }
-  } else {
-    output.log(`aliases found under ${chalk.bold(contextName)} ${lsStamp()}`);
-    console.log(printAliasTable(aliases));
-  }
+  output.log(`aliases found under ${chalk.bold(contextName)} ${lsStamp()}`);
+  console.log(printAliasTable(aliases));
 
   if (pagination && pagination.count === 20) {
     const flags = getCommandFlags(opts, ['_', '--next']);
@@ -121,14 +92,10 @@ function printAliasTable(aliases) {
     [
       ['source', 'url', 'age'].map(h => chalk.gray(h)),
       ...aliases.map(a => [
-        a.rules && a.rules.length
-          ? chalk.cyan(`[${plural('rule', a.rules.length, true)}]`)
-          : // for legacy reasons, we might have situations
-          // where the deployment was deleted and the alias
-          // not collected appropriately, and we need to handle it
-          a.deployment && a.deployment.url
-          ? a.deployment.url
-          : chalk.gray('–'),
+        // for legacy reasons, we might have situations
+        // where the deployment was deleted and the alias
+        // not collected appropriately, and we need to handle it
+        a.deployment && a.deployment.url ? a.deployment.url : chalk.gray('–'),
         a.alias,
         ms(Date.now() - new Date(a.createdAt)),
       ]),
@@ -140,21 +107,3 @@ function printAliasTable(aliases) {
     }
   ).replace(/^/gm, '  ')}\n\n`;
 }
-
-function printPathAliasTable(rules) {
-  const header = [['pathname', 'method', 'dest'].map(s => chalk.gray(s))];
-  return `${table(
-    header.concat(
-      rules.map(rule => [
-        rule.pathname ? rule.pathname : chalk.cyan('[fallthrough]'),
-        rule.method ? rule.method : '*',
-        rule.dest,
-      ])
-    ),
-    {
-      align: ['l', 'l', 'l', 'l'],
-      hsep: ' '.repeat(6),
-      stringLength: strlen,
-    }
-  ).replace(/^(.*)/gm, '  $1')}\n`;
-}

packages/now-cli/src/commands/alias/set.ts

@@ -96,7 +96,7 @@ export default async function set(
     return 1;
   }
 
-  // For `now alias set <argument>`
+  // For `vercel alias set <argument>`
   if (args.length === 1) {
     const deployment = handleCertError(
       output,
@@ -261,7 +261,7 @@ function handleSetupDomainError<T>(
         { extraSpace: '     ' }
       )}\n\n`
     );
-    output.print('  Read more: https://err.sh/now/domain-verification\n');
+    output.print('  Read more: https://err.sh/vercel/domain-verification\n');
     return 1;
   }
 
@@ -388,7 +388,7 @@ function handleCreateAliasError<T>(
   }
   if (error instanceof ERRORS.InvalidAlias) {
     output.error(
-      `Invalid alias. Please confirm that the alias you provided is a valid hostname. Note: For \`now.sh\`, only sub and sub-sub domains are supported.`
+      `Invalid alias. Please confirm that the alias you provided is a valid hostname. Note: For \`vercel.app\`, only sub and sub-sub domains are supported.`
     );
     return 1;
   }

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

@@ -75,7 +75,7 @@ export default async function issue(
   }
 
   if (crtPath || keyPath || caPath) {
-    if (args.length !== 0 || (!crtPath || !keyPath || !caPath)) {
+    if (args.length !== 0 || !crtPath || !keyPath || !caPath) {
       output.error(
         `Invalid number of arguments to create a custom certificate entry. Usage:`
       );
@@ -230,6 +230,8 @@ async function runStartOrder(
   output.print(
     `  ${chalk.cyan(getCommandName(`certs issue ${cns.join(' ')}`))}\n`
   );
-  output.print('  Read more: https://err.sh/now/solve-challenges-manually\n');
+  output.print(
+    '  Read more: https://err.sh/vercel/solve-challenges-manually\n'
+  );
   return 0;
 }

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

@@ -1,7 +1,5 @@
 import chalk from 'chalk';
 import logo from '../../util/output/logo';
-import code from '../../util/output/code';
-import note from '../../util/output/note';
 import { getPkgName } from '../../util/pkg-name.ts';
 
 export const help = () => `
@@ -70,12 +68,6 @@ export const help = () => `
     --prod                         Create a production deployment
     -c, --confirm                  Confirm default options and skip questions
 
-  ${note(
-    `To view the usage information for Now 1.0, run ${code(
-      `${getPkgName()} help deploy-v1`
-    )}`
-  )}
-
   ${chalk.dim('Examples:')}
 
   ${chalk.gray('–')} Deploy the current directory

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

@@ -104,7 +104,7 @@ const printDeploymentStatus = async (
 
   if (readyState !== 'READY') {
     output.error(
-      `Your deployment failed. Please retry later. More: https://err.sh/now/deployment-error`
+      `Your deployment failed. Please retry later. More: https://err.sh/vercel/deployment-error`
     );
     return 1;
   }
@@ -157,13 +157,21 @@ const printDeploymentStatus = async (
   }
 
   if (indications) {
+    const indent = process.stdout.isTTY ? '    ' : ''; // if using emojis
+    const newline = '\n';
     for (let indication of indications) {
-      output.print(
-        prependEmoji(
-          `${chalk.dim(indication.payload)}`,
-          emoji(indication.type)
-        ) + `\n`
-      );
+      const message =
+        prependEmoji(chalk.dim(indication.payload), emoji(indication.type)) +
+        newline;
+      let link = '';
+      if (indication.link)
+        link =
+          indent +
+          chalk.dim(
+            `${indication.action || 'Learn More'}: ${indication.link}`
+          ) +
+          newline;
+      output.print(message + link);
     }
   }
 };
@@ -239,11 +247,6 @@ export default async function main(
   const { isFile, path } = pathValidation;
   const autoConfirm = argv['--confirm'] || isFile;
 
-  // --no-scale
-  if (argv['--no-scale']) {
-    warn(`The option --no-scale is only supported on Now 1.0 deployments`);
-  }
-
   // deprecate --name
   if (argv['--name']) {
     output.print(
@@ -272,6 +275,7 @@ export default async function main(
   let { org, project, status } = link;
   let newProjectName = null;
   let rootDirectory = project ? project.rootDirectory : null;
+  let sourceFilesOutsideRootDirectory = true;
 
   if (status === 'not_linked') {
     const shouldStartSetup =
@@ -329,6 +333,7 @@ export default async function main(
     } else {
       project = projectOrNewProjectName;
       rootDirectory = project.rootDirectory;
+      sourceFilesOutsideRootDirectory = project.sourceFilesOutsideRootDirectory;
 
       // we can already link the project
       await linkFolderToProject(
@@ -345,7 +350,12 @@ export default async function main(
     }
   }
 
-  const sourcePath = rootDirectory ? join(path, rootDirectory) : path;
+  // if we have `sourceFilesOutsideRootDirectory` set to `true`, we use the current path
+  // and upload the entire directory.
+  const sourcePath =
+    rootDirectory && !sourceFilesOutsideRootDirectory
+      ? join(path, rootDirectory)
+      : path;
 
   if (
     rootDirectory &&
@@ -364,7 +374,7 @@ export default async function main(
   // If Root Directory is used we'll try to read the config
   // from there instead and use it if it exists.
   if (rootDirectory) {
-    const rootDirectoryConfig = readLocalConfig(sourcePath);
+    const rootDirectoryConfig = readLocalConfig(join(path, rootDirectory));
 
     if (rootDirectoryConfig) {
       debug(`Read local config from root directory (${rootDirectory})`);
@@ -521,6 +531,11 @@ export default async function main(
       skipAutoDetectionConfirmation: autoConfirm,
     };
 
+    if (!localConfig.builds || localConfig.builds.length === 0) {
+      // Only add projectSettings for zero config deployments
+      createArgs.projectSettings = { sourceFilesOutsideRootDirectory };
+    }
+
     deployment = await createDeploy(
       output,
       now,
@@ -542,6 +557,10 @@ export default async function main(
         projectSettings.rootDirectory = rootDirectory;
       }
 
+      if (typeof sourceFilesOutsideRootDirectory !== 'undefined') {
+        projectSettings.sourceFilesOutsideRootDirectory = sourceFilesOutsideRootDirectory;
+      }
+
       const settings = await editProjectSettings(
         output,
         projectSettings,

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

@@ -99,7 +99,7 @@ export default async function main(ctx: NowContext) {
             'package.json'
           )} must not contain ${cmd('now dev')}`
         );
-        output.error(`Learn More: http://err.sh/now/now-dev-as-dev-script`);
+        output.error(`Learn More: http://err.sh/vercel/now-dev-as-dev-script`);
         return 1;
       }
       if (scripts && scripts.dev && /\bvercel\b\W+\bdev\b/.test(scripts.dev)) {
@@ -108,7 +108,7 @@ export default async function main(ctx: NowContext) {
             'package.json'
           )} must not contain ${cmd('vercel dev')}`
         );
-        output.error(`Learn More: http://err.sh/now/now-dev-as-dev-script`);
+        output.error(`Learn More: http://err.sh/vercel/now-dev-as-dev-script`);
         return 1;
       }
     }

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

@@ -111,12 +111,11 @@ export default async function inspect(
     `    ${chalk.cyan('Created At')}\t\t\t${formatDate(domain.createdAt)}\n`
   );
   output.print(`    ${chalk.cyan('Edge Network')}\t\tyes\n`);
-
-  if (renewalPrice && domain.boughtAt) {
-    output.print(
-      `    ${chalk.cyan('Renewal Price')}\t\t$${renewalPrice} USD\n`
-    );
-  }
+  output.print(
+    `    ${chalk.cyan('Renewal Price')}\t\t${
+      domain.boughtAt && renewalPrice ? `$${renewalPrice} USD` : chalk.gray('-')
+    }\n`
+  );
 
   output.print('\n');
 

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

@@ -66,7 +66,10 @@ export default async function ls(
 
   const cancelWait = wait(`Fetching Domains under ${chalk.bold(contextName)}`);
 
-  const { domains, pagination } = await getDomains(client).finally(() => {
+  const { domains, pagination } = await getDomains(
+    client,
+    nextTimestamp
+  ).finally(() => {
     cancelWait();
   });
 

packages/now-cli/src/index.js

@@ -13,7 +13,6 @@ try {
     process.exit(1);
   }
 }
-import 'core-js/modules/es7.symbol.async-iterator';
 import { join } from 'path';
 import { existsSync, lstatSync } from 'fs';
 import sourceMap from '@zeit/source-map-support';
@@ -135,7 +134,7 @@ const main = async argv_ => {
   // (as in: `vercel ls`)
   const targetOrSubcommand = argv._[2];
 
-  if (notifier.update && isTTY) {
+  if (notifier.update && notifier.update.latest !== pkg.version && isTTY) {
     const { latest } = notifier.update;
     console.log(
       info(

packages/now-cli/src/types.ts

@@ -117,12 +117,6 @@ export type Deployment = {
   creator: { uid: string };
 };
 
-type PathAliasRule = {
-  pathname: string;
-  method: Array<'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE'>;
-  dest: string;
-};
-
 export type Alias = {
   uid: string;
   alias: string;
@@ -137,13 +131,6 @@ export type Alias = {
     email: string;
   };
   deploymentId?: string;
-  rules?: PathAliasRule[];
-};
-
-export type PathRule = {
-  dest: string;
-  pathname?: string;
-  method?: Array<string>;
 };
 
 export type DNSRecord = {

packages/now-cli/src/util/certs/handle-cert-error.ts

@@ -67,13 +67,15 @@ export default function handleCertError<T>(
       output.print(
         `  ${getCommandName(`certs issue --challenge-only <cns>`)}\n`
       );
-      output.print('  Read more: https://err.sh/now/dns-configuration-error\n');
+      output.print(
+        '  Read more: https://err.sh/vercel/dns-configuration-error\n'
+      );
     } else {
       output.print(
         `  We configured them for you, but the propagation may take a few minutes. Please try again later.\n`
       );
       output.print(
-        '  Read more: https://err.sh/now/dns-configuration-error\n\n'
+        '  Read more: https://err.sh/vercel/dns-configuration-error\n\n'
       );
     }
     return 1;

packages/now-cli/src/util/deploy/process-deployment.ts

@@ -172,6 +172,10 @@ export default async function processDeployment({
       if (event.type === 'created') {
         deployingSpinner();
 
+        if (bar && !bar.complete) {
+          bar.tick(bar.total + 1);
+        }
+
         now._host = event.payload.url;
 
         await linkFolderToProject(

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

@@ -923,9 +923,17 @@ export default class DevServer {
     await once(this.watcher, 'ready');
 
     // Configure the server to forward WebSocket "upgrade" events to the proxy.
-    this.server.on('upgrade', (req, socket, head) => {
+    this.server.on('upgrade', async (req, socket, head) => {
+      await this.startPromise;
+      if (!this.devProcessPort) {
+        this.output.debug(
+          `Detected "upgrade" event, but closing socket because no frontend dev server is running`
+        );
+        socket.destroy();
+        return;
+      }
       const target = `http://localhost:${this.devProcessPort}`;
-      this.output.debug(`Detected upgrade event, proxying to ${target}`);
+      this.output.debug(`Detected "upgrade" event, proxying to ${target}`);
       this.proxy.ws(req, socket, head, { target });
     });
 
@@ -1364,6 +1372,7 @@ export default class DevServer {
     const missRoutes = handleMap.get('miss') || [];
     const hitRoutes = handleMap.get('hit') || [];
     const errorRoutes = handleMap.get('error') || [];
+    const filesystemRoutes = handleMap.get('filesystem') || [];
     const phases: (HandleValue | null)[] = [null, 'filesystem'];
 
     let routeResult: RouteResult | null = null;
@@ -1475,40 +1484,63 @@ export default class DevServer {
         routeResult.status = prevStatus;
       }
 
-      if (!match && errorRoutes.length > 0) {
-        // error phase
-        const routeResultForError = await devRouter(
-          getReqUrl(routeResult),
-          req.method,
-          errorRoutes,
-          this,
-          nowConfig,
-          routeResult.headers,
-          [],
-          'error'
-        );
-
-        const matchForError = await findBuildMatch(
-          this.buildMatches,
-          this.files,
-          routeResultForError.dest,
-          this,
-          nowConfig
-        );
-
-        if (matchForError) {
-          // error phase only applies if the file was found
-          routeResult = routeResultForError;
-          match = matchForError;
-        }
-      }
-
       statusCode = routeResult.status;
 
       if (match) {
         // end the phase
         break;
       }
+
+      if (phase === null && filesystemRoutes.length === 0) {
+        // hack to skip the reset from null to filesystem
+        break;
+      }
+    }
+
+    if (!match && routeResult && errorRoutes.length > 0) {
+      // error phase
+      const routeResultForError = await devRouter(
+        getReqUrl(routeResult),
+        req.method,
+        errorRoutes,
+        this,
+        nowConfig,
+        routeResult.headers,
+        [],
+        'error'
+      );
+      const { matched_route } = routeResultForError;
+
+      const matchForError = await findBuildMatch(
+        this.buildMatches,
+        this.files,
+        routeResultForError.dest,
+        this,
+        nowConfig
+      );
+
+      if (matchForError) {
+        debug(`Route match detected in error phase, breaking loop`);
+        routeResult = routeResultForError;
+        statusCode = routeResultForError.status;
+        match = matchForError;
+      } else if (matched_route && matched_route.src && !matched_route.dest) {
+        debug(
+          'Route without `dest` detected in error phase, attempting to exit early'
+        );
+        if (
+          await this.exitWithStatus(
+            matchForError,
+            routeResultForError,
+            'error',
+            req,
+            res,
+            nowRequestId
+          )
+        ) {
+          return;
+        }
+      }
     }
 
     if (!routeResult) {

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

@@ -999,7 +999,7 @@ export class MissingDotenvVarsError extends NowError<
       ].join('\n');
     }
 
-    message += '\nRead more: https://err.sh/now/missing-env-file';
+    message += '\nRead more: https://err.sh/vercel/missing-env-file';
 
     super({
       code: 'MISSING_DOTENV_VARS',

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

@@ -1,13 +1,9 @@
 import { resolve } from 'path';
-import ignore from 'ignore';
 import _glob, { IOptions as GlobOptions } from 'glob';
 import fs from 'fs-extra';
 import { getVercelIgnore } from '@vercel/client';
-import IGNORED from './ignored';
 import uniqueStrings from './unique-strings';
-import getLocalConfigPath from './config/local-path';
 import { Output } from './output/create-output';
-import { NowConfig } from './dev/types';
 
 type NullableString = string | null;
 
@@ -33,103 +29,6 @@ async function glob(pattern: string, options: GlobOptions): Promise<string[]> {
   });
 }
 
-interface WalkOptions {
-  output: Output;
-}
-
-/**
- * Will recursivly walk through a directory and return an array of the files found within.
- * @param {string} dir the directory to walk
- * @param {string} path the path to this directory
- * @param {Array[string]} filelist a list of files so far identified
- * @param {Object} options
- *  - `output` {Object} "output" helper object
- * @returns {Array}
- */
-async function walk(
-  dir: string,
-  path: string,
-  filelist: string[] = [],
-  opts: WalkOptions
-) {
-  const { debug } = opts.output;
-  const dirc = await fs.readdir(asAbsolute(dir, path));
-  for (let file of dirc) {
-    file = asAbsolute(file, dir);
-    try {
-      const fileStat = await fs.stat(file);
-      filelist = fileStat.isDirectory()
-        ? await walk(file, path, filelist, opts)
-        : filelist.concat(file);
-    } catch (e) {
-      debug(`Ignoring invalid file ${file}`);
-    }
-  }
-  return filelist;
-}
-
-interface FilesInWhitelistOptions {
-  output: Output;
-}
-
-/**
- * Will return an array containing the expaneded list of all files included in the whitelist.
- * @param {Array[string]} whitelist array of files and directories to include.
- * @param {string} path the path of the deployment.
- * @param {Object} options
- *  - `output` {Object} "output" helper object
- * @returns {Array} the expanded list of whitelisted files.
- */
-const getFilesInWhitelist = async function (
-  whitelist: string[],
-  path: string,
-  opts: FilesInWhitelistOptions
-) {
-  const { debug } = opts.output;
-  const files: string[] = [];
-
-  await Promise.all(
-    whitelist.map(async (file: string) => {
-      file = asAbsolute(file, path);
-      try {
-        const fileStat = await fs.stat(file);
-        if (fileStat.isDirectory()) {
-          const dirFiles = await walk(file, path, [], opts);
-          files.push(...dirFiles);
-        } else {
-          files.push(file);
-        }
-      } catch (e) {
-        debug(`Ignoring invalid file ${file}`);
-      }
-    })
-  );
-  return files;
-};
-
-/**
- * Remove leading `./` from the beginning of ignores
- * because ignore doesn't like them :|
- */
-
-const clearRelative = function (str: string) {
-  return str.replace(/(\n|^)\.\//g, '$1');
-};
-
-/**
- * Returns the contents of a file if it exists.
- *
- * @return {String} results or `''`
- */
-
-const maybeRead = async function <T>(path: string, default_: T) {
-  try {
-    return await fs.readFile(path, 'utf8');
-  } catch (err) {
-    return default_;
-  }
-};
-
 /**
  * Transform relative paths into absolutes,
  * and maintains absolutes as such.
@@ -215,100 +114,6 @@ export async function staticFiles(
   return uniqueStrings(files);
 }
 
-interface NpmOptions {
-  hasNowJson: boolean;
-  output: Output;
-}
-
-/**
- * Returns a list of files in the given
- * directory that are subject to be
- * synchronized for npm.
- *
- * @param {String} full path to directory
- * @param {String} contents of `package.json` to avoid lookup
- * @param {Object} options:
- *  - `limit` {Number|null} byte limit
- *  - `output` {Object} "output" helper object
- * @return {Array} comprehensive list of paths to sync
- */
-export async function npm(
-  path: string,
-  pkg: { files?: string[]; now?: { files?: string[] } } = {},
-  nowConfig: NowConfig = {},
-  { hasNowJson = false, output }: NpmOptions
-) {
-  const { debug, time } = output;
-  const whitelist = nowConfig.files || pkg.files || (pkg.now && pkg.now.files);
-  let files: string[] = [];
-
-  if (whitelist) {
-    files = await getFilesInWhitelist(whitelist, path, { output });
-  } else {
-    // The package.json `files` whitelist still
-    // honors ignores: https://docs.npmjs.com/files/package.json#files
-    const search_ = ['.'];
-    // Convert all filenames into absolute paths
-    const search = Array.prototype.concat.apply(
-      [],
-      await Promise.all(
-        search_.map(file =>
-          glob(file, { cwd: path, absolute: true, dot: true })
-        )
-      )
-    );
-
-    // Compile list of ignored patterns and files
-    const npmIgnore = await maybeRead(resolve(path, '.npmignore'), null);
-
-    const filter = ignore()
-      .add(
-        `${IGNORED}\n${clearRelative(
-          npmIgnore === null
-            ? await maybeRead(resolve(path, '.gitignore'), '')
-            : npmIgnore
-        )}`
-      )
-      .createFilter();
-
-    const prefixLength = path.length + 1;
-
-    const accepts = (file: string) => {
-      const relativePath = file.substr(prefixLength);
-
-      if (relativePath === '') {
-        return true;
-      }
-
-      const accepted = filter(relativePath);
-      if (!accepted) {
-        debug(`Ignoring ${file}`);
-      }
-      return accepted;
-    };
-
-    // Locate files
-    files = await time(
-      `Locating files ${path}`,
-      explode(search, {
-        accepts,
-        output,
-      })
-    );
-  }
-
-  // Always include manifest as npm does not allow ignoring it
-  // source: https://docs.npmjs.com/files/package.json#files
-  files.push(asAbsolute('package.json', path));
-
-  if (hasNowJson) {
-    files.push(asAbsolute(getLocalConfigPath(path), path));
-  }
-
-  // Get files
-  return uniqueStrings(files);
-}
-
 interface ExplodeOptions {
   accepts: (file: string) => boolean;
   output: Output;

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

@@ -1,26 +0,0 @@
-// Base `.gitignore` to which we add entries
-// supplied by the user
-export default `.hg
-.git
-.gitmodules
-.svn
-.cache
-.next
-.now
-.vercel
-.npmignore
-.dockerignore
-.gitignore
-.*.swp
-.DS_Store
-.wafpicke-*
-.lock-wscript
-.env.local
-.env.*.local
-.venv
-npm-debug.log
-config.gypi
-node_modules
-__pycache__
-venv
-CVS`;

packages/now-cli/src/util/index.js

@@ -186,7 +186,7 @@ export default class Now extends EventEmitter {
         const { key } = error;
         err.message =
           `The env key ${key} has an invalid type: ${typeof env[key]}. ` +
-          'Please supply a String or a Number (https://err.sh/now-cli/env-value-invalid-type)';
+          'Please supply a String or a Number (https://err.sh/vercel-cli/env-value-invalid-type)';
       } else if (code === 'unreferenced_build_specifications') {
         const count = unreferencedBuildSpecs.length;
         const prefix = count === 1 ? 'build' : 'builds';

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

@@ -59,6 +59,7 @@ export default async function setupAndLink(
   const isTTY = process.stdout.isTTY;
   const quiet = !isTTY;
   let rootDirectory: string | null = null;
+  let sourceFilesOutsideRootDirectory = true;
   let newProjectName: string;
   let org;
 
@@ -129,7 +130,13 @@ export default async function setupAndLink(
     );
     return { status: 'linked', org, project };
   }
-  const sourcePath = rootDirectory ? join(path, rootDirectory) : path;
+
+  // if we have `sourceFilesOutsideRootDirectory` set to `true`, we use the current path
+  // and upload the entire directory.
+  const sourcePath =
+    rootDirectory && !sourceFilesOutsideRootDirectory
+      ? join(path, rootDirectory)
+      : path;
 
   if (
     rootDirectory &&
@@ -174,6 +181,11 @@ export default async function setupAndLink(
         skipAutoDetectionConfirmation: false,
       };
 
+      if (!localConfig.builds || localConfig.builds.length === 0) {
+        // Only add projectSettings for zero config deployments
+        createArgs.projectSettings = { sourceFilesOutsideRootDirectory };
+      }
+
       const deployment = await createDeploy(
         output,
         now,

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

@@ -33,7 +33,7 @@ export default function createOutput({ debug: debugEnabled = false } = {}) {
       boxen?: boxen.Options;
     }
   ) {
-    const details = slug ? `https://err.sh/now/${slug}` : link;
+    const details = slug ? `https://err.sh/vercel/${slug}` : link;
 
     print(
       boxen(
@@ -66,7 +66,7 @@ export default function createOutput({ debug: debugEnabled = false } = {}) {
     action = 'Learn More'
   ) {
     print(`${chalk.red(`Error!`)} ${str}\n`);
-    const details = slug ? `https://err.sh/now/${slug}` : link;
+    const details = slug ? `https://err.sh/vercel/${slug}` : link;
     if (details) {
       print(`${chalk.bold(action)}: ${renderLink(details)}\n`);
     }

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

@@ -10,7 +10,7 @@ export default function error(...input: string[] | [APIError]) {
   if (typeof input[0] === 'object') {
     const { slug, message, link, action = 'Learn More' } = input[0];
     messages = [message];
-    const details = slug ? `https://err.sh/now/${slug}` : link;
+    const details = slug ? `https://err.sh/vercel/${slug}` : link;
     if (details) {
       messages.push(`${chalk.bold(action)}: ${renderLink(details)}`);
     }

packages/now-cli/src/util/output/table.js

@@ -1,8 +1,7 @@
 import chalk from 'chalk';
-import printf from 'printf';
 
 const printLine = (data, sizes) =>
-  data.reduce((line, col, i) => line + printf(`%-${sizes[i]}s`, col), '');
+  data.reduce((line, col, i) => line + col.padEnd(sizes[i]), '');
 
 // Print a table
 export default (fieldNames = [], data = [], margins = []) => {

packages/now-cli/test/dev/fixtures/10a-nextjs-routes/.gitignore

@@ -0,0 +1,3 @@
+node_modules
+.next
+.vercel

packages/now-cli/test/dev/fixtures/10a-nextjs-routes/package.json

@@ -0,0 +1,8 @@
+{
+  "private": true,
+  "dependencies": {
+    "next": "9.5.3",
+    "react": "16.13.1",
+    "react-dom": "16.13.1"
+  }
+}

packages/now-cli/test/dev/fixtures/10a-nextjs-routes/pages/api/hello.js

@@ -0,0 +1,3 @@
+module.exports = (_req, res) => {
+  res.end('Hello Routes');
+};

packages/now-cli/test/dev/fixtures/10a-nextjs-routes/pages/index.js

@@ -0,0 +1,10 @@
+function Index() {
+  return (
+    <main>
+      <h1>Next.js with routes</h1>
+      <a href="/hello">/hello</a>
+    </main>
+  );
+}
+
+export default Index;

packages/now-cli/test/dev/fixtures/10a-nextjs-routes/vercel.json

@@ -0,0 +1,3 @@
+{
+  "routes": [{ "src": "/hello", "dest": "/api/hello" }]
+}

packages/now-cli/test/dev/fixtures/node-ts-node-target/tsconfig.json

@@ -1,5 +1,68 @@
 {
   "compilerOptions": {
-    "module": "CommonJS"
+    /* Visit https://aka.ms/tsconfig.json to read more about this file */
+
+    /* Basic Options */
+    // "incremental": true,                   /* Enable incremental compilation */
+    "module": "CommonJS",
+    // "lib": [],                             /* Specify library files to be included in the compilation. */
+    // "allowJs": true,                       /* Allow javascript files to be compiled. */
+    // "checkJs": true,                       /* Report errors in .js files. */
+    // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+    // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "sourceMap": true,                     /* Generates corresponding '.map' file. */
+    // "outFile": "./",                       /* Concatenate and emit output to single file. */
+    // "outDir": "./",                        /* Redirect output structure to the directory. */
+    // "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+    // "composite": true,                     /* Enable project compilation */
+    // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
+    // "removeComments": true,                /* Do not emit comments to output. */
+    // "noEmit": true,                        /* Do not emit outputs. */
+    // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+    // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+    /* Strict Type-Checking Options */
+    "strict": true /* Enable all strict type-checking options. */,
+    // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+    // "strictNullChecks": true,              /* Enable strict null checks. */
+    // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
+    // "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+    // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
+    // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
+    // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+
+    /* Additional Checks */
+    // "noUnusedLocals": true,                /* Report errors on unused locals. */
+    // "noUnusedParameters": true,            /* Report errors on unused parameters. */
+    // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+    // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+    /* Module Resolution Options */
+    // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
+    // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+    // "typeRoots": [],                       /* List of folders to include type definitions from. */
+    // "types": [],                           /* Type declaration files to be included in compilation. */
+    // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+    "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
+    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+    // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
+
+    /* Source Map Options */
+    // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+    // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
+    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+    /* Experimental Options */
+    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+    // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+
+    /* Advanced Options */
+    "skipLibCheck": true /* Skip type checking of declaration files. */,
+    "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
   }
 }

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

@@ -6,13 +6,13 @@ import { isIP } from 'net';
 import { join, resolve, delimiter } from 'path';
 import _execa from 'execa';
 import fetch from 'node-fetch';
-import sleep from 'then-sleep';
 import retry from 'async-retry';
 import { satisfies } from 'semver';
 import { getDistTag } from '../../src/util/get-dist-tag';
 import { version as cliVersion } from '../../package.json';
-import { fetchTokenWithRetry } from '../../../../test/lib/deployment/now-deploy';
+import { fetchCachedToken } from '../../../../test/lib/deployment/now-deploy';
 
+const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
 const isCanary = () => getDistTag(cliVersion) === 'canary';
 
 let port = 3000;
@@ -245,7 +245,7 @@ function testFixtureStdio(
     const cwd = isExample
       ? exampleAbsolute(directory)
       : fixtureAbsolute(directory);
-    const token = await fetchTokenWithRetry();
+    const token = await fetchCachedToken();
     let deploymentUrl;
 
     // Deploy fixture and link project
@@ -1180,6 +1180,14 @@ test(
   })
 );
 
+test(
+  '[vercel dev] 10a-nextjs-routes',
+  testFixtureStdio('10a-nextjs-routes', async testPath => {
+    await testPath(200, '/', /Next.js with routes/m);
+    await testPath(200, '/hello', /Hello Routes/m);
+  })
+);
+
 test(
   '[vercel dev] 12-polymer-node',
   testFixtureStdio(

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

@@ -28,9 +28,6 @@ module.exports = async function prepare(session) {
       'first.png': getImageFile(session, { size: 30 }),
       'second.png': getImageFile(session, { size: 20 }),
     },
-    'single-dotfile': {
-      '.testing': 'i am a dotfile',
-    },
     'empty-directory': {},
     'config-scope-property-email': {
       'now.json': `{ "scope": "${session}@zeit.pub", "builds": [ { "src": "*.html", "use": "@now/static" } ] }`,
@@ -90,7 +87,7 @@ module.exports = async function prepare(session) {
       }),
       'now-build.js': `
         const fs = require('fs');
-        fs.writeFileSync( 
+        fs.writeFileSync(
           'index.js',
           fs.readFileSync('index.js', 'utf8')
           .replace('BUILD_ENV_DEBUG', process.env.NOW_BUILDER_DEBUG ? 'on' : 'off'),
@@ -207,23 +204,6 @@ module.exports = async function prepare(session) {
         },
       }),
     },
-    'alias-rules': {
-      'rules.json': JSON.stringify({
-        rules: [
-          // for example:
-          // { pathname: '/', dest: '' },
-          // { pathname: '/', dest: '', method: 'GET' }
-          // Will be generated by the actual test
-        ],
-      }),
-      'invalid-rules.json': JSON.stringify({
-        what: { what: 0 },
-      }),
-      'invalid-type-rules.json': JSON.stringify({
-        rules: { what: 0 },
-      }),
-      'invalid-json-rules.json': '==ok',
-    },
     'zero-config-next-js': {
       'pages/index.js':
         'export default () => <div><h1>Now CLI test</h1><p>Zero-config + Next.js</p></div>',
@@ -241,6 +221,24 @@ module.exports = async function prepare(session) {
         },
       }),
     },
+    'zero-config-next-js-functions-warning': {
+      'pages/index.js':
+        'export default () => <div><h1>Vercel CLI test</h1><p>Zero-config + Next.js</p></div>',
+      'vercel.json':
+        '{"version":2,"functions":{"pages/index.js":{"runtime": "@vercel/php@0.1.0"}}}',
+      'package.json': JSON.stringify({
+        scripts: {
+          dev: 'next',
+          start: 'next start',
+          build: 'next build',
+        },
+        dependencies: {
+          next: 'latest',
+          react: 'latest',
+          'react-dom': 'latest',
+        },
+      }),
+    },
     'lambda-with-128-memory': {
       'api/memory.js': `
         module.exports = (req, res) => {

packages/now-cli/test/integration.js

@@ -1052,7 +1052,7 @@ test('domains inspect', async t => {
     }
   );
 
-  t.true(!stderr.includes(`Renewal Price`));
+  t.true(stderr.includes(`Renewal Price`));
   t.is(exitCode, 0, formatOutput({ stdout, stderr }));
 
   {
@@ -2219,6 +2219,33 @@ test('create zero-config deployment', async t => {
   );
 });
 
+test('next unsupported functions config shows warning link', async t => {
+  const fixturePath = fixture('zero-config-next-js-functions-warning');
+  const output = await execute([
+    fixturePath,
+    '--force',
+    '--public',
+    '--confirm',
+  ]);
+
+  console.log('isCanary', isCanary);
+  console.log(output.stderr);
+  console.log(output.stdout);
+  console.log(output.exitCode);
+
+  t.is(output.exitCode, 0, formatOutput(output));
+  t.regex(
+    output.stderr,
+    /Ignoring function property `runtime`\. When using Next\.js, only `memory` and `maxDuration` can be used\./gm,
+    formatOutput(output)
+  );
+  t.regex(
+    output.stderr,
+    /Learn More: https:\/\/vercel\.link\/functions-property-next/gm,
+    formatOutput(output)
+  );
+});
+
 test('vercel secret add', async t => {
   context.secretName = `my-secret-${Date.now().toString(36)}`;
   const value = 'https://my-secret-endpoint.com';
@@ -2338,7 +2365,6 @@ test('invalid `--token`', async t => {
   );
 });
 
-// We need to skip this test until `now-php` supports Runtime version 3
 test('deploy a Lambda with a specific runtime', async t => {
   const directory = fixture('lambda-with-php-runtime');
   const output = await execute([directory, '--public', '--confirm']);
@@ -2347,7 +2373,8 @@ test('deploy a Lambda with a specific runtime', async t => {
 
   const { host: url } = new URL(output.stdout);
 
-  const [build] = await getDeploymentBuildsByUrl(url);
+  const builds = await getDeploymentBuildsByUrl(url);
+  const build = builds.find(b => b.use && b.use.includes('php')) || builds[0];
   t.is(build.use, 'vercel-php@0.1.0', JSON.stringify(build, null, 2));
 });
 

packages/now-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/client",
-  "version": "8.2.2-canary.8",
+  "version": "9.0.3-canary.0",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "homepage": "https://vercel.com",
@@ -26,7 +26,6 @@
     "@types/node": "12.0.4",
     "@types/node-fetch": "2.5.4",
     "@types/recursive-readdir": "2.2.0",
-    "@zeit/ncc": "0.18.5",
     "typescript": "3.9.3"
   },
   "jest": {
@@ -38,14 +37,14 @@
     ]
   },
   "dependencies": {
-    "@vercel/build-utils": "2.4.3-canary.4",
+    "@vercel/build-utils": "2.5.4-canary.0",
     "@zeit/fetch": "5.2.0",
     "async-retry": "1.2.3",
     "async-sema": "3.0.0",
     "fs-extra": "8.0.1",
     "ignore": "4.0.6",
     "ms": "2.1.2",
-    "node-fetch": "2.6.0",
+    "node-fetch": "2.6.1",
     "querystring": "^0.2.0",
     "recursive-readdir": "2.2.2",
     "sleep-promise": "8.0.1"

packages/now-client/src/deploy.ts

@@ -19,7 +19,12 @@ async function* postDeployment(
   files: Map<string, DeploymentFile>,
   clientOptions: NowClientOptions,
   deploymentOptions: DeploymentOptions
-): AsyncIterableIterator<{ type: DeploymentEventType; payload: any }> {
+): AsyncIterableIterator<{
+  type: DeploymentEventType;
+  payload: any;
+  action?: string;
+  link?: string;
+}> {
   const debug = createDebug(clientOptions.debug);
   const preparedFiles = prepareFiles(files, clientOptions);
   const apiDeployments = getApiDeploymentsUrl(deploymentOptions);
@@ -63,19 +68,19 @@ async function* postDeployment(
       };
     }
 
-    for (const [name, value] of response.headers.entries()) {
-      if (name.startsWith('x-now-warning-')) {
-        debug('Deployment created with a warning:', value);
-        yield { type: 'warning', payload: value };
-      }
+    const indications = new Set(['warning', 'notice', 'tip']);
+    const regex = /^x-(?:vercel|now)-(warning|notice|tip)-(.*)$/;
+    for (const [name, payload] of response.headers.entries()) {
+      const match = name.match(regex);
+      if (match) {
+        const [, type, identifier] = match;
+        const action = response.headers.get(`x-vercel-action-${identifier}`);
+        const link = response.headers.get(`x-vercel-link-${identifier}`);
 
-      if (name.startsWith('x-now-notice-')) {
-        debug('Deployment created with a notice:', value);
-        yield { type: 'notice', payload: value };
-      }
-      if (name.startsWith('x-now-tip-')) {
-        debug('Deployment created with a tip:', value);
-        yield { type: 'tip', payload: value };
+        if (indications.has(type)) {
+          debug(`Deployment created with a ${type}: `, payload);
+          yield { type, payload, action, link };
+        }
       }
     }
     yield { type: 'created', payload: deployment };

packages/now-client/tests/common.ts

@@ -1,10 +1,10 @@
 const {
-  fetchTokenWithRetry,
+  fetchCachedToken,
   // eslint-disable-next-line @typescript-eslint/no-var-requires
 } = require('../../../test/lib/deployment/now-deploy.js');
 
 export async function generateNewToken(): Promise<string> {
-  const token = await fetchTokenWithRetry();
+  const token = await fetchCachedToken();
   return token;
 }
 

packages/now-go/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/go",
-  "version": "1.1.5-canary.0",
+  "version": "1.1.6",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/go",
@@ -25,6 +25,7 @@
     "@types/fs-extra": "^5.0.5",
     "@types/node-fetch": "^2.3.0",
     "@types/tar": "^4.0.0",
+    "@vercel/ncc": "0.24.0",
     "async-retry": "1.3.1",
     "execa": "^1.0.0",
     "fs-extra": "^7.0.0",

packages/now-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "2.6.20-canary.1",
+  "version": "2.6.26",
   "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",
+    "@vercel/nft": "0.9.2",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",
     "escape-string-regexp": "3.0.0",

packages/now-next/src/index.ts

@@ -16,7 +16,7 @@ import {
   convertRedirects,
   convertRewrites,
 } from '@vercel/routing-utils/dist/superstatic';
-import { nodeFileTrace, NodeFileTraceReasons } from '@zeit/node-file-trace';
+import { nodeFileTrace, NodeFileTraceReasons } from '@vercel/nft';
 import { Sema } from 'async-sema';
 import { ChildProcess, fork } from 'child_process';
 import escapeStringRegexp from 'escape-string-regexp';
@@ -213,6 +213,7 @@ function startDevServer(entryPath: string, runtimeEnv: EnvConfig) {
 export const build = async ({
   files,
   workPath,
+  repoRootPath,
   entrypoint,
   config = {} as Config,
   meta = {} as BuildParamsMeta,
@@ -231,6 +232,7 @@ export const build = async ({
   const entryPath = path.join(workPath, entryDirectory);
   const outputDirectory = config.outputDirectory || '.next';
   const dotNextStatic = path.join(entryPath, outputDirectory, 'static');
+  const baseDir = repoRootPath || workPath;
 
   await download(files, workPath, meta);
 
@@ -240,7 +242,7 @@ export const build = async ({
   const spawnOpts = getSpawnOptions(meta, nodeVersion);
 
   const nowJsonPath = await findUp(['now.json', 'vercel.json'], {
-    cwd: path.join(workPath, path.dirname(entrypoint)),
+    cwd: entryPath,
   });
 
   let hasLegacyRoutes = false;
@@ -623,7 +625,8 @@ export const build = async ({
         },
 
         // error handling
-        ...(output[path.join('./', entryDirectory, '404')]
+        ...(output[path.join('./', entryDirectory, '404')] ||
+        output[path.join('./', entryDirectory, '404/index')]
           ? [
               { handle: 'error' } as Handler,
 
@@ -754,10 +757,16 @@ export const build = async ({
           ],
         };
 
-        const lambdaOptions = await getLambdaOptionsFromFunction({
-          sourceFile: await getSourceFilePathFromPage({ workPath, page }),
-          config,
-        });
+        let lambdaOptions = {};
+        if (config && config.functions) {
+          lambdaOptions = await getLambdaOptionsFromFunction({
+            sourceFile: await getSourceFilePathFromPage({
+              workPath: entryPath,
+              page,
+            }),
+            config,
+          });
+        }
 
         debug(`Creating serverless function for page: "${page}"...`);
         lambdas[path.join(entryDirectory, pathname)] = await createLambda({
@@ -863,7 +872,7 @@ export const build = async ({
         };
 
     const isApiPage = (page: string) =>
-      page.replace(/\\/g, '/').match(/serverless\/pages\/api/);
+      page.replace(/\\/g, '/').match(/serverless\/pages\/api(\/|\.js$)/);
 
     const canUsePreviewMode = Object.keys(pages).some(page =>
       isApiPage(pages[page].fsPath)
@@ -938,12 +947,18 @@ export const build = async ({
       const {
         fileList: apiFileList,
         reasons: apiReasons,
-      } = await nodeFileTrace(apiPages, { base: workPath });
+      } = await nodeFileTrace(apiPages, {
+        base: baseDir,
+        processCwd: entryPath,
+      });
 
-      const {
-        fileList,
-        reasons: nonApiReasons,
-      } = await nodeFileTrace(nonApiPages, { base: workPath });
+      const { fileList, reasons: nonApiReasons } = await nodeFileTrace(
+        nonApiPages,
+        {
+          base: baseDir,
+          processCwd: entryPath,
+        }
+      );
 
       debug(`node-file-trace result for pages: ${fileList}`);
 
@@ -961,7 +976,7 @@ export const build = async ({
           // Initial files are manually added to the lambda later
           return;
         }
-        const filePath = path.join(workPath, file);
+        const filePath = path.join(baseDir, file);
 
         if (!lstatResults[filePath]) {
           lstatResults[filePath] = lstatSema
@@ -972,7 +987,7 @@ export const build = async ({
         const { mode } = await lstatResults[filePath];
 
         files[file] = new FileFsRef({
-          fsPath: path.join(workPath, file),
+          fsPath: path.join(baseDir, file),
           mode,
         });
       };
@@ -1157,7 +1172,11 @@ export const build = async ({
         const {
           pseudoLayer: pageLayer,
           pseudoLayerBytes: pageLayerBytes,
-        } = await createPseudoLayer({ [pageFileName]: pages[page] });
+        } = await createPseudoLayer({
+          [path.join(path.relative(baseDir, entryPath), pageFileName)]: pages[
+            page
+          ],
+        });
 
         currentLambdaGroup.pages[outputName] = {
           pageLayer,
@@ -1193,21 +1212,31 @@ export const build = async ({
           }
 
           const pageFileName = path.normalize(
-            path.relative(workPath, pages[page].fsPath)
+            path.relative(entryPath, pages[page].fsPath)
           );
+
           const launcher = launcherData.replace(
             /__LAUNCHER_PAGE_PATH__/g,
             JSON.stringify(requiresTracing ? `./${pageFileName}` : './page')
           );
           const launcherFiles: { [name: string]: FileFsRef | FileBlob } = {
-            'now__bridge.js': new FileFsRef({
+            [path.join(
+              path.relative(baseDir, entryPath),
+              'now__bridge.js'
+            )]: new FileFsRef({
               fsPath: path.join(__dirname, 'now__bridge.js'),
             }),
-            'now__launcher.js': new FileBlob({ data: launcher }),
+            [path.join(
+              path.relative(baseDir, entryPath),
+              'now__launcher.js'
+            )]: new FileBlob({ data: launcher }),
           };
 
           const lambdaOptions = await getLambdaOptionsFromFunction({
-            sourceFile: await getSourceFilePathFromPage({ workPath, page }),
+            sourceFile: await getSourceFilePathFromPage({
+              workPath: entryPath,
+              page,
+            }),
             config,
           });
 
@@ -1217,10 +1246,16 @@ export const build = async ({
             lambdas[outputName] = await createLambdaFromPseudoLayers({
               files: {
                 ...launcherFiles,
-                [requiresTracing ? pageFileName : 'page.js']: pages[page],
+                [path.join(
+                  path.relative(baseDir, entryPath),
+                  pageFileName
+                )]: pages[page],
               },
               layers: isApiPage(pageFileName) ? apiPseudoLayers : pseudoLayers,
-              handler: 'now__launcher.launcher',
+              handler: path.join(
+                path.relative(baseDir, entryPath),
+                'now__launcher.launcher'
+              ),
               runtime: nodeVersion.runtime,
               ...lambdaOptions,
             });
@@ -1230,7 +1265,7 @@ export const build = async ({
                 ...launcherFiles,
                 ...assets,
                 ...tracedFiles,
-                [requiresTracing ? pageFileName : 'page.js']: pages[page],
+                ['page.js']: pages[page],
               },
               handler: 'now__launcher.launcher',
               runtime: nodeVersion.runtime,
@@ -1292,7 +1327,7 @@ export const build = async ({
                     ${groupPageKeys
                       .map(
                         page =>
-                          `'${page}': require('./${path.join(
+                          `'${page}': () => require('./${path.join(
                             './',
                             group.pages[page].pageFileName
                           )}')`
@@ -1301,7 +1336,7 @@ export const build = async ({
                     ${
                       '' /*
                       creates a mapping of the page and the page's module e.g.
-                      '/about': require('./.next/serverless/pages/about.js')
+                      '/about': () => require('./.next/serverless/pages/about.js')
                     */
                     }
                   }
@@ -1361,7 +1396,10 @@ export const build = async ({
                     res.statusCode = 500
                     return res.end('internal server error')
                   }
-                  const method = currentPage.render || currentPage.default || currentPage
+
+                  const mod = currentPage()
+                  const method = mod.render || mod.default || mod
+
                   return method(req, res)
                 } catch (err) {
                   console.error('Unhandled error during request:', err)
@@ -1371,10 +1409,16 @@ export const build = async ({
               `
             );
             const launcherFiles: { [name: string]: FileFsRef | FileBlob } = {
-              'now__bridge.js': new FileFsRef({
+              [path.join(
+                path.relative(baseDir, entryPath),
+                'now__bridge.js'
+              )]: new FileFsRef({
                 fsPath: path.join(__dirname, 'now__bridge.js'),
               }),
-              'now__launcher.js': new FileBlob({ data: launcher }),
+              [path.join(
+                path.relative(baseDir, entryPath),
+                'now__launcher.js'
+              )]: new FileBlob({ data: launcher }),
             };
 
             const pageLayers: PseudoLayer[] = [];
@@ -1396,7 +1440,10 @@ export const build = async ({
                   ...(group.isApiLambda ? apiPseudoLayers : pseudoLayers),
                   ...pageLayers,
                 ],
-                handler: 'now__launcher.launcher',
+                handler: path.join(
+                  path.relative(baseDir, entryPath),
+                  'now__launcher.launcher'
+                ),
                 runtime: nodeVersion.runtime,
               });
             } else {
@@ -1408,7 +1455,10 @@ export const build = async ({
                   ...assets,
                 },
                 layers: pageLayers,
-                handler: 'now__launcher.launcher',
+                handler: path.join(
+                  path.relative(baseDir, entryPath),
+                  'now__launcher.launcher'
+                ),
                 runtime: nodeVersion.runtime,
               });
             }

packages/now-next/src/templated-launcher-shared.ts

@@ -1,3 +1,9 @@
+// The Next.js builder can emit the project in a subdirectory depending on how
+// many folder levels of `node_modules` are traced. To ensure `process.cwd()`
+// returns the proper path, we change the directory to the folder with the
+// launcher. This mimics `yarn workspace run` behavior.
+process.chdir(__dirname);
+
 if (!process.env.NODE_ENV) {
   const region = process.env.VERCEL_REGION || process.env.NOW_REGION;
   process.env.NODE_ENV = region === 'dev1' ? 'development' : 'production';

packages/now-next/src/templated-launcher.ts

@@ -1,3 +1,9 @@
+// The Next.js builder can emit the project in a subdirectory depending on how
+// many folder levels of `node_modules` are traced. To ensure `process.cwd()`
+// returns the proper path, we change the directory to the folder with the
+// launcher. This mimics `yarn workspace run` behavior.
+process.chdir(__dirname);
+
 if (!process.env.NODE_ENV) {
   const region = process.env.VERCEL_REGION || process.env.NOW_REGION;
   process.env.NODE_ENV = region === 'dev1' ? 'development' : 'production';

packages/now-next/src/utils.ts

@@ -1000,11 +1000,38 @@ async function getSourceFilePathFromPage({
   workPath: string;
   page: string;
 }) {
+  let fsPath = path.join(workPath, 'pages', page);
   if (await usesSrcDirectory(workPath)) {
-    return path.join('src', 'pages', page);
+    fsPath = path.join(workPath, 'src', 'pages', page);
   }
 
-  return path.join('pages', page);
+  if (fs.existsSync(fsPath)) {
+    return path.relative(workPath, fsPath);
+  }
+
+  const extensionless = fsPath.slice(0, -3); // remove ".js"
+  fsPath = extensionless + '.ts';
+  if (fs.existsSync(fsPath)) {
+    return path.relative(workPath, fsPath);
+  }
+
+  if (isDirectory(extensionless)) {
+    fsPath = path.join(extensionless, 'index.js');
+    if (fs.existsSync(fsPath)) {
+      return path.relative(workPath, fsPath);
+    }
+    fsPath = path.join(extensionless, 'index.ts');
+    if (fs.existsSync(fsPath)) {
+      return path.relative(workPath, fsPath);
+    }
+  }
+
+  console.log(`WARNING: Unable to find source file for page ${page}`);
+  return '';
+}
+
+function isDirectory(path: string) {
+  return fs.existsSync(path) && fs.lstatSync(path).isDirectory();
 }
 
 export {

packages/now-next/test/fixtures/00-root-optional-revalidate/additional.js

@@ -0,0 +1,52 @@
+/* eslint-env jest */
+const fetch = require('node-fetch');
+const cheerio = require('cheerio');
+
+const waitFor = ms => new Promise(resolve => setTimeout(resolve, ms));
+
+module.exports = function (ctx) {
+  const getProps = async path => {
+    const html = await fetch(`${ctx.deploymentUrl}/${path}`).then(res =>
+      res.text()
+    );
+
+    const $ = cheerio.load(html);
+    return JSON.parse($('#props').text());
+  };
+
+  it('should render / correctly', async () => {
+    const props = await getProps('/', { params: {} });
+    expect(props.params).toEqual({});
+
+    await waitFor(2000);
+    await getProps('/');
+
+    const newProps = await getProps('/', { params: {} });
+    expect(newProps.params).toEqual({});
+    expect(props.random).not.toBe(newProps.random);
+  });
+
+  it('should render /a correctly', async () => {
+    const props = await getProps('/a');
+    expect(props.params).toEqual({ slug: ['a'] });
+
+    await waitFor(2000);
+    await getProps('/a');
+
+    const newProps = await getProps('/a');
+    expect(newProps.params).toEqual({ slug: ['a'] });
+    expect(props.random).not.toBe(newProps.random);
+  });
+
+  it('should render /hello/world correctly', async () => {
+    const props = await getProps('/hello/world');
+    expect(props.params).toEqual({ slug: ['hello', 'world'] });
+
+    await waitFor(2000);
+    await getProps('/hello/world');
+
+    const newProps = await getProps('/hello/world');
+    expect(newProps.params).toEqual({ slug: ['hello', 'world'] });
+    expect(props.random).not.toBe(newProps.random);
+  });
+};

packages/now-next/test/fixtures/00-root-optional-revalidate/now.json

@@ -0,0 +1,15 @@
+{
+  "version": 2,
+  "builds": [
+    {
+      "src": "package.json",
+      "use": "@vercel/next"
+    }
+  ],
+  "probes": [
+    {
+      "path": "/non-existent",
+      "status": 404
+    }
+  ]
+}

packages/now-next/test/fixtures/00-root-optional-revalidate/package.json

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

packages/now-next/test/fixtures/00-root-optional-revalidate/pages/[[...slug]].js

@@ -0,0 +1,24 @@
+export default function Home(props) {
+  return <pre id="props">{JSON.stringify(props)}</pre>;
+}
+
+export async function getStaticPaths() {
+  return {
+    paths: [
+      { params: { slug: false } },
+      { params: { slug: ['a'] } },
+      { params: { slug: ['hello', 'world'] } },
+    ],
+    fallback: false,
+  };
+}
+
+export async function getStaticProps({ params }) {
+  return {
+    props: {
+      params,
+      random: Math.random(),
+    },
+    revalidate: 1,
+  };
+}

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

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