Publish Stable

- @vercel/frameworks@0.0.17
 - @vercel/build-utils@2.4.2
 - vercel@19.2.0
 - @vercel/client@8.2.1
 - @vercel/go@1.1.4
 - @vercel/next@2.6.13
 - @vercel/node@1.7.3
 - @vercel/static-build@0.17.6

DEVELOPING_A_RUNTIME.md

@@ -1,10 +1,33 @@
 # Runtime Developer Reference
 
-The following page is a reference for how to create a Runtime using the available Runtime API.
+The following page is a reference for how to create a Runtime by implementing
+the Runtime API interface.
 
-A Runtime is an npm module that exposes a `build` function and optionally an `analyze` function and `prepareCache` function.
-Official Runtimes are published to [npmjs.com](https://npmjs.com) as a package and referenced in the `use` property of the `vercel.json` configuration file.
-However, the `use` property will work with any [npm install argument](https://docs.npmjs.com/cli/install) such as a git repo url which is useful for testing your Runtime.
+A Runtime is an npm module that implements the following interface:
+
+```typescript
+interface Runtime {
+  version: number;
+  build: (options: BuildOptions) => Promise<BuildResult>;
+  analyze?: (options: AnalyzeOptions) => Promise<string>;
+  prepareCache?: (options: PrepareCacheOptions) => Promise<CacheOutputs>;
+  shouldServe?: (options: ShouldServeOptions) => Promise<boolean>;
+  startDevServer?: (
+    options: StartDevServerOptions
+  ) => Promise<StartDevServerResult>;
+}
+```
+
+The `version` property and the `build()` function are the only _required_ fields.
+The rest are optional extensions that a Runtime _may_ implement in order to
+enhance functionality. These functions are documented in more detail below.
+
+Official Runtimes are published to [the npm registry](https://npmjs.com) as a package and referenced in the `use` property of the `vercel.json` configuration file.
+
+> **Note:** The `use` property in the `builds` array will work with any [npm
+> install argument](https://docs.npmjs.com/cli/install) such as a git repo URL,
+> which is useful for testing your Runtime. Alternatively, the `functions` property
+> requires that you specify a specifc tag published to npm, for stability purposes.
 
 See the [Runtimes Documentation](https://vercel.com/docs/runtimes) to view example usage.
 
@@ -16,146 +39,170 @@ A **required** exported constant that decides which version of the Runtime API t
 
 The latest and suggested version is `3`.
 
-### `analyze`
+**Example:**
 
-An **optional** exported function that returns a unique fingerprint used for the purpose of [build de-duplication](https://vercel.com/docs/v2/platform/deployments#deduplication). If the `analyze` function is not supplied, a random fingerprint is assigned to each build.
-
-```js
-export analyze({
-  files: Files,
-  entrypoint: String,
-  workPath: String,
-  config: Object
-}) : String fingerprint
+```typescript
+export const version = 3;
 ```
 
-If you are using TypeScript, you should use the following types:
+### `build()`
 
-```ts
-import { AnalyzeOptions } from '@vercel/build-utils'
+A **required** exported function that returns a Serverless Function.
 
-export analyze(options: AnalyzeOptions) {
-  return 'fingerprint goes here'
+> What's a Serverless Function? Read about [Serverless Functions](https://vercel.com/docs/v2/serverless-functions/introduction) to learn more.
+
+**Example:**
+
+```typescript
+import { BuildOptions, createLambda } from '@vercel/build-utils';
+
+export async function build(options: BuildOptions) {
+  // Build the code here…
+
+  const lambda = createLambda(/* … */);
+  return {
+    output: lambda,
+    watch: [
+      // Dependent files to trigger a rebuild in `vercel dev` go here…
+    ],
+    routes: [
+      // If your Runtime needs to define additional routing, define it here…
+    ],
+  };
 }
 ```
 
-### `build`
+### `analyze()`
 
-A **required** exported function that returns a [Serverless Function](#serverless-function).
+An **optional** exported function that returns a unique fingerprint used for the
+purpose of [build
+de-duplication](https://vercel.com/docs/v2/platform/deployments#deduplication).
+If the `analyze()` function is not supplied, then a random fingerprint is
+assigned to each build.
 
-What's a Serverless Function? Read about [Serverless Functions](https://vercel.com/docs/v2/serverless-functions/introduction) to learn more.
+**Example:**
 
-```js
-build({
-  files: Files,
-  entrypoint: String,
-  workPath: String,
-  config: Object,
-  meta?: {
-    isDev?: Boolean,
-    requestPath?: String,
-    filesChanged?: Array<String>,
-    filesRemoved?: Array<String>
-  }
-}) : {
-  watch?: Array<String>,
-  output: Lambda,
-  routes?: Object
+```typescript
+import { AnalyzeOptions } from '@vercel/build-utils';
+
+export async function analyze(options: AnalyzeOptions) {
+  // Do calculations to generate a fingerprint based off the source code here…
+
+  return 'fingerprint goes here';
 }
 ```
 
-If you are using TypeScript, you should use the following types:
+### `prepareCache()`
 
-```ts
-import { BuildOptions } from '@vercel/build-utils'
+An **optional** exported function that is executed after [`build()`](#build) is
+completed. The implementation should return an object of `File`s that will be
+pre-populated in the working directory for the next build run in the user's
+project. An example use-case is that `@vercel/node` uses this function to cache
+the `node_modules` directory, making it faster to install npm dependencies for
+future builds.
 
-export build(options: BuildOptions) {
-  // Build the code here
+**Example:**
+
+```typescript
+import { PrepareCacheOptions } from '@vercel/build-utils';
+
+export async function prepareCache(options: PrepareCacheOptions) {
+  // Create a mapping of file names and `File` object instances to cache here…
 
   return {
-    output: {
-      'path-to-file': File,
-      'path-to-lambda': Lambda
-    },
-    watch: [],
-    routes: {}
-  }
+    'path-to-file': File,
+  };
 }
 ```
 
-### `prepareCache`
+### `shouldServe()`
 
-An **optional** exported function that is equivalent to [`build`](#build), but it executes the instructions necessary to prepare a cache for the next run.
+An **optional** exported function that is only used by `vercel dev` in [Vercel
+CLI](https://vercel.com/download) and indicates whether a
+[Runtime](https://vercel.com/docs/runtimes) wants to be responsible for responding
+to a certain request path.
 
-```js
-prepareCache({
-  files: Files,
-  entrypoint: String,
-  workPath: String,
-  cachePath: String,
-  config: Object
-}) : Files cacheOutput
-```
+**Example:**
 
-If you are using TypeScript, you can import the types for each of these functions by using the following:
+```typescript
+import { ShouldServeOptions } from '@vercel/build-utils';
 
-```ts
-import { PrepareCacheOptions } from '@vercel/build-utils'
+export async function shouldServe(options: ShouldServeOptions) {
+  // Determine whether or not the Runtime should respond to the request path here…
 
-export prepareCache(options: PrepareCacheOptions) {
-  return { 'path-to-file': File }
+  return options.requestPath === options.entrypoint;
 }
 ```
 
-### `shouldServe`
+If this function is not defined, Vercel CLI will use the [default implementation](https://github.com/vercel/vercel/blob/52994bfe26c5f4f179bdb49783ee57ce19334631/packages/now-build-utils/src/should-serve.ts).
 
-An **optional** exported function that is only used by `vercel dev` in [Vercel CLI](https:///download) and indicates whether a [Runtime](https://vercel.com/docs/runtimes) wants to be responsible for building a certain request path.
+### `startDevServer()`
 
-```js
-shouldServe({
-  entrypoint: String,
-  files: Files,
-  config: Object,
-  requestPath: String,
-  workPath: String
-}) : Boolean
-```
+An **optional** exported function that is only used by `vercel dev` in [Vercel
+CLI](https://vercel.com/download). If this function is defined, Vercel CLI will
+**not** invoke the `build()` function, and instead invoke this function for every
+HTTP request. It is an opportunity to provide an optimized development experience
+rather than going through the entire `build()` process that is used in production.
 
-If you are using TypeScript, you can import the types for each of these functions by using the following:
+This function is invoked _once per HTTP request_ and is expected to spawn a child
+process which creates an HTTP server that will execute the entrypoint code when
+an HTTP request is received. This child process is _single-serve_ (only used for
+a single HTTP request). After the HTTP response is complete, `vercel dev` sends
+a shut down signal to the child process.
 
-```ts
-import { ShouldServeOptions } from '@vercel/build-utils'
+The `startDevServer()` function returns an object with the `port` number that the
+child process' HTTP server is listening on (which should be an [ephemeral
+port](https://stackoverflow.com/a/28050404/376773)) as well as the child process'
+Process ID, which `vercel dev` uses to send the shut down signal to.
 
-export shouldServe(options: ShouldServeOptions) {
-  return Boolean
+> **Hint:** To determine which ephemeral port the child process is listening on,
+> some form of [IPC](https://en.wikipedia.org/wiki/Inter-process_communication) is
+> required. For example, in `@vercel/go` the child process writes the port number
+> to [_file descriptor 3_](https://en.wikipedia.org/wiki/File_descriptor), which is read by the `startDevServer()` function
+> implementation.
+
+It may also return `null` to opt-out of this behavior for a particular request
+path or entrypoint.
+
+**Example:**
+
+```typescript
+import { spawn } from 'child_process';
+import { StartDevServerOptions } from '@vercel/build-utils';
+
+export async function startDevServer(options: StartDevServerOptions) {
+  // Create a child process which will create an HTTP server.
+  //
+  // Note: `my-runtime-dev-server` is an example dev server program name.
+  // Your implementation will spawn a different program specific to your runtime.
+  const child = spawn('my-runtime-dev-server', [options.entrypoint], {
+    stdio: ['ignore', 'inherit', 'inherit', 'pipe'],
+  });
+
+  // In this example, the child process will write the port number to FD 3…
+  const portPipe = child.stdio[3];
+  const childPort = await new Promise(resolve => {
+    portPipe.setEncoding('utf8');
+    portPipe.once('data', data => {
+      resolve(Number(data));
+    });
+  });
+
+  return { pid: child.pid, port: childPort };
 }
 ```
 
-If this method is not defined, Vercel CLI will default to [this function](https://github.com/vercel/vercel/blob/52994bfe26c5f4f179bdb49783ee57ce19334631/packages/now-build-utils/src/should-serve.ts).
-
-### Runtime Options
-
-The exported functions [`analyze`](#analyze), [`build`](#build), and [`prepareCache`](#preparecache) receive one argument with the following properties.
-
-**Properties:**
-
-- `files`: All source files of the project as a [Files](#files) data structure.
-- `entrypoint`: Name of entrypoint file for this particular build job. Value `files[entrypoint]` is guaranteed to exist and be a valid [File](#files) reference. `entrypoint` is always a discrete file and never a glob, since globs are expanded into separate builds at deployment time.
-- `workPath`: A writable temporary directory where you are encouraged to perform your build process. This directory will be populated with the restored cache from the previous run (if any) for [`analyze`](#analyze) and [`build`](#build).
-- `cachePath`: A writable temporary directory where you can build a cache for the next run. This is only passed to `prepareCache`.
-- `config`: An arbitrary object passed from by the user in the [Build definition](#defining-the-build-step) in `vercel.json`.
-
-## Examples
-
-Check out our [Node.js Runtime](https://github.com/vercel/vercel/tree/master/packages/now-node), [Go Runtime](https://github.com/vercel/vercel/tree/master/packages/now-go), [Python Runtime](https://github.com/vercel/vercel/tree/master/packages/now-python) or [Ruby Runtime](https://github.com/vercel/vercel/tree/master/packages/now-ruby) for examples of how to build one.
-
-## Technical Details
-
 ### Execution Context
 
-A [Serverless Function](https://vercel.com/docs/v2/serverless-functions/introduction) is created where the Runtime logic is executed. The lambda is run using the Node.js 8 runtime. A brand new sandbox is created for each deployment, for security reasons. The sandbox is cleaned up between executions to ensure no lingering temporary files are shared from build to build.
+- Runtimes are executed in a Linux container that closely matches the Servereless Function runtime environment.
+- The Runtime code is executed using Node.js version **12.x**.
+- A brand new sandbox is created for each deployment, for security reasons.
+- The sandbox is cleaned up between executions to ensure no lingering temporary files are shared from build to build.
 
-All the APIs you export ([`analyze`](#analyze), [`build`](#build) and [`prepareCache`](#preparecache)) are not guaranteed to be run in the same process, but the filesystem we expose (e.g.: `workPath` and the results of calling [`getWriteableDirectory`](#getWriteableDirectory) ) is retained.
+All the APIs you export ([`analyze()`](#analyze), [`build()`](#build),
+[`prepareCache()`](#preparecache), etc.) are not guaranteed to be run in the
+same process, but the filesystem we expose (e.g.: `workPath` and the results
+of calling [`getWritableDirectory`](#getWritableDirectory) ) is retained.
 
 If you need to share state between those steps, use the filesystem.
 
@@ -173,11 +220,11 @@ The env and secrets specified by the user as `build.env` are passed to the Runti
 
 When you publish your Runtime to npm, make sure to not specify `@vercel/build-utils` (as seen below in the API definitions) as a dependency, but rather as part of `peerDependencies`.
 
-## Types
+## `@vercel/build-utils` Types
 
 ### `Files`
 
-```ts
+```typescript
 import { File } from '@vercel/build-utils';
 type Files = { [filePath: string]: File };
 ```
@@ -188,7 +235,7 @@ When used as an input, the `Files` object will only contain `FileRefs`. When `Fi
 
 An example of a valid output `Files` object is:
 
-```json
+```javascript
 {
   "index.html": FileRef,
   "api/index.js": Lambda
@@ -199,7 +246,7 @@ An example of a valid output `Files` object is:
 
 This is an abstract type that can be imported if you are using TypeScript.
 
-```ts
+```typescript
 import { File } from '@vercel/build-utils';
 ```
 
@@ -211,71 +258,71 @@ Valid `File` types include:
 
 ### `FileRef`
 
-```ts
+```typescript
 import { FileRef } from '@vercel/build-utils';
 ```
 
-This is a [JavaScript class](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes) that represents an abstract file instance stored in our platform, based on the file identifier string (its checksum). When a `Files` object is passed as an input to `analyze` or `build`, all its values will be instances of `FileRef`.
+This is a [class](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes) that represents an abstract file instance stored in our platform, based on the file identifier string (its checksum). When a `Files` object is passed as an input to `analyze` or `build`, all its values will be instances of `FileRef`.
 
 **Properties:**
 
-- `mode : Number` file mode
-- `digest : String` a checksum that represents the file
+- `mode: Number` file mode
+- `digest: String` a checksum that represents the file
 
 **Methods:**
 
-- `toStream() : Stream` creates a [Stream](https://nodejs.org/api/stream.html) of the file body
+- `toStream(): Stream` creates a [Stream](https://nodejs.org/api/stream.html) of the file body
 
 ### `FileFsRef`
 
-```ts
+```typescript
 import { FileFsRef } from '@vercel/build-utils';
 ```
 
-This is a [JavaScript class](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes) that represents an abstract instance of a file present in the filesystem that the build process is executing in.
+This is a [class](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes) that represents an abstract instance of a file present in the filesystem that the build process is executing in.
 
 **Properties:**
 
-- `mode : Number` file mode
-- `fsPath : String` the absolute path of the file in file system
+- `mode: Number` file mode
+- `fsPath: String` the absolute path of the file in file system
 
 **Methods:**
 
-- `static async fromStream({ mode : Number, stream : Stream, fsPath : String }) : FileFsRef` creates an instance of a [FileFsRef](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object) from `Stream`, placing file at `fsPath` with `mode`
-- `toStream() : Stream` creates a [Stream](https://nodejs.org/api/stream.html) of the file body
+- `static async fromStream({ mode: Number, stream: Stream, fsPath: String }): FileFsRef` creates an instance of a [FileFsRef](#FileFsRef) from `Stream`, placing file at `fsPath` with `mode`
+- `toStream(): Stream` creates a [Stream](https://nodejs.org/api/stream.html) of the file body
 
 ### `FileBlob`
 
-```ts
+```typescript
 import { FileBlob } from '@vercel/build-utils';
 ```
 
-This is a [JavaScript class](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes) that represents an abstract instance of a file present in memory.
+This is a [class](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes) that represents an abstract instance of a file present in memory.
 
 **Properties:**
 
-- `mode : Number` file mode
-- `data : String | Buffer` the body of the file
+- `mode: Number` file mode
+- `data: String | Buffer` the body of the file
 
 **Methods:**
 
-- `static async fromStream({ mode : Number, stream : Stream }) :FileBlob` creates an instance of a [FileBlob](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object) from [`Stream`](https://nodejs.org/api/stream.html) with `mode`
-- `toStream() : Stream` creates a [Stream](https://nodejs.org/api/stream.html) of the file body
+- `static async fromStream({ mode: Number, stream: Stream }): FileBlob` creates an instance of a [FileBlob](#FileBlob) from [`Stream`](https://nodejs.org/api/stream.html) with `mode`
+- `toStream(): Stream` creates a [Stream](https://nodejs.org/api/stream.html) of the file body
 
 ### `Lambda`
 
-```ts
+```typescript
 import { Lambda } from '@vercel/build-utils';
 ```
 
-This is a [JavaScript class](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes), called a Serverless Function, that can be created by supplying `files`, `handler`, `runtime`, and `environment` as an object to the [`createLambda`](#createlambda) helper. The instances of this class should not be created directly. Instead, invoke the [`createLambda`](#createlambda) helper function.
+This is a [class](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes) that represents a Serverless Function. An instance can be created by supplying `files`, `handler`, `runtime`, and `environment` as an object to the [`createLambda`](#createlambda) helper. The instances of this class should not be created directly. Instead, invoke the [`createLambda`](#createlambda) helper function.
 
 **Properties:**
 
-- `files : Files` the internal filesystem of the lambda
-- `handler : String` path to handler file and (optionally) a function name it exports
-- `runtime : LambdaRuntime` the name of the lambda runtime
-- `environment : Object` key-value map of handler-related (aside of those passed by user) environment variables
+- `files: Files` the internal filesystem of the lambda
+- `handler: String` path to handler file and (optionally) a function name it exports
+- `runtime: LambdaRuntime` the name of the lambda runtime
+- `environment: Object` key-value map of handler-related (aside of those passed by user) environment variables
 
 ### `LambdaRuntime`
 
@@ -291,15 +338,15 @@ This is an abstract enumeration type that is implemented by one of the following
 - `ruby2.5`
 - `provided`
 
-## JavaScript API
+## `@vercel/build-utils` Helper Functions
 
 The following is exposed by `@vercel/build-utils` to simplify the process of writing Runtimes, manipulating the file system, using the above types, etc.
 
-### `createLambda`
+### `createLambda()`
 
-Signature: `createLambda(Object spec) : Lambda`
+Signature: `createLambda(Object spec): Lambda`
 
-```ts
+```typescript
 import { createLambda } from '@vercel/build-utils';
 ```
 
@@ -316,29 +363,33 @@ await createLambda({
 });
 ```
 
-### `download`
+### `download()`
 
-Signature: `download() : Files`
+Signature: `download(): Files`
 
-```ts
+```typescript
 import { download } from '@vercel/build-utils';
 ```
 
-This utility allows you to download the contents of a [`Files`](#files) data structure, therefore creating the filesystem represented in it.
+This utility allows you to download the contents of a [`Files`](#files) data
+structure, therefore creating the filesystem represented in it.
 
-Since `Files` is an abstract way of representing files, you can think of `download` as a way of making that virtual filesystem _real_.
+Since `Files` is an abstract way of representing files, you can think of
+`download()` as a way of making that virtual filesystem _real_.
 
-If the **optional** `meta` property is passed (the argument for [build](#build)), only the files that have changed are downloaded. This is decided using `filesRemoved` and `filesChanged` inside that object.
+If the **optional** `meta` property is passed (the argument for
+[`build()`](#build)), only the files that have changed are downloaded.
+This is decided using `filesRemoved` and `filesChanged` inside that object.
 
 ```js
 await download(files, workPath, meta);
 ```
 
-### `glob`
+### `glob()`
 
-Signature: `glob() : Files`
+Signature: `glob(): Files`
 
-```ts
+```typescript
 import { glob } from '@vercel/build-utils';
 ```
 
@@ -355,21 +406,21 @@ exports.build = ({ files, workPath }) => {
 }
 ```
 
-### `getWriteableDirectory`
+### `getWritableDirectory()`
 
-Signature: `getWriteableDirectory() : String`
+Signature: `getWritableDirectory(): String`
 
-```ts
-import { getWriteableDirectory } from '@vercel/build-utils';
+```typescript
+import { getWritableDirectory } from '@vercel/build-utils';
 ```
 
 In some occasions, you might want to write to a temporary directory.
 
-### `rename`
+### `rename()`
 
-Signature: `rename(Files) : Files`
+Signature: `rename(Files, Function): Files`
 
-```ts
+```typescript
 import { rename } from '@vercel/build-utils';
 ```
 

api/_lib/util/with-api-handler.ts

@@ -1,4 +1,4 @@
-import { NowRequest, NowResponse } from '@now/node';
+import { NowRequest, NowResponse } from '@vercel/node';
 import { errorHandler } from './error-handler';
 
 type Handler = (req: NowRequest, res: NowResponse) => Promise<any>;

api/examples/download/[segment].ts

@@ -2,7 +2,7 @@ import fs from 'fs';
 // @ts-ignore
 import tar from 'tar-fs';
 import { extract } from '../../_lib/examples/extract';
-import { NowRequest, NowResponse } from '@now/node';
+import { NowRequest, NowResponse } from '@vercel/node';
 import { withApiHandler } from '../../_lib/util/with-api-handler';
 
 const TMP_DIR = '/tmp';
@@ -15,8 +15,8 @@ function notFound(res: NowResponse, message: string) {
   return res.status(404).send({
     error: {
       code: 'not_found',
-      message
-    }
+      message,
+    },
   });
 }
 
@@ -35,7 +35,10 @@ function streamToBuffer(stream: any) {
   });
 }
 
-export default withApiHandler(async function(req: NowRequest, res: NowResponse) {
+export default withApiHandler(async function (
+  req: NowRequest,
+  res: NowResponse
+) {
   const ext = '.tar.gz';
   const { segment = '' } = req.query;
 

api/examples/info.ts

@@ -3,12 +3,12 @@
 
 // @ts-ignore
 import parseGitUrl from 'parse-github-url';
-import { NowRequest, NowResponse } from '@now/node';
+import { NowRequest, NowResponse } from '@vercel/node';
 import { withApiHandler } from '../_lib/util/with-api-handler';
 import { getGitHubRepoInfo } from '../_lib/examples/github-repo-info';
 import { getGitLabRepoInfo } from '../_lib/examples/gitlab-repo-info';
 
-export default withApiHandler(async function(
+export default withApiHandler(async function (
   req: NowRequest,
   res: NowResponse
 ) {

api/examples/list-all.ts

@@ -1,8 +1,8 @@
-import { NowRequest, NowResponse } from '@now/node';
+import { NowRequest, NowResponse } from '@vercel/node';
 import { getExampleList } from '../_lib/examples/example-list';
 import { withApiHandler } from '../_lib/util/with-api-handler';
 
-export default withApiHandler(async function(
+export default withApiHandler(async function (
   req: NowRequest,
   res: NowResponse
 ) {

api/examples/list.ts

@@ -1,10 +1,10 @@
 import { extract } from '../_lib/examples/extract';
 import { summary } from '../_lib/examples/summary';
-import { NowRequest, NowResponse } from '@now/node';
+import { NowRequest, NowResponse } from '@vercel/node';
 import { mapOldToNew } from '../_lib/examples/map-old-to-new';
 import { withApiHandler } from '../_lib/util/with-api-handler';
 
-export default withApiHandler(async function(
+export default withApiHandler(async function (
   req: NowRequest,
   res: NowResponse
 ) {

api/frameworks.ts

@@ -1,21 +1,27 @@
-import { NowRequest, NowResponse } from '@now/node';
+import { NowRequest, NowResponse } from '@vercel/node';
 import { withApiHandler } from './_lib/util/with-api-handler';
-import frameworkList, { Framework } from '../packages/frameworks';
+import _frameworks, { Framework } from '../packages/frameworks';
 
-const frameworks = (frameworkList as Framework[]).map(frameworkItem => {
-  const framework = {
-    ...frameworkItem,
-    detectors: undefined,
-  };
+const frameworks = (_frameworks as Framework[])
+  .sort(
+    (a, b) =>
+      (a.sort || Number.MAX_SAFE_INTEGER) - (b.sort || Number.MAX_SAFE_INTEGER)
+  )
+  .map(frameworkItem => {
+    const framework = {
+      ...frameworkItem,
+      detectors: undefined,
+      sort: undefined,
+    };
 
-  if (framework.logo) {
-    framework.logo = `https://res.cloudinary.com/zeit-inc/image/fetch/${framework.logo}`;
-  }
+    if (framework.logo) {
+      framework.logo = `https://res.cloudinary.com/zeit-inc/image/fetch/${framework.logo}`;
+    }
 
-  return framework;
-});
+    return framework;
+  });
 
-export default withApiHandler(async function(
+export default withApiHandler(async function (
   req: NowRequest,
   res: NowResponse
 ) {

api/package.json

@@ -13,12 +13,12 @@
     "node-fetch": "2.6.0",
     "parse-github-url": "1.0.2",
     "tar-fs": "2.0.0",
-    "typescript": "3.7.4",
     "unzip-stream": "0.3.0"
   },
   "devDependencies": {
-    "@now/node": "1.3.3",
     "@types/node": "13.1.4",
-    "@types/node-fetch": "2.5.4"
+    "@types/node-fetch": "2.5.4",
+    "@vercel/node": "1.7.2",
+    "typescript": "3.9.6"
   }
 }

api/yarn.lock

@@ -2,13 +2,6 @@
 # yarn lockfile v1
 
 
-"@now/node@1.3.3":
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/@now/node/-/node-1.3.3.tgz#5407cb6a730d4dd9b6b6b0bc4a316f29086c9feb"
-  integrity sha512-s1qajtQttWhhSs1k6FX0/6eTFYFUplzultrQeKfOPMoYzzz6OxDq5qrQ3elpsGlZlDVmO+x+JOJ7yad+3yBgpg==
-  dependencies:
-    "@types/node" "*"
-
 "@sentry/apm@5.11.1":
   version "5.11.1"
   resolved "https://registry.yarnpkg.com/@sentry/apm/-/apm-5.11.1.tgz#cc89fa4150056fbf009f92eca94fccc3980db34e"
@@ -141,11 +134,25 @@
   dependencies:
     "@types/node" "*"
 
+"@vercel/node@1.7.2":
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/@vercel/node/-/node-1.7.2.tgz#85cb8aac661c02dfef6fe752740f5b162e90767b"
+  integrity sha512-XV5lrLC+K/cxsaFj8H2OoGu1zliOqnxcrOnPInI8HmQjR/Tztt+0nzgpt+7sx8wXcrib0Nu7lK303jP7VjSETw==
+  dependencies:
+    "@types/node" "*"
+    ts-node "8.9.1"
+    typescript "3.9.3"
+
 agent-base@5:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
   integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==
 
+arg@^4.1.0:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
+
 binary@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79"
@@ -161,6 +168,11 @@ bl@^3.0.0:
   dependencies:
     readable-stream "^3.0.1"
 
+buffer-from@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+
 buffers@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"
@@ -229,6 +241,11 @@ defer-to-connect@^1.1.1:
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.1.tgz#88ae694b93f67b81815a2c8c769aef6574ac8f2f"
   integrity sha512-J7thop4u3mRTkYRQ+Vpfwy2G5Ehoy82I14+14W4YMDLKdWloI9gSzRbV30s/NckQGVJtPkWNcW4oMAUigTdqiQ==
 
+diff@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
@@ -313,6 +330,11 @@ lru_map@^0.3.3:
   resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd"
   integrity sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0=
 
+make-error@^1.1.1:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
+
 mimic-response@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
@@ -396,6 +418,19 @@ safe-buffer@~5.2.0:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
   integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
 
+source-map-support@^0.5.17:
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map@^0.6.0:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -434,6 +469,17 @@ to-readable-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"
   integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=
 
+ts-node@8.9.1:
+  version "8.9.1"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.9.1.tgz#2f857f46c47e91dcd28a14e052482eb14cfd65a5"
+  integrity sha512-yrq6ODsxEFTLz0R3BX2myf0WBCSQh9A+py8PBo1dCzWIOcvisbyH6akNKqDHMgXePF2kir5mm5JXJTH3OUJYOQ==
+  dependencies:
+    arg "^4.1.0"
+    diff "^4.0.1"
+    make-error "^1.1.1"
+    source-map-support "^0.5.17"
+    yn "3.1.1"
+
 tslib@^1.9.3:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
@@ -444,10 +490,15 @@ type-fest@^0.8.0:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
-typescript@3.7.4:
-  version "3.7.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.4.tgz#1743a5ec5fef6a1fa9f3e4708e33c81c73876c19"
-  integrity sha512-A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw==
+typescript@3.9.3:
+  version "3.9.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.3.tgz#d3ac8883a97c26139e42df5e93eeece33d610b8a"
+  integrity sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==
+
+typescript@3.9.6:
+  version "3.9.6"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.6.tgz#8f3e0198a34c3ae17091b35571d3afd31999365a"
+  integrity sha512-Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw==
 
 unzip-stream@0.3.0:
   version "0.3.0"
@@ -466,3 +517,8 @@ wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+yn@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==

examples/blitzjs/.babelrc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  presets: ["next/babel"],
+  plugins: [],
+}

examples/blitzjs/.eslintrc.js

@@ -0,0 +1,10 @@
+module.exports = {
+  extends: ["react-app", "plugin:jsx-a11y/recommended"],
+  plugins: ["jsx-a11y"],
+  rules: {
+    "import/no-anonymous-default-export": "error",
+    "import/no-webpack-loader-syntax": "off",
+    "react/react-in-jsx-scope": "off", // React is always in scope with Blitz
+    "jsx-a11y/anchor-is-valid": "off", //Doesn't play well with Blitz/Next <Link> usage
+  },
+}

examples/blitzjs/.gitignore

@@ -0,0 +1,56 @@
+# dependencies
+node_modules
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.pnp.*
+.npm
+web_modules/
+
+# blitz
+/.blitz/
+/.next/
+*.sqlite
+.now
+.vercel
+.blitz-console-history
+blitz-log.log
+
+# misc
+.DS_Store
+
+# local env files
+.env
+.envrc
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+# Logs
+logs
+*.log
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Testing
+coverage
+*.lcov
+.nyc_output
+lib-cov
+
+# Caches
+*.tsbuildinfo
+.eslintcache
+.node_repl_history
+.yarn-integrity
+
+# Serverless directories
+.serverless/
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test

examples/blitzjs/.npmrc

@@ -0,0 +1 @@
+save-exact=true

examples/blitzjs/.prettierignore

@@ -0,0 +1,6 @@
+.gitkeep
+.env
+*.ico
+*.lock
+db/migrations
+

examples/blitzjs/README.md

@@ -0,0 +1,21 @@
+![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`.
+
+## Getting Started
+
+First, run the development server:
+
+```bash
+npx blitz start
+```
+
+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/blitzjs/app/components/ErrorBoundary.tsx

@@ -0,0 +1,21 @@
+import React from "react"
+
+export default class ErrorBoundary extends React.Component<{
+  fallback: (error: any) => React.ReactNode
+}> {
+  state = { hasError: false, error: null }
+
+  static getDerivedStateFromError(error: any) {
+    return {
+      hasError: true,
+      error,
+    }
+  }
+
+  render() {
+    if (this.state.hasError) {
+      return this.props.fallback(this.state.error)
+    }
+    return this.props.children
+  }
+}

examples/blitzjs/app/pages/_app.tsx

@@ -0,0 +1,5 @@
+import { AppProps } from "blitz"
+
+export default function MyApp({ Component, pageProps }: AppProps) {
+  return <Component {...pageProps} />
+}

examples/blitzjs/app/pages/_document.tsx

@@ -0,0 +1,23 @@
+import { Document, Html, DocumentHead, Main, BlitzScript /*DocumentContext*/ } from "blitz"
+
+class MyDocument extends Document {
+  // Only uncomment if you need to customize this behaviour
+  // static async getInitialProps(ctx: DocumentContext) {
+  //   const initialProps = await Document.getInitialProps(ctx)
+  //   return {...initialProps}
+  // }
+
+  render() {
+    return (
+      <Html lang="en">
+        <DocumentHead />
+        <body>
+          <Main />
+          <BlitzScript />
+        </body>
+      </Html>
+    )
+  }
+}
+
+export default MyDocument

examples/blitzjs/app/pages/index.tsx

@@ -0,0 +1,197 @@
+import { Head, Link } from "blitz"
+
+const Home = () => (
+  <div className="container">
+    <Head>
+      <title>blitzjs</title>
+      <link rel="icon" href="/favicon.ico" />
+    </Head>
+
+    <main>
+      <div className="logo">
+        <img src="/logo.png" alt="blitz.js" />
+      </div>
+      <p>1. Run this command in your terminal:</p>
+      <pre>
+        <code>blitz generate all project name:string</code>
+      </pre>
+      <p>2. Then run this command:</p>
+      <pre>
+        <code>blitz db migrate</code>
+      </pre>
+
+      <p>
+        3. Go to{" "}
+        <Link href="/projects">
+          <a>/projects</a>
+        </Link>
+      </p>
+      <div className="buttons">
+        <a
+          className="button"
+          href="https://github.com/blitz-js/blitz/blob/master/USER_GUIDE.md?utm_source=blitz-new&utm_medium=app-template&utm_campaign=blitz-new"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          Documentation
+        </a>
+        <a
+          className="button-outline"
+          href="https://github.com/blitz-js/blitz"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          Github Repo
+        </a>
+        <a
+          className="button-outline"
+          href="https://slack.blitzjs.com"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          Slack Community
+        </a>
+      </div>
+    </main>
+
+    <footer>
+      <a
+        href="https://blitzjs.com?utm_source=blitz-new&utm_medium=app-template&utm_campaign=blitz-new"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        Powered by Blitz.js
+      </a>
+    </footer>
+
+    <style jsx>{`
+      .container {
+        min-height: 100vh;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+      }
+
+      main {
+        padding: 5rem 0;
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+      }
+
+      main p {
+        font-size: 1.2rem;
+      }
+
+      footer {
+        width: 100%;
+        height: 60px;
+        border-top: 1px solid #eaeaea;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        background-color: #45009d;
+      }
+
+      footer a {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+
+      footer a {
+        color: #f4f4f4;
+        text-decoration: none;
+      }
+
+      .logo {
+        margin-bottom: 2rem;
+      }
+
+      .logo img {
+        width: 300px;
+      }
+
+      .buttons {
+        display: grid;
+        grid-template-columns: 1fr 1fr 1fr;
+        grid-gap: 0.5rem;
+        margin-top: 6rem;
+      }
+
+      a.button {
+        background-color: #6700eb;
+        padding: 1rem 2rem;
+        color: #f4f4f4;
+        text-align: center;
+      }
+
+      a.button:hover {
+        background-color: #45009d;
+      }
+
+      a.button-outline {
+        border: 2px solid #6700eb;
+        padding: 1rem 2rem;
+        color: #6700eb;
+        text-align: center;
+      }
+
+      a.button-outline:hover {
+        border-color: #45009d;
+        color: #45009d;
+      }
+
+      pre {
+        background: #fafafa;
+        border-radius: 5px;
+        padding: 0.75rem;
+      }
+      code {
+        font-size: 0.9rem;
+        font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono,
+          Bitstream Vera Sans Mono, Courier New, monospace;
+      }
+
+      .grid {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex-wrap: wrap;
+
+        max-width: 800px;
+        margin-top: 3rem;
+      }
+
+      @media (max-width: 600px) {
+        .grid {
+          width: 100%;
+          flex-direction: column;
+        }
+      }
+    `}</style>
+
+    <style jsx global>{`
+      @import url("https://fonts.googleapis.com/css2?family=Libre+Franklin:wght@300;700&display=swap");
+
+      html,
+      body {
+        padding: 0;
+        margin: 0;
+        font-family: "Libre Franklin", -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
+          Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
+      }
+
+      * {
+        -webkit-font-smoothing: antialiased;
+        -moz-osx-font-smoothing: grayscale;
+        box-sizing: border-box;
+      }
+    `}</style>
+  </div>
+)
+
+export default Home

examples/blitzjs/blitz.config.js

@@ -0,0 +1,15 @@
+module.exports = {
+  /*
+  webpack: (config, { buildId, dev, isServer, defaultLoaders, webpack }) => {
+    // Note: we provide webpack above so you should not `require` it
+    // Perform customizations to webpack config
+    // Important: return the modified config
+    return config
+  },
+  webpackDevMiddleware: (config) => {
+    // Perform customizations to webpack dev middleware config
+    // Important: return the modified config
+    return config
+  },
+  */
+}

examples/blitzjs/db/index.ts

@@ -0,0 +1,15 @@
+import { PrismaClient } from "@prisma/client"
+export * from "@prisma/client"
+
+let prisma: PrismaClient
+
+if (process.env.NODE_ENV === "production") {
+  prisma = new PrismaClient()
+} else {
+  // Ensure the prisma instance is re-used during hot-reloading
+  // Otherwise, a new client will be created on every reload
+  global["prisma"] = global["prisma"] || new PrismaClient()
+  prisma = global["prisma"]
+}
+
+export default prisma

examples/blitzjs/db/schema.prisma

@@ -0,0 +1,27 @@
+// This is your Prisma schema file,
+// learn more about it in the docs: https://pris.ly/d/prisma-schema
+
+datasource sqlite {
+  provider = "sqlite"
+  url      = "file:./db.sqlite"
+}
+
+// SQLite is easy to start with, but if you use Postgres in production
+// you should also use it in development with the following:
+//datasource postgresql {
+//  provider = "postgresql"
+//  url      = env("DATABASE_URL")
+//}
+
+generator client {
+  provider = "prisma-client-js"
+}
+
+
+// --------------------------------------
+
+//model Project {
+//  id        Int      @default(autoincrement()) @id
+//  name      String
+//}
+

examples/blitzjs/package.json

@@ -0,0 +1,55 @@
+{
+  "name": "blitzjs",
+  "version": "1.0.0",
+  "scripts": {
+    "start": "blitz start",
+    "studio": "blitz db studio",
+    "build": "blitz build",
+    "lint": "eslint --ignore-path .gitignore --ext .js,.ts,.tsx .",
+    "test": "echo \"No tests yet\""
+  },
+  "browserslist": [
+    "defaults"
+  ],
+  "prettier": {
+    "semi": false,
+    "printWidth": 100
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged && pretty-quick --staged",
+      "pre-push": "blitz test"
+    }
+  },
+  "lint-staged": {
+    "*.{js,ts,tsx}": [
+      "eslint --fix"
+    ]
+  },
+  "dependencies": {
+    "@prisma/cli": "latest",
+    "@prisma/client": "latest",
+    "blitz": "latest",
+    "react": "experimental",
+    "react-dom": "experimental"
+  },
+  "devDependencies": {
+    "@types/react": "16.9.36",
+    "@typescript-eslint/eslint-plugin": "2.x",
+    "@typescript-eslint/parser": "2.x",
+    "babel-eslint": "10.1.0",
+    "eslint": "6.8.0",
+    "eslint-config-react-app": "5.2.1",
+    "eslint-plugin-flowtype": "4.7.0",
+    "eslint-plugin-import": "2.21.2",
+    "eslint-plugin-jsx-a11y": "6.2.3",
+    "eslint-plugin-react": "7.20.0",
+    "eslint-plugin-react-hooks": "3.0.0",
+    "husky": "4.2.5",
+    "lint-staged": "10.2.10",
+    "prettier": "2.0.5",
+    "pretty-quick": "2.0.1",
+    "typescript": "3.9.5"
+  },
+  "private": true
+}

examples/blitzjs/tsconfig.json

@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "baseUrl": "./",
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": false,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve"
+  },
+  "exclude": ["node_modules"],
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"]
+}

package.json

@@ -20,6 +20,7 @@
     "@zeit/ncc": "0.20.4",
     "async-retry": "1.2.3",
     "buffer-replace": "1.0.0",
+    "cheerio": "1.0.0-rc.3",
     "eslint": "6.2.2",
     "eslint-config-prettier": "6.1.0",
     "eslint-plugin-jest": "23.8.2",
@@ -28,7 +29,7 @@
     "lint-staged": "9.2.5",
     "node-fetch": "2.6.0",
     "npm-package-arg": "6.1.0",
-    "prettier": "1.18.2"
+    "prettier": "2.0.5"
   },
   "scripts": {
     "lerna": "lerna",
@@ -63,7 +64,8 @@
   },
   "prettier": {
     "trailingComma": "es5",
-    "singleQuote": true
+    "singleQuote": true,
+    "arrowParens": "avoid"
   },
   "eslintConfig": {
     "root": true,

packages/frameworks/frameworks.json

@@ -1,12 +1,41 @@
 [
+  {
+    "name": "Blitz.js",
+    "slug": "blitzjs",
+    "demo": "https://blitzjs.now-examples.now.sh",
+    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/blitz.svg",
+    "tagline": "Blitz.js: The Fullstack React Framework",
+    "description": "A brand new Blitz.js app - the result of running `npx blitz new`.",
+    "website": "https://blitzjs.com",
+    "detectors": {
+      "every": [
+        {
+          "path": "package.json",
+          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"blitz\":\\s*\".+?\"[^}]*}"
+        }
+      ]
+    },
+    "settings": {
+      "buildCommand": {
+        "placeholder": "`npm run build` or `blitz build`"
+      },
+      "devCommand": {
+        "value": "blitz start"
+      },
+      "outputDirectory": {
+        "placeholder": "Next.js default"
+      }
+    }
+  },
   {
     "name": "Next.js",
     "slug": "nextjs",
     "demo": "https://nextjs.now-examples.now.sh",
     "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/next.svg",
-    "tagline": "Next.js makes you productive with React instantly — whether you want to build static or dynamic sites. ",
+    "tagline": "Next.js makes you productive with React instantly — whether you want to build static or dynamic sites.",
     "description": "A Next.js app and a Serverless Function API.",
     "website": "https://nextjs.org",
+    "sort": 1,
     "detectors": {
       "every": [
         {
@@ -35,6 +64,7 @@
     "tagline": "Gatsby helps developers build blazing fast websites and apps with React.",
     "description": "A Gatsby app, using the default starter theme and a Serverless Function API.",
     "website": "https://gatsbyjs.org",
+    "sort": 2,
     "detectors": {
       "every": [
         {
@@ -62,7 +92,8 @@
     "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/hexo.svg",
     "tagline": "Hexo is a fast, simple & powerful blog framework powered by Node.js.",
     "description": "A Hexo site, created with the Hexo CLI.",
-    "website": "https://hexo.io/",
+    "website": "https://hexo.io",
+    "sort": 3,
     "detectors": {
       "every": [
         {
@@ -90,7 +121,8 @@
     "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/eleventy.svg",
     "tagline": "11ty is a simpler static site generator written in JavaScript, created to be an alternative to Jekyll.",
     "description": "An Eleventy site, created with npm init.",
-    "website": "https://www.11ty.dev/",
+    "website": "https://www.11ty.dev",
+    "sort": 4,
     "detectors": {
       "every": [
         {
@@ -634,13 +666,13 @@
       "every": [
         {
           "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"nuxt\":\\s*\".+?\"[^}]*}"
+          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"nuxt(-edge)?\":\\s*\".+?\"[^}]*}"
         }
       ]
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`npm run build` or `nuxt build`"
+        "placeholder": "`npm run build` or `nuxt generate`"
       },
       "devCommand": {
         "value": "nuxt"
@@ -658,6 +690,7 @@
     "tagline": "Hugo is the world’s fastest framework for building websites, written in Go.",
     "description": "A Hugo site, created with the Hugo CLI.",
     "website": "https://gohugo.io",
+    "sort": 5,
     "detectors": {
       "some": [
         {

packages/frameworks/index.d.ts

@@ -19,6 +19,7 @@ export interface Framework {
   tagline?: string;
   website?: string;
   description: string;
+  sort?: number;
   detectors?: {
     every?: FrameworkDetectionItem[];
     some?: FrameworkDetectionItem[];

packages/frameworks/logos/blitz.svg

@@ -0,0 +1,30 @@
+<svg width="500" height="500" viewBox="0 0 500 500" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M95.4242 249.857H173.991C203.89 249.857 232.049 263.909 250.026 287.799L327.526 390.789C328.991 392.736 329.212 395.349 328.095 397.513L283.421 484.069C281.278 488.221 275.532 488.71 272.719 484.978L95.4242 249.857Z" fill="url(#paint0_linear)"/>
+<g filter="url(#filter0_d)">
+<path d="M404.558 249.991H325.991C296.093 249.991 267.933 235.939 249.956 212.049L172.456 109.059C170.991 107.112 170.771 104.499 171.888 102.335L216.561 15.7794C218.705 11.6267 224.45 11.1382 227.264 14.8695L404.558 249.991Z" fill="url(#paint1_linear)"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_d" x="71.1812" y="-39.6553" width="433.377" height="437.646" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="48"/>
+<feGaussianBlur stdDeviation="50"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.270588 0 0 0 0 0 0 0 0 0 0.615686 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear" x1="163.936" y1="392.775" x2="316.429" y2="155.244" gradientUnits="userSpaceOnUse">
+<stop stop-color="#6700EB"/>
+<stop offset="1" stop-color="#45009D"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="336.047" y1="107.073" x2="183.554" y2="344.604" gradientUnits="userSpaceOnUse">
+<stop stop-color="#6700EB"/>
+<stop offset="1" stop-color="#45009D"/>
+</linearGradient>
+<clipPath id="clip0">
+<rect width="500" height="500" fill="white"/>
+</clipPath>
+</defs>
+</svg>

packages/frameworks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/frameworks",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "main": "frameworks.json",
   "license": "UNLICENSED",
   "scripts": {

packages/frameworks/test/frameworks.unit.test.ts

@@ -1,11 +1,9 @@
 import Ajv from 'ajv';
-import path from 'path';
+import { join } from 'path';
 import { existsSync } from 'fs';
+import { isString } from 'util';
 import { Framework } from '../';
-
-function isString(arg: any): arg is string {
-  return typeof arg === 'string';
-}
+const frameworkList = require('../frameworks.json') as Framework[];
 
 const SchemaFrameworkDetectionItem = {
   type: 'array',
@@ -60,6 +58,7 @@ const Schema = {
     properties: {
       name: { type: 'string' },
       slug: { type: ['string', 'null'] },
+      sort: { type: 'number' },
       logo: { type: 'string' },
       demo: { type: 'string' },
       tagline: { type: 'string' },
@@ -89,12 +88,10 @@ const Schema = {
 
 describe('frameworks', () => {
   it('ensure there is an example for every framework', async () => {
-    const root = path.join(__dirname, '..', '..', '..');
-    const getExample = (name: string) => path.join(root, 'examples', name);
+    const root = join(__dirname, '..', '..', '..');
+    const getExample = (name: string) => join(root, 'examples', name);
 
-    const frameworks = require('../frameworks.json') as Framework[];
-
-    const result = frameworks
+    const result = frameworkList
       .map(f => f.slug)
       .filter(isString)
       .filter(f => existsSync(getExample(f)) === false);
@@ -103,10 +100,8 @@ describe('frameworks', () => {
   });
 
   it('ensure schema', async () => {
-    const frameworks = require('../frameworks.json') as Framework[];
-
     const ajv = new Ajv();
-    const result = ajv.validate(Schema, frameworks);
+    const result = ajv.validate(Schema, frameworkList);
 
     if (ajv.errors) {
       console.error(ajv.errors);
@@ -116,17 +111,26 @@ describe('frameworks', () => {
   });
 
   it('ensure logo', async () => {
-    const frameworks = require('../frameworks.json') as Framework[];
-
-    const missing = frameworks
+    const missing = frameworkList
       .map(f => f.logo)
       .filter(url => {
         const prefix =
           'https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/';
         const name = url.replace(prefix, '');
-        return existsSync(path.join(__dirname, '..', 'logos', name)) === false;
+        return existsSync(join(__dirname, '..', 'logos', name)) === false;
       });
 
     expect(missing).toEqual([]);
   });
+
+  it('ensure unique sort number', async () => {
+    const sortNumToSlug = new Map<number, string | null>();
+    frameworkList.forEach(f => {
+      if (f.sort) {
+        const duplicateSlug = sortNumToSlug.get(f.sort);
+        expect(duplicateSlug).toStrictEqual(undefined);
+        sortNumToSlug.set(f.sort, f.slug);
+      }
+    });
+  });
 });

packages/now-build-utils/build.sh

@@ -1,5 +1,6 @@
-#!/bin/sh
-set -eu
+#!/bin/bash
+set -euo pipefail
+
 out="dist"
 
 rm -rf "$out"

packages/now-build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",

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

@@ -8,6 +8,8 @@ import { isOfficialRuntime } from './';
 interface ErrorResponse {
   code: string;
   message: string;
+  action?: string;
+  link?: string;
 }
 
 interface Options {
@@ -462,7 +464,7 @@ function detectFrontBuilder(
     });
   }
 
-  if (framework === 'nextjs') {
+  if (framework === 'nextjs' || framework === 'blitzjs') {
     return { src: 'package.json', use: `@vercel/next${withTag}`, config };
   }
 
@@ -496,7 +498,7 @@ function getMissingBuildScriptError() {
     code: 'missing_build_script',
     message:
       'Your `package.json` file is missing a `build` property inside the `scripts` property.' +
-      '\nMore details: https://vercel.com/docs/v2/platform/frequently-asked-questions#missing-build-script',
+      '\nLearn More: https://vercel.com/docs/v2/platform/frequently-asked-questions#missing-build-script',
   };
 }
 
@@ -608,20 +610,22 @@ function checkUnusedFunctions(
       } else {
         return {
           code: 'unused_function',
-          message: `The function for ${fnKey} can't be handled by any builder`,
+          message: `The pattern "${fnKey}" defined in \`functions\` doesn't match any Serverless Functions.`,
+          action: 'Learn More',
+          link: 'https://vercel.link/unmatched-function-pattern',
         };
       }
     }
   }
 
   if (unusedFunctions.size) {
-    const [unusedFunction] = Array.from(unusedFunctions);
+    const [fnKey] = Array.from(unusedFunctions);
 
     return {
       code: 'unused_function',
-      message:
-        `The function for ${unusedFunction} can't be handled by any builder. ` +
-        `Make sure it is inside the api/ directory.`,
+      message: `The pattern "${fnKey}" defined in \`functions\` doesn't match any Serverless Functions inside the \`api\` directory.`,
+      action: 'Learn More',
+      link: 'https://vercel.link/unmatched-function-pattern',
     };
   }
 

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

@@ -34,7 +34,82 @@ interface Props {
    */
   link?: string;
   /**
-   * Optional "action" to display before the `link`, such as "More details".
+   * Optional "action" to display before the `link`, such as "Learn More".
    */
   action?: string;
 }
+
+export function getPrettyError(obj: {
+  dataPath?: string;
+  message?: string;
+  params: any;
+}): NowBuildError {
+  const docsUrl = 'https://vercel.com/docs/configuration';
+  try {
+    const { dataPath, params, message: ajvMessage } = obj;
+    const prop = getTopLevelPropertyName(dataPath);
+    let message =
+      dataPath && dataPath.startsWith('.') ? `\`${dataPath.slice(1)}\` ` : '';
+
+    if (params && typeof params.additionalProperty === 'string') {
+      const suggestion = getSuggestion(prop, params.additionalProperty);
+      message += `should NOT have additional property \`${params.additionalProperty}\`. ${suggestion}`;
+    } else if (params && typeof params.missingProperty === 'string') {
+      message += `missing required property \`${params.missingProperty}\`.`;
+    } else {
+      message += `${ajvMessage}.`;
+    }
+
+    return new NowBuildError({
+      code: 'DEV_VALIDATE_CONFIG',
+      message: message,
+      link: prop ? `${docsUrl}#project/${prop.toLowerCase()}` : docsUrl,
+      action: 'View Documentation',
+    });
+  } catch (e) {
+    return new NowBuildError({
+      code: 'DEV_VALIDATE_CONFIG',
+      message: `Failed to validate configuration.`,
+      link: docsUrl,
+      action: 'View Documentation',
+    });
+  }
+}
+
+/**
+ * Get the top level property from the dataPath.
+ * `.cleanUrls` => `cleanUrls`
+ * `.headers[0].source` => `headers`
+ * `.headers[0].headers[0]` => `headers`
+ * `` => ``
+ */
+function getTopLevelPropertyName(dataPath?: string): string {
+  if (dataPath && dataPath.startsWith('.')) {
+    const lastIndex = dataPath.indexOf('[');
+    return lastIndex > -1 ? dataPath.slice(1, lastIndex) : dataPath.slice(1);
+  }
+  return '';
+}
+
+const mapTypoToSuggestion: { [key: string]: { [key: string]: string } } = {
+  '': {
+    builder: 'builds',
+    'build.env': '{ "build": { "env": {"name": "value"} } }',
+    'builds.env': '{ "build": { "env": {"name": "value"} } }',
+  },
+  rewrites: { src: 'source', dest: 'destination' },
+  redirects: { src: 'source', dest: 'destination', status: 'statusCode' },
+  headers: { src: 'source', header: 'headers' },
+  routes: {
+    source: 'src',
+    destination: 'dest',
+    header: 'headers',
+    method: 'methods',
+  },
+};
+
+function getSuggestion(topLevelProp: string, additionalProperty: string) {
+  const choices = mapTypoToSuggestion[topLevelProp];
+  const choice = choices ? choices[additionalProperty] : undefined;
+  return choice ? `Did you mean \`${choice}\`?` : 'Please remove it.';
+}

packages/now-build-utils/src/fs/run-user-scripts.ts

@@ -349,20 +349,35 @@ export async function runPipInstall(
   );
 }
 
+export function getScriptName(
+  pkg: Pick<PackageJson, 'scripts'> | null | undefined,
+  possibleNames: Iterable<string>
+): string | null {
+  if (pkg && pkg.scripts) {
+    for (const name of possibleNames) {
+      if (name in pkg.scripts) {
+        return name;
+      }
+    }
+  }
+  return null;
+}
+
 export async function runPackageJsonScript(
   destPath: string,
-  scriptName: string,
+  scriptNames: string | Iterable<string>,
   spawnOpts?: SpawnOptions
 ) {
   assert(path.isAbsolute(destPath));
   const { packageJson, cliType } = await scanParentDirs(destPath, true);
-  const hasScript = Boolean(
-    packageJson &&
-      packageJson.scripts &&
-      scriptName &&
-      packageJson.scripts[scriptName]
+  const scriptName = getScriptName(
+    packageJson,
+    typeof scriptNames === 'string' ? [scriptNames] : scriptNames
   );
-  if (!hasScript) return false;
+  if (!scriptName) return false;
+
+  debug('Running user script...');
+  const runScriptTime = Date.now();
 
   if (cliType === 'npm') {
     const prettyCommand = `npm run ${scriptName}`;
@@ -382,6 +397,7 @@ export async function runPackageJsonScript(
     });
   }
 
+  debug(`Script complete [${Date.now() - runScriptTime}ms]`);
   return true;
 }
 

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

@@ -13,6 +13,7 @@ import {
   execCommand,
   spawnCommand,
   walkParentDirs,
+  getScriptName,
   installDependencies,
   runPackageJsonScript,
   runNpmInstall,
@@ -47,6 +48,7 @@ export {
   rename,
   execAsync,
   spawnAsync,
+  getScriptName,
   installDependencies,
   runPackageJsonScript,
   execCommand,

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

@@ -493,7 +493,7 @@ describe('Test `detectBuilders`', () => {
   });
 
   it('use a custom runtime', async () => {
-    const functions = { 'api/user.php': { runtime: 'now-php@0.0.8' } };
+    const functions = { 'api/user.php': { runtime: 'vercel-php@0.1.0' } };
     const files = ['api/user.php'];
     const { builders, errors } = await detectBuilders(files, null, {
       functions,
@@ -501,11 +501,11 @@ describe('Test `detectBuilders`', () => {
 
     expect(errors).toBe(null);
     expect(builders!.length).toBe(1);
-    expect(builders![0].use).toBe('now-php@0.0.8');
+    expect(builders![0].use).toBe('vercel-php@0.1.0');
   });
 
   it('use a custom runtime but without a source', async () => {
-    const functions = { 'api/user.php': { runtime: 'now-php@0.0.8' } };
+    const functions = { 'api/user.php': { runtime: 'vercel-php@0.1.0' } };
     const files = ['api/team.js'];
     const { errors } = await detectBuilders(files, null, {
       functions,
@@ -775,8 +775,9 @@ describe('Test `detectBuilders`', () => {
     expect(errors).toEqual([
       {
         code: 'unused_function',
-        message:
-          "The function for server/**/*.ts can't be handled by any builder. Make sure it is inside the api/ directory.",
+        message: `The pattern "server/**/*.ts" defined in \`functions\` doesn't match any Serverless Functions inside the \`api\` directory.`,
+        action: 'Learn More',
+        link: 'https://vercel.link/unmatched-function-pattern',
       },
     ]);
   });
@@ -1538,7 +1539,7 @@ describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
   });
 
   it('use a custom runtime', async () => {
-    const functions = { 'api/user.php': { runtime: 'now-php@0.0.8' } };
+    const functions = { 'api/user.php': { runtime: 'vercel-php@0.1.0' } };
     const files = ['api/user.php'];
     const { builders, errors } = await detectBuilders(files, null, {
       functions,
@@ -1547,11 +1548,11 @@ describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
 
     expect(errors).toBe(null);
     expect(builders!.length).toBe(1);
-    expect(builders![0].use).toBe('now-php@0.0.8');
+    expect(builders![0].use).toBe('vercel-php@0.1.0');
   });
 
   it('use a custom runtime but without a source', async () => {
-    const functions = { 'api/user.php': { runtime: 'now-php@0.0.8' } };
+    const functions = { 'api/user.php': { runtime: 'vercel-php@0.1.0' } };
     const files = ['api/team.js'];
     const { errors } = await detectBuilders(files, null, {
       functions,
@@ -1878,8 +1879,9 @@ describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
     expect(errors).toEqual([
       {
         code: 'unused_function',
-        message:
-          "The function for server/**/*.ts can't be handled by any builder. Make sure it is inside the api/ directory.",
+        message: `The pattern "server/**/*.ts" defined in \`functions\` doesn't match any Serverless Functions inside the \`api\` directory.`,
+        action: 'Learn More',
+        link: 'https://vercel.link/unmatched-function-pattern',
       },
     ]);
   });
@@ -2081,7 +2083,7 @@ it('Test `detectRoutes`', async () => {
 
   {
     // use a custom runtime
-    const functions = { 'api/user.php': { runtime: 'now-php@0.0.8' } };
+    const functions = { 'api/user.php': { runtime: 'vercel-php@0.1.0' } };
     const files = ['api/user.php'];
 
     const { defaultRoutes } = await detectBuilders(files, null, { functions });
@@ -2393,7 +2395,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
 
   {
     // use a custom runtime
-    const functions = { 'api/user.php': { runtime: 'now-php@0.0.8' } };
+    const functions = { 'api/user.php': { runtime: 'vercel-php@0.1.0' } };
     const files = ['api/user.php'];
 
     const { defaultRoutes, rewriteRoutes } = await detectBuilders(files, null, {
@@ -2692,7 +2694,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
 
   {
     // use a custom runtime
-    const functions = { 'api/user.php': { runtime: 'now-php@0.0.8' } };
+    const functions = { 'api/user.php': { runtime: 'vercel-php@0.1.0' } };
     const files = ['api/user.php'];
 
     const {
@@ -2941,7 +2943,7 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
 
   {
     // use a custom runtime
-    const functions = { 'api/user.php': { runtime: 'now-php@0.0.8' } };
+    const functions = { 'api/user.php': { runtime: 'vercel-php@0.1.0' } };
     const files = ['api/user.php'];
 
     const {

packages/now-build-utils/test/unit.get-script-name.test.ts

@@ -0,0 +1,72 @@
+import assert from 'assert';
+import { getScriptName } from '../src';
+
+describe('Test `getScriptName()`', () => {
+  it('should return "vercel-*"', () => {
+    const pkg = {
+      scripts: {
+        'vercel-dev': '',
+        'vercel-build': '',
+        dev: '',
+        build: '',
+      },
+    };
+    assert.equal(
+      getScriptName(pkg, ['vercel-dev', 'now-dev', 'dev']),
+      'vercel-dev'
+    );
+    assert.equal(
+      getScriptName(pkg, ['vercel-build', 'now-build', 'build']),
+      'vercel-build'
+    );
+    assert.equal(getScriptName(pkg, ['dev']), 'dev');
+    assert.equal(getScriptName(pkg, ['build']), 'build');
+  });
+
+  it('should return "now-*"', () => {
+    const pkg = {
+      scripts: {
+        'now-dev': '',
+        'now-build': '',
+        dev: '',
+        build: '',
+      },
+    };
+    assert.equal(
+      getScriptName(pkg, ['vercel-dev', 'now-dev', 'dev']),
+      'now-dev'
+    );
+    assert.equal(
+      getScriptName(pkg, ['vercel-build', 'now-build', 'build']),
+      'now-build'
+    );
+    assert.equal(getScriptName(pkg, ['dev']), 'dev');
+    assert.equal(getScriptName(pkg, ['build']), 'build');
+  });
+
+  it('should return base script name', () => {
+    const pkg = {
+      scripts: {
+        dev: '',
+        build: '',
+      },
+    };
+    assert.equal(getScriptName(pkg, ['dev']), 'dev');
+    assert.equal(getScriptName(pkg, ['build']), 'build');
+  });
+
+  it('should return `null`', () => {
+    assert.equal(getScriptName(undefined, ['build']), null);
+    assert.equal(getScriptName({}, ['build']), null);
+    assert.equal(getScriptName({ scripts: {} }, ['build']), null);
+
+    const pkg = {
+      scripts: {
+        dev: '',
+        build: '',
+      },
+    };
+    assert.equal(getScriptName(pkg, ['vercel-dev', 'now-dev']), null);
+    assert.equal(getScriptName(pkg, ['vercel-build', 'now-build']), null);
+  });
+});

packages/now-cli/package.json

@@ -1,9 +1,9 @@
 {
   "name": "vercel",
-  "version": "19.1.0",
+  "version": "19.2.0",
   "preferGlobal": true,
   "license": "Apache-2.0",
-  "description": "The command-line interface for Now",
+  "description": "The command-line interface for Vercel",
   "homepage": "https://vercel.com",
   "repository": {
     "type": "git",
@@ -12,7 +12,7 @@
   },
   "scripts": {
     "preinstall": "node ./scripts/preinstall.js",
-    "test-unit": "nyc ava test/unit.js test/dev-builder.unit.js test/dev-router.unit.js test/dev-server.unit.js --serial --fail-fast --verbose",
+    "test-unit": "nyc ava test/unit.js test/dev-builder.unit.js test/dev-router.unit.js test/dev-server.unit.js test/dev-validate.unit.js --serial --fail-fast --verbose",
     "test-integration-cli": "ava test/integration.js --serial --fail-fast --verbose",
     "test-integration-v1": "ava test/integration-v1.js --serial --fail-fast",
     "test-integration-dev": "ava test/dev/integration.js --serial --fail-fast --verbose",
@@ -62,13 +62,14 @@
     "node": ">= 10"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.4.0",
-    "@vercel/go": "1.1.2",
-    "@vercel/next": "2.6.6",
-    "@vercel/node": "1.7.0",
+    "@vercel/build-utils": "2.4.2",
+    "@vercel/go": "1.1.4",
+    "@vercel/next": "2.6.13",
+    "@vercel/node": "1.7.3",
     "@vercel/python": "1.2.2",
-    "@vercel/ruby": "1.2.2",
-    "@vercel/static-build": "0.17.2"
+    "@vercel/ruby": "1.2.3",
+    "@vercel/static-build": "0.17.6",
+    "update-notifier": "4.1.0"
   },
   "devDependencies": {
     "@sentry/node": "5.5.0",
@@ -185,7 +186,6 @@
     "ts-node": "8.3.0",
     "typescript": "3.9.3",
     "universal-analytics": "0.4.20",
-    "update-check": "1.5.3",
     "utility-types": "2.1.0",
     "which": "2.0.2",
     "which-promise": "1.0.0",

packages/now-cli/scripts/build.ts

@@ -49,7 +49,13 @@ async function main() {
   // Do the initial `ncc` build
   console.log();
   const src = join(dirRoot, 'src');
-  const args = ['@zeit/ncc', 'build', '--source-map'];
+  const args = [
+    '@zeit/ncc',
+    'build',
+    '--source-map',
+    '--external',
+    'update-notifier',
+  ];
   if (!isDev) {
     args.push('--minify');
   }
@@ -86,7 +92,7 @@ async function main() {
   // A bunch of source `.ts` files from CLI's `util` directory
   await remove(join(dirRoot, 'dist', 'util'));
 
-  console.log('Finished building `now-cli`');
+  console.log('Finished building Vercel CLI');
 }
 
 process.on('unhandledRejection', (reason: any, promise: Promise<any>) => {

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

@@ -3,8 +3,8 @@ import bytes from 'bytes';
 import { join } from 'path';
 import { write as copy } from 'clipboardy';
 import chalk from 'chalk';
-import title from 'title';
 import { fileNameSymbol } from '@vercel/client';
+import { getPrettyError } from '@vercel/build-utils';
 import Client from '../../util/client';
 import { handleError } from '../../util/error';
 import getArgs from '../../util/get-args';
@@ -354,7 +354,7 @@ export default async function main(
       path,
       sourcePath,
       project
-        ? `To change your project settings, go to https://vercel.com/${org.slug}/${project.name}/settings`
+        ? `To change your Project Settings, go to https://vercel.com/${org.slug}/${project.name}/settings`
         : ''
     )) === false
   ) {
@@ -738,53 +738,10 @@ function handleCreateDeployError(output, error, localConfig) {
     return 1;
   }
   if (error instanceof SchemaValidationFailed) {
-    const { message, params, keyword, dataPath } = error.meta;
-
-    if (params && params.additionalProperty) {
-      const prop = params.additionalProperty;
-
-      output.error(
-        `The property ${code(prop)} is not allowed in ${highlight(
-          localConfig[fileNameSymbol]
-        )} – please remove it.`
-      );
-
-      if (prop === 'build.env' || prop === 'builds.env') {
-        output.note(
-          `Do you mean ${code('build')} (object) with a property ${code(
-            'env'
-          )} (object) instead of ${code(prop)}?`
-        );
-      }
-
-      return 1;
-    }
-
-    if (dataPath === '.name') {
-      output.error(message);
-      return 1;
-    }
-
-    if (keyword === 'type') {
-      const prop = dataPath.substr(1, dataPath.length);
-
-      output.error(
-        `The property ${code(prop)} in ${highlight(
-          localConfig[fileNameSymbol]
-        )} can only be of type ${code(title(params.type))}.`
-      );
-
-      return 1;
-    }
-
-    const link = 'https://vercel.com/docs/configuration';
-
-    output.error(
-      `Failed to validate ${highlight(
-        localConfig[fileNameSymbol]
-      )}: ${message}\nDocumentation: ${link}`
-    );
-
+    const niceError = getPrettyError(error.meta);
+    const fileName = localConfig[fileNameSymbol] || 'vercel.json';
+    niceError.message = `Invalid ${fileName} - ${niceError.message}`;
+    output.prettyError(niceError);
     return 1;
   }
   if (error instanceof TooManyRequests) {

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

@@ -9,6 +9,9 @@ import { getLinkedProject } from '../../util/projects/link';
 import { getFrameworks } from '../../util/get-frameworks';
 import { isSettingValue } from '../../util/is-setting-value';
 import { getCommandName } from '../../util/pkg-name';
+import { ProjectSettings, ProjectEnvTarget } from '../../types';
+import getDecryptedEnvRecords from '../../util/get-decrypted-env-records';
+import { Env } from '@vercel/build-utils';
 
 type Options = {
   '--debug'?: boolean;
@@ -50,21 +53,27 @@ export default async function dev(
     return 1;
   }
 
-  let devCommand: undefined | string;
-  let frameworkSlug: null | string = null;
+  let devCommand: string | undefined;
+  let frameworkSlug: string | undefined;
+  let projectSettings: ProjectSettings | undefined;
+  let environmentVars: Env | undefined;
   if (link.status === 'linked') {
     const { project, org } = link;
     client.currentTeam = org.type === 'team' ? org.id : undefined;
 
+    projectSettings = project;
+
     if (project.devCommand) {
       devCommand = project.devCommand;
     } else if (project.framework) {
       const framework = frameworks.find(f => f.slug === project.framework);
 
       if (framework) {
-        frameworkSlug = framework.slug;
-        const defaults = framework.settings.devCommand;
+        if (framework.slug) {
+          frameworkSlug = framework.slug;
+        }
 
+        const defaults = framework.settings.devCommand;
         if (isSettingValue(defaults)) {
           devCommand = defaults.value;
         }
@@ -74,6 +83,13 @@ export default async function dev(
     if (project.rootDirectory) {
       cwd = join(cwd, project.rootDirectory);
     }
+
+    environmentVars = await getDecryptedEnvRecords(
+      output,
+      client,
+      project,
+      ProjectEnvTarget.Development
+    );
   }
 
   const devServer = new DevServer(cwd, {
@@ -81,6 +97,8 @@ export default async function dev(
     debug,
     devCommand,
     frameworkSlug,
+    projectSettings,
+    environmentVars,
   });
 
   process.once('SIGINT', () => devServer.stop());

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

@@ -10,6 +10,7 @@ import handleError from '../../util/handle-error';
 import createOutput from '../../util/output/create-output';
 import logo from '../../util/output/logo';
 import cmd from '../../util/output/cmd';
+import highlight from '../../util/output/highlight';
 import dev from './dev';
 import readPackage from '../../util/read-package';
 import readConfig from '../../util/config/read-config';
@@ -96,7 +97,7 @@ export default async function main(ctx: NowContext) {
             'package.json'
           )} must not contain ${cmd('now dev')}`
         );
-        output.error(`More details: http://err.sh/now/now-dev-as-dev-script`);
+        output.error(`Learn More: http://err.sh/now/now-dev-as-dev-script`);
         return 1;
       }
       if (scripts && scripts.dev && /\bvercel\b\W+\bdev\b/.test(scripts.dev)) {
@@ -105,7 +106,7 @@ export default async function main(ctx: NowContext) {
             'package.json'
           )} must not contain ${cmd('vercel dev')}`
         );
-        output.error(`More details: http://err.sh/now/now-dev-as-dev-script`);
+        output.error(`Learn More: http://err.sh/now/now-dev-as-dev-script`);
         return 1;
       }
     }
@@ -119,6 +120,21 @@ export default async function main(ctx: NowContext) {
   try {
     return await dev(ctx, argv, args, output);
   } catch (err) {
+    if (err.code === 'ENOTFOUND') {
+      // Error message will look like the following:
+      // "request to https://api.vercel.com/www/user failed, reason: getaddrinfo ENOTFOUND api.vercel.com"
+      const matches = /getaddrinfo ENOTFOUND (.*)$/.exec(err.message || '');
+      if (matches && matches[1]) {
+        const hostname = matches[1];
+        output.error(
+          `The hostname ${highlight(
+            hostname
+          )} could not be resolved. Please verify your internet connectivity and DNS configuration.`
+        );
+      }
+      output.debug(err.stack);
+      return 1;
+    }
     output.prettyError(err);
     output.debug(stringifyError(err));
     return 1;

packages/now-cli/src/commands/env/pull.ts

@@ -4,21 +4,44 @@ import { Output } from '../../util/output';
 import promptBool from '../../util/prompt-bool';
 import Client from '../../util/client';
 import stamp from '../../util/output/stamp';
-import getEnvVariables from '../../util/env/get-env-records';
-import getDecryptedSecret from '../../util/env/get-decrypted-secret';
+import getDecryptedEnvRecords from '../../util/get-decrypted-env-records';
 import param from '../../util/output/param';
 import withSpinner from '../../util/with-spinner';
 import { join } from 'path';
-import { promises, existsSync } from 'fs';
+import { promises, openSync, closeSync, readSync } from 'fs';
 import { emoji, prependEmoji } from '../../util/emoji';
 import { getCommandName } from '../../util/pkg-name';
 const { writeFile } = promises;
+import { Env } from '@vercel/build-utils';
+
+const CONTENTS_PREFIX = '# Created by Vercel CLI\n';
 
 type Options = {
   '--debug': boolean;
   '--yes': boolean;
 };
 
+function readHeadSync(path: string, length: number) {
+  const buffer = Buffer.alloc(length);
+  const fd = openSync(path, 'r');
+  try {
+    readSync(fd, buffer, 0, buffer.length, null);
+  } finally {
+    closeSync(fd);
+  }
+  return buffer.toString();
+}
+
+function tryReadHeadSync(path: string, length: number) {
+  try {
+    return readHeadSync(path, length);
+  } catch (err) {
+    if (err.code !== 'ENOENT') {
+      throw err;
+    }
+  }
+}
+
 export default async function pull(
   client: Client,
   project: Project,
@@ -35,10 +58,14 @@ export default async function pull(
 
   const [filename = '.env'] = args;
   const fullPath = join(process.cwd(), filename);
-  const exists = existsSync(fullPath);
   const skipConfirmation = opts['--yes'];
 
-  if (
+  const head = tryReadHeadSync(fullPath, Buffer.byteLength(CONTENTS_PREFIX));
+  const exists = typeof head !== 'undefined';
+
+  if (head === CONTENTS_PREFIX) {
+    output.print(`Overwriting existing ${chalk.bold(filename)} file\n`);
+  } else if (
     exists &&
     !skipConfirmation &&
     !(await promptBool(
@@ -57,45 +84,23 @@ export default async function pull(
   );
   const pullStamp = stamp();
 
-  const records = await withSpinner('Downloading', async () => {
-    const dev = ProjectEnvTarget.Development;
-    const envs = await getEnvVariables(output, client, project.id, 4, dev);
-    const decryptedValues = await Promise.all(
-      envs.map(async env => {
-        try {
-          const value = await getDecryptedSecret(output, client, env.value);
-          return { value, found: true };
-        } catch (error) {
-          if (error && error.status === 404) {
-            return { value: '', found: false };
-          }
-          throw error;
-        }
-      })
-    );
-    const results: { key: string; value: string; found: boolean }[] = [];
-    for (let i = 0; i < decryptedValues.length; i++) {
-      const { key } = envs[i];
-      const { value, found } = decryptedValues[i];
-      results.push({ key, value, found });
-    }
-    return results;
-  });
+  const records: Env = await withSpinner(
+    'Downloading',
+    async () =>
+      await getDecryptedEnvRecords(
+        output,
+        client,
+        project,
+        ProjectEnvTarget.Development
+      )
+  );
 
   const contents =
-    records
-      .filter(obj => {
-        if (!obj.found) {
-          output.print('');
-          output.warn(
-            `Unable to download variable ${obj.key} because associated secret was deleted`
-          );
-          return false;
-        }
-        return true;
-      })
-      .map(({ key, value }) => `${key}="${escapeValue(value)}"`)
-      .join('\n') + '\n';
+    CONTENTS_PREFIX +
+    Object.entries(records)
+      .map(([key, value]) => `${key}="${escapeValue(value)}"`)
+      .join('\n') +
+    '\n';
 
   await writeFile(fullPath, contents, 'utf8');
 
@@ -110,8 +115,10 @@ export default async function pull(
   return 0;
 }
 
-function escapeValue(value: string) {
+function escapeValue(value: string | undefined) {
   return value
-    .replace(new RegExp('\n', 'g'), '\\n') // combine newlines (unix) into one line
-    .replace(new RegExp('\r', 'g'), '\\r'); // combine newlines (windows) into one line
+    ? value
+        .replace(new RegExp('\n', 'g'), '\\n') // combine newlines (unix) into one line
+        .replace(new RegExp('\r', 'g'), '\\r') // combine newlines (windows) into one line
+    : '';
 }

packages/now-cli/src/index.js

@@ -20,8 +20,7 @@ import sourceMap from '@zeit/source-map-support';
 import { mkdirp } from 'fs-extra';
 import chalk from 'chalk';
 import epipebomb from 'epipebomb';
-import checkForUpdate from 'update-check';
-import ms from 'ms';
+import updateNotifier from 'update-notifier';
 import { URL } from 'url';
 import * as Sentry from '@sentry/node';
 import { NowBuildError } from '@vercel/build-utils';
@@ -46,11 +45,20 @@ import reportError from './util/report-error';
 import getConfig from './util/get-config';
 import * as ERRORS from './util/errors-ts';
 import { NowError } from './util/now-error';
+import { APIError } from './util/errors-ts.ts';
 import { SENTRY_DSN } from './util/constants.ts';
 import getUpdateCommand from './util/get-update-command';
 import { metrics, shouldCollectMetrics } from './util/metrics.ts';
 import { getCommandName, getTitleName } from './util/pkg-name.ts';
 
+const isCanary = pkg.version.includes('canary');
+
+// Checks for available update and returns an instance
+const notifier = updateNotifier({
+  pkg,
+  distTag: isCanary ? 'canary' : 'latest',
+});
+
 const VERCEL_DIR = getGlobalPathConfig();
 const VERCEL_CONFIG_PATH = configFiles.getConfigFilePath();
 const VERCEL_AUTH_CONFIG_PATH = configFiles.getAuthConfigFilePath();
@@ -65,7 +73,7 @@ sourceMap.install();
 Sentry.init({
   dsn: SENTRY_DSN,
   release: `vercel-cli@${pkg.version}`,
-  environment: pkg.version.includes('canary') ? 'canary' : 'stable',
+  environment: isCanary ? 'canary' : 'stable',
 });
 
 let debug = () => {};
@@ -127,38 +135,20 @@ const main = async argv_ => {
   // (as in: `vercel ls`)
   const targetOrSubcommand = argv._[2];
 
-  let update = null;
-
-  try {
-    if (targetOrSubcommand !== 'update') {
-      update = await checkForUpdate(pkg, {
-        interval: ms('1d'),
-        distTag: pkg.version.includes('canary') ? 'canary' : 'latest',
-      });
-    }
-  } catch (err) {
-    console.error(
-      error(`Checking for updates failed${isDebugging ? ':' : ''}`)
-    );
-
-    if (isDebugging) {
-      console.error(err);
-    }
-  }
-
-  if (update && isTTY) {
+  if (notifier.update && isTTY) {
+    const { latest } = notifier.update;
     console.log(
       info(
         `${chalk.bgRed('UPDATE AVAILABLE')} ` +
           `Run ${cmd(
             await getUpdateCommand()
-          )} to install ${getTitleName()} CLI ${update.latest}`
+          )} to install ${getTitleName()} CLI ${latest}`
       )
     );
 
     console.log(
       info(
-        `Changelog: https://github.com/vercel/vercel/releases/tag/vercel@${update.latest}`
+        `Changelog: https://github.com/vercel/vercel/releases/tag/vercel@${latest}`
       )
     );
   }
@@ -168,7 +158,7 @@ const main = async argv_ => {
       `${getTitleName()} CLI ${pkg.version}${
         targetOrSubcommand === 'dev' ? ' dev (beta)' : ''
       }${
-        pkg.version.includes('canary') || targetOrSubcommand === 'dev'
+        isCanary || targetOrSubcommand === 'dev'
           ? ' — https://vercel.com/feedback'
           : ''
       }`
@@ -190,8 +180,7 @@ const main = async argv_ => {
   } catch (err) {
     console.error(
       error(
-        `${'An unexpected error occurred while trying to find the ' +
-          'global directory: '}${err.message}`
+        `An unexpected error occurred while trying to find the global directory: ${err.message}`
       )
     );
 
@@ -204,8 +193,10 @@ const main = async argv_ => {
     } catch (err) {
       console.error(
         error(
-          `${'An unexpected error occurred while trying to create the ' +
-            `global directory "${hp(VERCEL_DIR)}" `}${err.message}`
+          `${
+            'An unexpected error occurred while trying to create the ' +
+            `global directory "${hp(VERCEL_DIR)}" `
+          }${err.message}`
         )
       );
     }
@@ -219,8 +210,10 @@ const main = async argv_ => {
   } catch (err) {
     console.error(
       error(
-        `${'An unexpected error occurred while trying to find the ' +
-          `config file "${hp(VERCEL_CONFIG_PATH)}" `}${err.message}`
+        `${
+          'An unexpected error occurred while trying to find the ' +
+          `config file "${hp(VERCEL_CONFIG_PATH)}" `
+        }${err.message}`
       )
     );
 
@@ -235,8 +228,10 @@ const main = async argv_ => {
     } catch (err) {
       console.error(
         error(
-          `${'An unexpected error occurred while trying to read the ' +
-            `config in "${hp(VERCEL_CONFIG_PATH)}" `}${err.message}`
+          `${
+            'An unexpected error occurred while trying to read the ' +
+            `config in "${hp(VERCEL_CONFIG_PATH)}" `
+          }${err.message}`
         )
       );
 
@@ -267,8 +262,10 @@ const main = async argv_ => {
     } catch (err) {
       console.error(
         error(
-          `${'An unexpected error occurred while trying to write the ' +
-            `default config to "${hp(VERCEL_CONFIG_PATH)}" `}${err.message}`
+          `${
+            'An unexpected error occurred while trying to write the ' +
+            `default config to "${hp(VERCEL_CONFIG_PATH)}" `
+          }${err.message}`
         )
       );
 
@@ -283,8 +280,10 @@ const main = async argv_ => {
   } catch (err) {
     console.error(
       error(
-        `${'An unexpected error occurred while trying to find the ' +
-          `auth file "${hp(VERCEL_AUTH_CONFIG_PATH)}" `}${err.message}`
+        `${
+          'An unexpected error occurred while trying to find the ' +
+          `auth file "${hp(VERCEL_AUTH_CONFIG_PATH)}" `
+        }${err.message}`
       )
     );
 
@@ -301,8 +300,10 @@ const main = async argv_ => {
     } catch (err) {
       console.error(
         error(
-          `${'An unexpected error occurred while trying to read the ' +
-            `auth config in "${hp(VERCEL_AUTH_CONFIG_PATH)}" `}${err.message}`
+          `${
+            'An unexpected error occurred while trying to read the ' +
+            `auth config in "${hp(VERCEL_AUTH_CONFIG_PATH)}" `
+          }${err.message}`
         )
       );
 
@@ -314,21 +315,6 @@ const main = async argv_ => {
     // need to migrate.
     if (authConfig.credentials) {
       authConfigExists = false;
-    } else if (
-      !authConfig.token &&
-      !subcommandsWithoutToken.includes(targetOrSubcommand) &&
-      !argv['--help'] &&
-      !argv['--token']
-    ) {
-      console.error(
-        error(
-          `The content of "${hp(VERCEL_AUTH_CONFIG_PATH)}" is invalid. ` +
-            `No \`token\` property found inside. Run ${getCommandName(
-              'login'
-            )} to authorize.`
-        )
-      );
-      return 1;
     }
   } else {
     const results = await getDefaultAuthConfig(authConfig);
@@ -341,10 +327,10 @@ const main = async argv_ => {
     } catch (err) {
       console.error(
         error(
-          `${'An unexpected error occurred while trying to write the ' +
-            `default config to "${hp(VERCEL_AUTH_CONFIG_PATH)}" `}${
-            err.message
-          }`
+          `${
+            'An unexpected error occurred while trying to write the ' +
+            `default config to "${hp(VERCEL_AUTH_CONFIG_PATH)}" `
+          }${err.message}`
         )
       );
       return 1;
@@ -638,16 +624,28 @@ const main = async argv_ => {
         .send();
     }
   } catch (err) {
-    if (err.code === 'ENOTFOUND' && err.hostname === 'api.vercel.com') {
-      output.error(
-        `The hostname ${highlight(
-          'api.vercel.com'
-        )} could not be resolved. Please verify your internet connectivity and DNS configuration.`
-      );
+    if (err.code === 'ENOTFOUND') {
+      // Error message will look like the following:
+      // "request to https://api.vercel.com/www/user failed, reason: getaddrinfo ENOTFOUND api.vercel.com"
+      const matches = /getaddrinfo ENOTFOUND (.*)$/.exec(err.message || '');
+      if (matches && matches[1]) {
+        const hostname = matches[1];
+        output.error(
+          `The hostname ${highlight(
+            hostname
+          )} could not be resolved. Please verify your internet connectivity and DNS configuration.`
+        );
+      }
       output.debug(err.stack);
       return 1;
     }
 
+    if (err instanceof APIError && 400 <= err.status && err.status <= 499) {
+      err.message = err.serverMessage;
+      output.prettyError(err);
+      return 1;
+    }
+
     if (shouldCollectMetrics) {
       metric
         .event(eventCategory, '1', pkg.version)

packages/now-cli/src/types.ts

@@ -244,15 +244,20 @@ export interface ProjectEnvVariable {
   system?: boolean;
 }
 
-export interface Project {
+export interface ProjectSettings {
+  framework?: string | null;
+  devCommand?: string | null;
+  buildCommand?: string | null;
+  outputDirectory?: string | null;
+  rootDirectory?: string | null;
+}
+
+export interface Project extends ProjectSettings {
   id: string;
   name: string;
   accountId: string;
   updatedAt: number;
   createdAt: number;
-  devCommand?: string | null;
-  framework?: string | null;
-  rootDirectory?: string | null;
   latestDeployments?: Partial<Deployment>[];
 }
 

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

@@ -56,6 +56,8 @@ async function createBuildProcess(
   workPath: string,
   output: Output
 ): Promise<ChildProcess> {
+  output.debug(`Creating build process for "${match.entrypoint}"`);
+
   const builderWorkerPath = join(__dirname, 'builder-worker.js');
 
   // Ensure that `node` is in the builder's `PATH`
@@ -65,8 +67,6 @@ async function createBuildProcess(
     ...process.env,
     PATH,
     ...envConfigs.allEnv,
-    NOW_REGION: 'dev1',
-    VERCEL_REGION: 'dev1',
   };
 
   const buildProcess = fork(builderWorkerPath, [], {
@@ -78,7 +78,7 @@ async function createBuildProcess(
 
   buildProcess.on('exit', (code, signal) => {
     output.debug(
-      `Build process for ${match.src} exited with ${signal || code}`
+      `Build process for "${match.entrypoint}" exited with ${signal || code}`
     );
     match.buildProcess = undefined;
   });
@@ -128,7 +128,6 @@ export async function executeBuild(
 
   let { buildProcess } = match;
   if (!runInProcess && !buildProcess) {
-    devServer.output.debug(`Creating build process for ${entrypoint}`);
     buildProcess = await createBuildProcess(
       match,
       envConfigs,
@@ -364,8 +363,6 @@ export async function executeBuild(
               ...nowConfig.env,
               ...asset.environment,
               ...envConfigs.runEnv,
-              NOW_REGION: 'dev1',
-              VERCEL_REGION: 'dev1',
             },
           },
         });
@@ -431,7 +428,7 @@ export async function getBuildMatches(
     }
 
     const files = fileList
-      .filter(name => name === src || minimatch(name, src))
+      .filter(name => name === src || minimatch(name, src, { dot: true }))
       .map(name => join(cwd, name));
 
     if (files.length === 0) {

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

@@ -4,7 +4,7 @@ import PCRE from 'pcre-to-regexp';
 import isURL from './is-url';
 import DevServer from './server';
 
-import { HttpHeadersConfig, RouteResult } from './types';
+import { NowConfig, HttpHeadersConfig, RouteResult } from './types';
 import { isHandler, Route, HandleValue } from '@vercel/routing-utils';
 
 export function resolveRouteParameters(
@@ -50,6 +50,7 @@ export async function devRouter(
   reqMethod?: string,
   routes?: Route[],
   devServer?: DevServer,
+  nowConfig?: NowConfig,
   previousHeaders?: HttpHeadersConfig,
   missRoutes?: Route[],
   phase?: HandleValue | null
@@ -117,9 +118,12 @@ export async function devRouter(
           continue;
         }
 
-        if (routeConfig.check && devServer && phase !== 'hit') {
+        if (routeConfig.check && devServer && nowConfig && phase !== 'hit') {
           const { pathname = '/' } = url.parse(destPath);
-          const hasDestFile = await devServer.hasFilesystem(pathname);
+          const hasDestFile = await devServer.hasFilesystem(
+            pathname,
+            nowConfig
+          );
 
           if (!hasDestFile) {
             if (routeConfig.status && phase !== 'miss') {
@@ -131,6 +135,7 @@ export async function devRouter(
                 reqMethod,
                 missRoutes,
                 devServer,
+                nowConfig,
                 combinedHeaders,
                 [],
                 'miss'

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

@@ -12,7 +12,7 @@ import { randomBytes } from 'crypto';
 import serveHandler from 'serve-handler';
 import { watch, FSWatcher } from 'chokidar';
 import { parse as parseDotenv } from 'dotenv';
-import { basename, dirname, extname, join } from 'path';
+import path, { isAbsolute, basename, dirname, extname, join } from 'path';
 import once from '@tootallnate/once';
 import directoryTemplate from 'serve-handler/src/directory';
 import getPort from 'get-port';
@@ -49,18 +49,8 @@ import getNowConfigPath from '../config/local-path';
 import { MissingDotenvVarsError } from '../errors-ts';
 import cliPkg from '../pkg';
 import { getVercelDirectory } from '../projects/link';
-import { staticFiles as getFiles, getAllProjectFiles } from '../get-files';
-import {
-  validateNowConfigBuilds,
-  validateNowConfigRoutes,
-  validateNowConfigCleanUrls,
-  validateNowConfigHeaders,
-  validateNowConfigRedirects,
-  validateNowConfigRewrites,
-  validateNowConfigTrailingSlash,
-  validateNowConfigFunctions,
-} from './validate';
-
+import { staticFiles as getFiles } from '../get-files';
+import { validateConfig } from './validate';
 import { devRouter, getRoutesTypes } from './router';
 import getMimeType from './mime-type';
 import { executeBuild, getBuildMatches, shutdownBuilder } from './builder';
@@ -93,12 +83,17 @@ import {
   HttpHeadersConfig,
   EnvConfigs,
 } from './types';
+import { ProjectSettings } from '../../types';
 
 interface FSEvent {
   type: string;
   path: string;
 }
 
+type WithFileNameSymbol<T> = T & {
+  [fileNameSymbol]: string;
+};
+
 function sortBuilders(buildA: Builder, buildB: Builder) {
   if (buildA && buildA.use && isOfficialRuntime('static-build', buildA.use)) {
     return 1;
@@ -117,12 +112,11 @@ export default class DevServer {
   public output: Output;
   public proxy: httpProxy;
   public envConfigs: EnvConfigs;
-  public frameworkSlug: string | null;
+  public frameworkSlug?: string;
   public files: BuilderInputs;
   public address: string;
   public devCacheDir: string;
 
-  private cachedNowConfig: NowConfig | null;
   private caseSensitive: boolean;
   private apiDir: string | null;
   private apiExtensions: Set<string>;
@@ -140,22 +134,27 @@ export default class DevServer {
   private devProcess?: ChildProcess;
   private devProcessPort?: number;
   private devServerPids: Set<number>;
+  private projectSettings?: ProjectSettings;
 
   private getNowConfigPromise: Promise<NowConfig> | null;
   private blockingBuildsPromise: Promise<void> | null;
   private updateBuildersPromise: Promise<void> | null;
   private updateBuildersTimeout: NodeJS.Timeout | undefined;
+  private startPromise: Promise<void> | null;
+
+  private environmentVars: Env | undefined;
 
   constructor(cwd: string, options: DevServerOptions) {
     this.cwd = cwd;
     this.debug = options.debug;
     this.output = options.output;
     this.envConfigs = { buildEnv: {}, runEnv: {}, allEnv: {} };
+    this.environmentVars = options.environmentVars;
     this.files = {};
     this.address = '';
     this.devCommand = options.devCommand;
+    this.projectSettings = options.projectSettings;
     this.frameworkSlug = options.frameworkSlug;
-    this.cachedNowConfig = null;
     this.caseSensitive = false;
     this.apiDir = null;
     this.apiExtensions = new Set();
@@ -174,15 +173,14 @@ export default class DevServer {
     this.getNowConfigPromise = null;
     this.blockingBuildsPromise = null;
     this.updateBuildersPromise = null;
+    this.startPromise = null;
 
     this.watchAggregationId = null;
     this.watchAggregationEvents = [];
     this.watchAggregationTimeout = 500;
 
     this.filter = path => Boolean(path);
-    this.podId = Math.random()
-      .toString(32)
-      .slice(-5);
+    this.podId = Math.random().toString(32).slice(-5);
 
     this.devServerPids = new Set();
   }
@@ -235,16 +233,7 @@ export default class DevServer {
       }
     }
 
-    const nowConfig = await this.getNowConfig(false);
-
-    // Update the env vars configuration
-    const nowConfigBuild = nowConfig.build || {};
-    const [runEnv, buildEnv] = await Promise.all([
-      this.getLocalEnv('.env', nowConfig.env),
-      this.getLocalEnv('.env.build', nowConfigBuild.env),
-    ]);
-    const allEnv = { ...buildEnv, ...runEnv };
-    this.envConfigs = { buildEnv, runEnv, allEnv };
+    const nowConfig = await this.getNowConfig();
 
     // Update the build matches in case an entrypoint was created or deleted
     await this.updateBuildMatches(nowConfig);
@@ -290,18 +279,19 @@ export default class DevServer {
       for (const [result, [requestPath, match]] of needsRebuild) {
         if (
           requestPath === null ||
-          (await shouldServe(match, this.files, requestPath, this))
+          (await shouldServe(match, this.files, requestPath, this, nowConfig))
         ) {
           this.triggerBuild(
             match,
             requestPath,
             null,
+            nowConfig,
             result,
             filesChangedArray,
             filesRemovedArray
           ).catch((err: Error) => {
             this.output.warn(
-              `An error occurred while rebuilding ${match.src}:`
+              `An error occurred while rebuilding \`${match.src}\`:`
             );
             console.error(err.stack);
           });
@@ -388,9 +378,7 @@ export default class DevServer {
     const sources = matches.map(m => m.src);
 
     if (isInitial && fileList.length === 0) {
-      this.output.warn(
-        'There are no files (or only files starting with a dot) inside your deployment.'
-      );
+      this.output.warn('There are no files inside your deployment.');
     }
 
     // Delete build matches that no longer exists
@@ -446,6 +434,9 @@ export default class DevServer {
             `Cleaning up "blockingBuildsPromise" after error: ${err}`
           );
           this.blockingBuildsPromise = null;
+          if (err) {
+            this.output.prettyError(err);
+          }
         });
     }
 
@@ -493,13 +484,16 @@ export default class DevServer {
       const dotenv = await fs.readFile(filePath, 'utf8');
       this.output.debug(`Using local env: ${filePath}`);
       env = parseDotenv(dotenv);
+      env = this.populateVercelEnvVars(env);
     } catch (err) {
       if (err.code !== 'ENOENT') {
         throw err;
       }
     }
     try {
-      return this.validateEnvConfig(fileName, base || {}, env);
+      return {
+        ...this.validateEnvConfig(fileName, base || {}, env),
+      };
     } catch (err) {
       if (err instanceof MissingDotenvVarsError) {
         this.output.error(err.message);
@@ -511,57 +505,35 @@ export default class DevServer {
     return {};
   }
 
-  async getNowConfig(canUseCache: boolean = true): Promise<NowConfig> {
+  clearNowConfigPromise = () => {
+    this.getNowConfigPromise = null;
+  };
+
+  getNowConfig(): Promise<NowConfig> {
     if (this.getNowConfigPromise) {
       return this.getNowConfigPromise;
     }
-    this.getNowConfigPromise = this._getNowConfig(canUseCache);
-    try {
-      return await this.getNowConfigPromise;
-    } finally {
-      this.getNowConfigPromise = null;
-    }
+    this.getNowConfigPromise = this._getNowConfig();
+
+    // Clean up the promise once it has resolved
+    const clear = this.clearNowConfigPromise;
+    this.getNowConfigPromise.finally(clear);
+
+    return this.getNowConfigPromise;
   }
 
-  async _getNowConfig(canUseCache: boolean = true): Promise<NowConfig> {
-    if (canUseCache && this.cachedNowConfig) {
-      return this.cachedNowConfig;
-    }
+  async _getNowConfig(): Promise<NowConfig> {
+    const configPath = getNowConfigPath(this.cwd);
 
-    const pkg = await this.getPackageJson();
-
-    // The default empty `vercel.json` is used to serve all files as static
-    // when no `vercel.json` is present
-    let configPath = 'vercel.json';
-    let config: NowConfig = {
-      version: 2,
-      [fileNameSymbol]: configPath,
-    };
-
-    try {
-      configPath = getNowConfigPath(this.cwd);
-      this.output.debug(`Reading ${configPath}`);
-      config = JSON.parse(await fs.readFile(configPath, 'utf8'));
-      config[fileNameSymbol] = configPath;
-    } catch (err) {
-      if (err.code === 'ENOENT') {
-        this.output.debug(err.toString());
-      } else if (err.name === 'SyntaxError') {
-        this.output.warn(
-          `There is a syntax error in ${configPath}: ${err.message}`
-        );
-      } else {
-        throw err;
-      }
-    }
-
-    const allFiles = await getAllProjectFiles(this.cwd, this.output);
-    const files = allFiles.filter(this.filter);
-
-    this.output.debug(
-      `Found ${allFiles.length} and ` +
-        `filtered out ${allFiles.length - files.length} files`
-    );
+    const [
+      pkg = null,
+      // The default empty `vercel.json` is used to serve all
+      // files as static when no `vercel.json` is present
+      config = { version: 2, [fileNameSymbol]: 'vercel.json' },
+    ] = await Promise.all([
+      this.readJsonFile<PackageJson>('package.json'),
+      this.readJsonFile<NowConfig>(configPath),
+    ]);
 
     await this.validateNowConfig(config);
     const { error: routeError, routes: maybeRoutes } = getTransformedRoutes({
@@ -578,6 +550,11 @@ export default class DevServer {
       const featHandleMiss = true; // enable for zero config
       const { projectSettings, cleanUrls, trailingSlash } = config;
 
+      const opts = { output: this.output, isBuilds: true };
+      const files = (await getFiles(this.cwd, config, opts)).map(f =>
+        relative(this.cwd, f)
+      );
+
       let {
         builders,
         warnings,
@@ -589,7 +566,7 @@ export default class DevServer {
       } = await detectBuilders(files, pkg, {
         tag: getDistTag(cliPkg.version) === 'canary' ? 'canary' : 'latest',
         functions: config.functions,
-        ...(projectSettings ? { projectSettings } : {}),
+        projectSettings: projectSettings || this.projectSettings,
         featHandleMiss,
         cleanUrls,
         trailingSlash,
@@ -611,6 +588,8 @@ export default class DevServer {
 
         config.builds = config.builds || [];
         config.builds.push(...builders);
+
+        delete config.functions;
       }
 
       let routes: Route[] = [];
@@ -644,34 +623,57 @@ export default class DevServer {
 
     await this.validateNowConfig(config);
 
-    this.cachedNowConfig = config;
     this.caseSensitive = hasNewRoutingProperties(config);
     this.apiDir = detectApiDirectory(config.builds || []);
     this.apiExtensions = detectApiExtensions(config.builds || []);
+
+    // Update the env vars configuration
+    let [runEnv, buildEnv] = await Promise.all([
+      this.getLocalEnv('.env', config.env),
+      this.getLocalEnv('.env.build', config.build?.env),
+    ]);
+
+    let allEnv = { ...buildEnv, ...runEnv };
+
+    // If no .env/.build.env is present, fetch and use cloud environment variables
+    if (Object.keys(allEnv).length === 0) {
+      const cloudEnv = this.populateVercelEnvVars(this.environmentVars);
+      allEnv = runEnv = buildEnv = cloudEnv;
+    }
+
+    this.envConfigs = { buildEnv, runEnv, allEnv };
     return config;
   }
 
-  async getPackageJson(): Promise<PackageJson | null> {
-    const pkgPath = join(this.cwd, 'package.json');
-    let pkg: PackageJson | null = null;
-
-    this.output.debug('Reading `package.json` file');
+  async readJsonFile<T>(
+    filePath: string
+  ): Promise<WithFileNameSymbol<T> | void> {
+    let rel, abs;
+    if (isAbsolute(filePath)) {
+      rel = path.relative(this.cwd, filePath);
+      abs = filePath;
+    } else {
+      rel = filePath;
+      abs = join(this.cwd, filePath);
+    }
+    this.output.debug(`Reading \`${rel}\` file`);
 
     try {
-      pkg = JSON.parse(await fs.readFile(pkgPath, 'utf8'));
+      const raw = await fs.readFile(abs, 'utf8');
+      const parsed: WithFileNameSymbol<T> = JSON.parse(raw);
+      parsed[fileNameSymbol] = rel;
+      return parsed;
     } catch (err) {
       if (err.code === 'ENOENT') {
-        this.output.debug('No `package.json` file present');
+        this.output.debug(`No \`${rel}\` file present`);
       } else if (err.name === 'SyntaxError') {
         this.output.warn(
-          `There is a syntax error in the \`package.json\` file: ${err.message}`
+          `There is a syntax error in the \`${rel}\` file: ${err.message}`
         );
       } else {
         throw err;
       }
     }
-
-    return pkg;
   }
 
   async tryValidateOrExit(
@@ -693,14 +695,12 @@ export default class DevServer {
       return;
     }
 
-    await this.tryValidateOrExit(config, validateNowConfigBuilds);
-    await this.tryValidateOrExit(config, validateNowConfigRoutes);
-    await this.tryValidateOrExit(config, validateNowConfigCleanUrls);
-    await this.tryValidateOrExit(config, validateNowConfigHeaders);
-    await this.tryValidateOrExit(config, validateNowConfigRedirects);
-    await this.tryValidateOrExit(config, validateNowConfigRewrites);
-    await this.tryValidateOrExit(config, validateNowConfigTrailingSlash);
-    await this.tryValidateOrExit(config, validateNowConfigFunctions);
+    const error = validateConfig(config);
+
+    if (error) {
+      this.output.prettyError(error);
+      await this.exit(1);
+    }
   }
 
   validateEnvConfig(type: string, env: Env = {}, localEnv: Env = {}): Env {
@@ -746,6 +746,26 @@ export default class DevServer {
     return merged;
   }
 
+  populateVercelEnvVars(env: Env | undefined): Env {
+    if (!env) {
+      return {};
+    }
+
+    for (const name of Object.keys(env)) {
+      if (name === 'VERCEL_URL') {
+        const host = new URL(this.address).host;
+        env['VERCEL_URL'] = host;
+      } else if (name === 'VERCEL_REGION') {
+        env['VERCEL_REGION'] = 'dev1';
+      }
+    }
+
+    // Always set NOW_REGION to match production
+    env['NOW_REGION'] = 'dev1';
+
+    return env;
+  }
+
   /**
    * Create an array of from builder inputs
    * and filter them
@@ -754,10 +774,20 @@ export default class DevServer {
     return Object.keys(files).filter(this.filter);
   }
 
+  start(...listenSpec: ListenSpec): Promise<void> {
+    if (!this.startPromise) {
+      this.startPromise = this._start(...listenSpec).catch(err => {
+        this.stop();
+        throw err;
+      });
+    }
+    return this.startPromise;
+  }
+
   /**
    * Launches the `vercel dev` server.
    */
-  async start(...listenSpec: ListenSpec): Promise<void> {
+  async _start(...listenSpec: ListenSpec): Promise<void> {
     if (!fs.existsSync(this.cwd)) {
       throw new Error(`${chalk.bold(this.cwd)} doesn't exist`);
     }
@@ -769,15 +799,39 @@ export default class DevServer {
     const { ig } = await getVercelIgnore(this.cwd);
     this.filter = ig.createFilter();
 
-    // Retrieve the path of the native module
-    const nowConfig = await this.getNowConfig(false);
-    const nowConfigBuild = nowConfig.build || {};
-    const [runEnv, buildEnv] = await Promise.all([
-      this.getLocalEnv('.env', nowConfig.env),
-      this.getLocalEnv('.env.build', nowConfigBuild.env),
-    ]);
-    const allEnv = { ...buildEnv, ...runEnv };
-    this.envConfigs = { buildEnv, runEnv, allEnv };
+    let address: string | null = null;
+    while (typeof address !== 'string') {
+      try {
+        address = await listen(this.server, ...listenSpec);
+      } catch (err) {
+        this.output.debug(`Got listen error: ${err.code}`);
+        if (err.code === 'EADDRINUSE') {
+          if (typeof listenSpec[0] === 'number') {
+            // Increase port and try again
+            this.output.note(
+              `Requested port ${chalk.yellow(
+                String(listenSpec[0])
+              )} is already in use`
+            );
+            listenSpec[0]++;
+          } else {
+            this.output.error(
+              `Requested socket ${chalk.cyan(listenSpec[0])} is already in use`
+            );
+            process.exit(1);
+          }
+        } else {
+          throw err;
+        }
+      }
+    }
+
+    this.address = address
+      .replace('[::]', 'localhost')
+      .replace('127.0.0.1', 'localhost');
+
+    const nowConfig = await this.getNowConfig();
+    const devCommandPromise = this.runDevCommand();
 
     const opts = { output: this.output, isBuilds: true };
     const files = await getFiles(this.cwd, nowConfig, opts);
@@ -869,39 +923,6 @@ export default class DevServer {
       this.proxy.ws(req, socket, head, { target });
     });
 
-    const devCommandPromise = this.runDevCommand();
-
-    let address: string | null = null;
-    while (typeof address !== 'string') {
-      try {
-        address = await listen(this.server, ...listenSpec);
-      } catch (err) {
-        this.output.debug(`Got listen error: ${err.code}`);
-        if (err.code === 'EADDRINUSE') {
-          if (typeof listenSpec[0] === 'number') {
-            // Increase port and try again
-            this.output.note(
-              `Requested port ${chalk.yellow(
-                String(listenSpec[0])
-              )} is already in use`
-            );
-            listenSpec[0]++;
-          } else {
-            this.output.error(
-              `Requested socket ${chalk.cyan(listenSpec[0])} is already in use`
-            );
-            process.exit(1);
-          }
-        } else {
-          throw err;
-        }
-      }
-    }
-
-    this.address = address
-      .replace('[::]', 'localhost')
-      .replace('127.0.0.1', 'localhost');
-
     await devCommandPromise;
 
     this.output.ready(`Available at ${link(this.address)}`);
@@ -1110,10 +1131,7 @@ export default class DevServer {
     const allHeaders = {
       'cache-control': 'public, max-age=0, must-revalidate',
       ...headers,
-      server: 'now',
-      'x-now-trace': 'dev1',
-      'x-now-id': nowRequestId,
-      'x-now-cache': 'MISS',
+      server: 'Vercel',
       'x-vercel-id': nowRequestId,
       'x-vercel-cache': 'MISS',
     };
@@ -1127,29 +1145,31 @@ export default class DevServer {
    */
   getNowProxyHeaders(
     req: http.IncomingMessage,
-    nowRequestId: string
+    nowRequestId: string,
+    xfwd: boolean
   ): http.IncomingHttpHeaders {
     const ip = this.getRequestIp(req);
     const { host } = req.headers;
-    return {
-      ...req.headers,
-      Connection: 'close',
-      'x-forwarded-host': host,
-      'x-forwarded-proto': 'http',
-      'x-forwarded-for': ip,
+    const headers: http.IncomingHttpHeaders = {
+      connection: 'close',
       'x-real-ip': ip,
-      'x-now-trace': 'dev1',
-      'x-now-deployment-url': host,
-      'x-now-id': nowRequestId,
-      'x-now-log-id': nowRequestId.split('-')[2],
-      'x-zeit-co-forwarded-for': ip,
+      'x-vercel-deployment-url': host,
+      'x-vercel-forwarded-for': ip,
+      'x-vercel-id': nowRequestId,
     };
+    if (xfwd) {
+      headers['x-forwarded-host'] = host;
+      headers['x-forwarded-proto'] = 'http';
+      headers['x-forwarded-for'] = ip;
+    }
+    return headers;
   }
 
   async triggerBuild(
     match: BuildMatch,
     requestPath: string | null,
     req: http.IncomingMessage | null,
+    nowConfig: NowConfig,
     previousBuildResult?: BuildResult,
     filesChanged?: string[],
     filesRemoved?: string[]
@@ -1165,10 +1185,11 @@ export default class DevServer {
       // A build for `buildKey` is already in progress, so don't trigger
       // another rebuild for this request - just wait on the existing one.
       let msg = `De-duping build "${buildKey}"`;
-      if (req) msg += ` for "${req.method} ${req.url}"`;
+      if (req) {
+        msg += ` for "${req.method} ${req.url}"`;
+      }
       this.output.debug(msg);
     } else {
-      const nowConfig = await this.getNowConfig();
       if (previousBuildResult) {
         // Tear down any `output` assets from a previous build, so that they
         // are not available to be served while the rebuild is in progress.
@@ -1179,7 +1200,9 @@ export default class DevServer {
         }
       }
       let msg = `Building asset "${buildKey}"`;
-      if (req) msg += ` for "${req.method} ${req.url}"`;
+      if (req) {
+        msg += ` for "${req.method} ${req.url}"`;
+      }
       this.output.debug(msg);
       buildPromise = executeBuild(
         nowConfig,
@@ -1221,6 +1244,8 @@ export default class DevServer {
     req: http.IncomingMessage,
     res: http.ServerResponse
   ) => {
+    await this.startPromise;
+
     let nowRequestId = generateRequestId(this.podId);
 
     if (this.stopping) {
@@ -1260,7 +1285,7 @@ export default class DevServer {
     const { status, headers, dest } = routeResult;
     const location = headers['location'] || dest;
 
-    if (status && location && (300 <= status && status <= 399)) {
+    if (status && location && 300 <= status && status <= 399) {
       this.output.debug(`Route found with redirect status code ${status}`);
       await this.sendRedirect(req, res, nowRequestId, location, status);
       return true;
@@ -1350,6 +1375,7 @@ export default class DevServer {
         req.method,
         phaseRoutes,
         this,
+        nowConfig,
         prevHeaders,
         missRoutes,
         phase
@@ -1377,7 +1403,8 @@ export default class DevServer {
         this.buildMatches,
         this.files,
         routeResult.dest,
-        this
+        this,
+        nowConfig
       );
 
       if (
@@ -1400,6 +1427,7 @@ export default class DevServer {
           req.method,
           missRoutes,
           this,
+          nowConfig,
           routeResult.headers,
           [],
           'miss'
@@ -1409,7 +1437,8 @@ export default class DevServer {
           this.buildMatches,
           this.files,
           routeResult.dest,
-          this
+          this,
+          nowConfig
         );
         if (
           await this.exitWithStatus(
@@ -1432,6 +1461,7 @@ export default class DevServer {
           req.method,
           hitRoutes,
           this,
+          nowConfig,
           routeResult.headers,
           [],
           'hit'
@@ -1446,6 +1476,7 @@ export default class DevServer {
           req.method,
           errorRoutes,
           this,
+          nowConfig,
           routeResult.headers,
           [],
           'error'
@@ -1455,7 +1486,8 @@ export default class DevServer {
           this.buildMatches,
           this.files,
           routeResultForError.dest,
-          this
+          this,
+          nowConfig
         );
 
         if (matchForError) {
@@ -1503,16 +1535,15 @@ export default class DevServer {
     if (!match) {
       // If the dev command is started, then proxy to it
       if (this.devProcessPort) {
-        debug('Proxying to frontend dev server');
+        const upstream = `http://localhost:${this.devProcessPort}`;
+        debug(`Proxying to frontend dev server: ${upstream}`);
         this.setResponseHeaders(res, nowRequestId);
-        return proxyPass(
-          req,
-          res,
-          `http://localhost:${this.devProcessPort}`,
-          this,
-          nowRequestId,
-          false
-        );
+        const origUrl = url.parse(req.url || '/', true);
+        delete origUrl.search;
+        origUrl.pathname = dest;
+        Object.assign(origUrl.query, uri_args);
+        req.url = url.format(origUrl);
+        return proxyPass(req, res, upstream, this, nowRequestId, false);
       }
 
       if (
@@ -1544,7 +1575,8 @@ export default class DevServer {
         newUrl,
         req.method,
         buildResult.routes,
-        this
+        this,
+        nowConfig
       );
       if (matchedRoute.found && callLevel === 0) {
         debug(`Found matching route ${matchedRoute.dest} for ${newUrl}`);
@@ -1624,6 +1656,12 @@ export default class DevServer {
           query: parsed.query,
         });
 
+        // Add the Vercel platform proxy request headers
+        const headers = this.getNowProxyHeaders(req, nowRequestId, false);
+        for (const [name, value] of Object.entries(headers)) {
+          req.headers[name] = value;
+        }
+
         this.setResponseHeaders(res, nowRequestId);
         return proxyPass(
           req,
@@ -1640,7 +1678,7 @@ export default class DevServer {
     let foundAsset = findAsset(match, requestPath, nowConfig);
 
     if (!foundAsset && callLevel === 0) {
-      await this.triggerBuild(match, buildRequestPath, req);
+      await this.triggerBuild(match, buildRequestPath, req, nowConfig);
 
       // Since the `asset` was just built, resolve again to get the new asset
       foundAsset = findAsset(match, requestPath, nowConfig);
@@ -1672,8 +1710,9 @@ export default class DevServer {
 
     const { asset, assetKey } = foundAsset;
     debug(
-      `Serving asset: [${asset.type}] ${assetKey} ${(asset as any)
-        .contentType || ''}`
+      `Serving asset: [${asset.type}] ${assetKey} ${
+        (asset as any).contentType || ''
+      }`
     );
 
     /* eslint-disable no-case-declarations */
@@ -1735,7 +1774,10 @@ export default class DevServer {
           method: req.method || 'GET',
           host: req.headers.host,
           path,
-          headers: this.getNowProxyHeaders(req, nowRequestId),
+          headers: {
+            ...req.headers,
+            ...this.getNowProxyHeaders(req, nowRequestId, true),
+          },
           encoding: 'base64',
           body: body.toString('base64'),
         };
@@ -1865,8 +1907,17 @@ export default class DevServer {
     return true;
   }
 
-  async hasFilesystem(dest: string): Promise<boolean> {
-    if (await findBuildMatch(this.buildMatches, this.files, dest, this, true)) {
+  async hasFilesystem(dest: string, nowConfig: NowConfig): Promise<boolean> {
+    if (
+      await findBuildMatch(
+        this.buildMatches,
+        this.files,
+        dest,
+        this,
+        nowConfig,
+        true
+      )
+    ) {
       return true;
     }
     return false;
@@ -1896,8 +1947,6 @@ export default class DevServer {
       ...(this.frameworkSlug === 'create-react-app' ? { BROWSER: 'none' } : {}),
       ...process.env,
       ...this.envConfigs.allEnv,
-      NOW_REGION: 'dev1',
-      VERCEL_REGION: 'dev1',
       PORT: `${port}`,
     };
 
@@ -2047,13 +2096,23 @@ async function findBuildMatch(
   files: BuilderInputs,
   requestPath: string,
   devServer: DevServer,
-  isFilesystem?: boolean
+  nowConfig: NowConfig,
+  isFilesystem = false
 ): Promise<BuildMatch | null> {
   requestPath = requestPath.replace(/^\//, '');
 
   let bestIndexMatch: undefined | BuildMatch;
   for (const match of matches.values()) {
-    if (await shouldServe(match, files, requestPath, devServer, isFilesystem)) {
+    if (
+      await shouldServe(
+        match,
+        files,
+        requestPath,
+        devServer,
+        nowConfig,
+        isFilesystem
+      )
+    ) {
       if (!isIndex(match.src)) {
         return match;
       } else {
@@ -2075,14 +2134,14 @@ async function shouldServe(
   files: BuilderInputs,
   requestPath: string,
   devServer: DevServer,
-  isFilesystem?: boolean
+  nowConfig: NowConfig,
+  isFilesystem = false
 ): Promise<boolean> {
   const {
     src,
     config,
     builderWithPkg: { builder },
   } = match;
-  const nowConfig = await devServer.getNowConfig();
   const cleanSrc = src.endsWith('.html') ? src.slice(0, -5) : src;
   const trimmedPath = requestPath.endsWith('/')
     ? requestPath.slice(0, -1)
@@ -2126,7 +2185,7 @@ async function shouldServe(
     return true;
   } else if (
     !isFilesystem &&
-    (await findMatchingRoute(match, requestPath, devServer))
+    (await findMatchingRoute(match, requestPath, devServer, nowConfig))
   ) {
     // If there's no `shouldServe()` function and no matched asset, then look
     // up if there's a matching build route on the `match` that has already
@@ -2139,7 +2198,8 @@ async function shouldServe(
 async function findMatchingRoute(
   match: BuildMatch,
   requestPath: string,
-  devServer: DevServer
+  devServer: DevServer,
+  nowConfig: NowConfig
 ): Promise<RouteResult | void> {
   const reqUrl = `/${requestPath}`;
   for (const buildResult of match.buildResults.values()) {
@@ -2148,7 +2208,8 @@ async function findMatchingRoute(
       reqUrl,
       undefined,
       buildResult.routes,
-      devServer
+      devServer,
+      nowConfig
     );
     if (route.found) {
       return route;
@@ -2203,7 +2264,9 @@ function isIndex(path: string): boolean {
 }
 
 function minimatches(files: string[], pattern: string): boolean {
-  return files.some(file => file === pattern || minimatch(file, pattern));
+  return files.some(
+    file => file === pattern || minimatch(file, pattern, { dot: true })
+  );
 }
 
 function fileChanged(

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

@@ -17,19 +17,22 @@ import {
 import { NowConfig } from '@vercel/client';
 import { HandleValue, Route } from '@vercel/routing-utils';
 import { Output } from '../output';
+import { ProjectSettings } from '../../types';
 
 export { NowConfig };
 
 export interface DevServerOptions {
   output: Output;
   debug: boolean;
-  devCommand: string | undefined;
-  frameworkSlug: string | null;
+  devCommand?: string;
+  frameworkSlug?: string;
+  projectSettings?: ProjectSettings;
+  environmentVars?: Env;
 }
 
 export interface EnvConfigs {
   /**
-   * environment variables from `.env.build` file (deprecated)
+   * environment variables from `.env.build` file
    */
   buildEnv: Env;
 

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

@@ -8,71 +8,52 @@ import {
   trailingSlashSchema,
 } from '@vercel/routing-utils';
 import { NowConfig } from './types';
-import { functionsSchema, buildsSchema } from '@vercel/build-utils';
+import {
+  functionsSchema,
+  buildsSchema,
+  NowBuildError,
+  getPrettyError,
+} from '@vercel/build-utils';
+import { fileNameSymbol } from '@vercel/client';
+
+const vercelConfigSchema = {
+  type: 'object',
+  // These are not all possibilities because `vc dev`
+  // doesn't need to know about `regions`, `public`, etc.
+  additionalProperties: true,
+  properties: {
+    builds: buildsSchema,
+    routes: routesSchema,
+    cleanUrls: cleanUrlsSchema,
+    headers: headersSchema,
+    redirects: redirectsSchema,
+    rewrites: rewritesSchema,
+    trailingSlash: trailingSlashSchema,
+    functions: functionsSchema,
+  },
+};
 
 const ajv = new Ajv();
+const validate = ajv.compile(vercelConfigSchema);
 
-const validateBuilds = ajv.compile(buildsSchema);
-const validateRoutes = ajv.compile(routesSchema);
-const validateCleanUrls = ajv.compile(cleanUrlsSchema);
-const validateHeaders = ajv.compile(headersSchema);
-const validateRedirects = ajv.compile(redirectsSchema);
-const validateRewrites = ajv.compile(rewritesSchema);
-const validateTrailingSlash = ajv.compile(trailingSlashSchema);
-const validateFunctions = ajv.compile(functionsSchema);
-
-export function validateNowConfigBuilds(config: NowConfig) {
-  return validateKey(config, 'builds', validateBuilds);
-}
-
-export function validateNowConfigRoutes(config: NowConfig) {
-  return validateKey(config, 'routes', validateRoutes);
-}
-
-export function validateNowConfigCleanUrls(config: NowConfig) {
-  return validateKey(config, 'cleanUrls', validateCleanUrls);
-}
-
-export function validateNowConfigHeaders(config: NowConfig) {
-  return validateKey(config, 'headers', validateHeaders);
-}
-
-export function validateNowConfigRedirects(config: NowConfig) {
-  return validateKey(config, 'redirects', validateRedirects);
-}
-
-export function validateNowConfigRewrites(config: NowConfig) {
-  return validateKey(config, 'rewrites', validateRewrites);
-}
-
-export function validateNowConfigTrailingSlash(config: NowConfig) {
-  return validateKey(config, 'trailingSlash', validateTrailingSlash);
-}
-
-export function validateNowConfigFunctions(config: NowConfig) {
-  return validateKey(config, 'functions', validateFunctions);
-}
-
-function validateKey(
-  config: NowConfig,
-  key: keyof NowConfig,
-  validate: Ajv.ValidateFunction
-) {
-  const value = config[key];
-  if (!value) {
-    return null;
+export function validateConfig(config: NowConfig): NowBuildError | null {
+  if (!validate(config)) {
+    if (validate.errors && validate.errors[0]) {
+      const error = validate.errors[0];
+      const fileName = config[fileNameSymbol] || 'vercel.json';
+      const niceError = getPrettyError(error);
+      niceError.message = `Invalid ${fileName} - ${niceError.message}`;
+      return niceError;
+    }
   }
 
-  if (!validate(value)) {
-    if (!validate.errors) {
-      return null;
-    }
-
-    const error = validate.errors[0];
-
-    return `Invalid \`${String(key)}\` property: ${error.dataPath} ${
-      error.message
-    }`;
+  if (config.functions && config.builds) {
+    return new NowBuildError({
+      code: 'FUNCTIONS_AND_BUILDS',
+      message:
+        'The `functions` property cannot be used in conjunction with the `builds` property. Please remove one of them.',
+      link: 'https://vercel.link/functions-and-builds',
+    });
   }
 
   return null;

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

@@ -14,6 +14,7 @@ export class APIError extends Error {
   status: number;
   serverMessage: string;
   link?: string;
+  action?: string;
   retryAfter: number | null | 'never';
   [key: string]: any;
 

packages/now-cli/src/util/get-decrypted-env-records.ts

@@ -0,0 +1,46 @@
+import getEnvVariables from './env/get-env-records';
+import getDecryptedSecret from './env/get-decrypted-secret';
+import Client from './client';
+import { Output } from './output/create-output';
+import { ProjectEnvTarget, Project } from '../types';
+
+import { Env } from '@vercel/build-utils';
+
+export default async function getDecryptedEnvRecords(
+  output: Output,
+  client: Client,
+  project: Project,
+  target: ProjectEnvTarget
+): Promise<Env> {
+  const envs = await getEnvVariables(output, client, project.id, 4, target);
+  const decryptedValues = await Promise.all(
+    envs.map(async env => {
+      try {
+        const value = await getDecryptedSecret(output, client, env.value);
+        return { value, found: true };
+      } catch (error) {
+        if (error && error.status === 404) {
+          return { value: '', found: false };
+        }
+        throw error;
+      }
+    })
+  );
+
+  const results: Env = {};
+  for (let i = 0; i < decryptedValues.length; i++) {
+    const { key } = envs[i];
+    const { value, found } = decryptedValues[i];
+
+    if (!found) {
+      output.print('');
+      output.warn(
+        `Unable to download variable ${key} because associated secret was deleted`
+      );
+      continue;
+    }
+
+    results[key] = value ? value : '';
+  }
+  return results;
+}

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

@@ -1,7 +1,7 @@
-import { resolve, join } from 'path';
+import { resolve } from 'path';
 import ignore from 'ignore';
 import dockerignore from '@zeit/dockerignore';
-import _glob, { IOptions } from 'glob';
+import _glob, { IOptions as GlobOptions } from 'glob';
 import fs from 'fs-extra';
 import { getVercelIgnore } from '@vercel/client';
 import IGNORED from './ignored';
@@ -12,11 +12,11 @@ import { NowConfig } from './dev/types';
 
 type NullableString = string | null;
 
-const flatten = (
+function flatten(
   arr: NullableString[] | NullableString[][],
   res: NullableString[] = []
-) => {
-  for (let cur of arr) {
+): NullableString[] {
+  for (const cur of arr) {
     if (Array.isArray(cur)) {
       flatten(cur, res);
     } else {
@@ -24,21 +24,17 @@ const flatten = (
     }
   }
   return res;
-};
+}
 
-const glob = async function(pattern: string, options: IOptions) {
-  return new Promise<string[]>((resolve, reject) => {
-    _glob(pattern, options, (error, files) => {
-      if (error) {
-        reject(error);
-      } else {
-        resolve(files);
-      }
+async function glob(pattern: string, options: GlobOptions): Promise<string[]> {
+  return new Promise((resolve, reject) => {
+    _glob(pattern, options, (err, files) => {
+      err ? reject(err) : resolve(files);
     });
   });
-};
+}
 
-interface WalkSyncOptions {
+interface WalkOptions {
   output: Output;
 }
 
@@ -51,27 +47,27 @@ interface WalkSyncOptions {
  *  - `output` {Object} "output" helper object
  * @returns {Array}
  */
-const walkSync = async (
+async function walk(
   dir: string,
   path: string,
   filelist: string[] = [],
-  opts: WalkSyncOptions
-) => {
+  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 file_stat = await fs.stat(file);
-      filelist = file_stat.isDirectory()
-        ? await walkSync(file, path, filelist, opts)
+      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;
@@ -85,7 +81,7 @@ interface FilesInWhitelistOptions {
  *  - `output` {Object} "output" helper object
  * @returns {Array} the expanded list of whitelisted files.
  */
-const getFilesInWhitelist = async function(
+const getFilesInWhitelist = async function (
   whitelist: string[],
   path: string,
   opts: FilesInWhitelistOptions
@@ -97,10 +93,10 @@ const getFilesInWhitelist = async function(
     whitelist.map(async (file: string) => {
       file = asAbsolute(file, path);
       try {
-        const file_stat = await fs.stat(file);
-        if (file_stat.isDirectory()) {
-          const dir_files = await walkSync(file, path, [], opts);
-          files.push(...dir_files);
+        const fileStat = await fs.stat(file);
+        if (fileStat.isDirectory()) {
+          const dirFiles = await walk(file, path, [], opts);
+          files.push(...dirFiles);
         } else {
           files.push(file);
         }
@@ -117,7 +113,7 @@ const getFilesInWhitelist = async function(
  * because ignore doesn't like them :|
  */
 
-const clearRelative = function(str: string) {
+const clearRelative = function (str: string) {
   return str.replace(/(\n|^)\.\//g, '$1');
 };
 
@@ -127,7 +123,7 @@ const clearRelative = function(str: string) {
  * @return {String} results or `''`
  */
 
-const maybeRead = async function<T>(path: string, default_: T) {
+const maybeRead = async function <T>(path: string, default_: T) {
   try {
     return await fs.readFile(path, 'utf8');
   } catch (err) {
@@ -143,7 +139,7 @@ const maybeRead = async function<T>(path: string, default_: T) {
  * @param {String} parent full path
  */
 
-const asAbsolute = function(path: string, parent: string) {
+const asAbsolute = function (path: string, parent: string) {
   if (path[0] === '/') {
     return path;
   }
@@ -272,7 +268,7 @@ export async function npm(
     const search = Array.prototype.concat.apply(
       [],
       await Promise.all(
-        search_.map(file =>
+        search_.map((file) =>
           glob(file, { cwd: path, absolute: true, dot: true })
         )
       )
@@ -364,7 +360,7 @@ export async function docker(
     const search_ = ['.'];
 
     // Convert all filenames into absolute paths
-    const search = search_.map(file => asAbsolute(file, path));
+    const search = search_.map((file) => asAbsolute(file, path));
 
     // Compile list of ignored patterns and files
     const dockerIgnore = await maybeRead(resolve(path, '.dockerignore'), null);
@@ -382,7 +378,7 @@ export async function docker(
       .createFilter();
 
     const prefixLength = path.length + 1;
-    const accepts = function(file: string) {
+    const accepts = function (file: string) {
       const relativePath = file.substr(prefixLength);
 
       if (relativePath === '') {
@@ -415,24 +411,6 @@ export async function docker(
   return uniqueStrings(files);
 }
 
-/**
- * Get a list of all files inside the project folder
- *
- * @param {String} of the current working directory
- * @param {Object} output instance
- * @return {Array} of {String}s with the found files
- */
-export async function getAllProjectFiles(cwd: string, { debug }: Output) {
-  // We need a slash at the end to remove it later on from the matched files
-  const current = join(resolve(cwd), '/');
-  debug(`Searching files inside of ${current}`);
-
-  const list = await glob('**', { cwd: current, absolute: true, nodir: true });
-
-  // We need to replace \ with / for windows
-  return list.map(file => file.replace(current.replace(/\\/g, '/'), ''));
-}
-
 interface ExplodeOptions {
   accepts: (file: string) => boolean;
   output: Output;
@@ -482,7 +460,7 @@ async function explode(
     if (s.isDirectory()) {
       const all = await fs.readdir(file);
       /* eslint-disable no-use-before-define */
-      const recursive = many(all.map(subdir => asAbsolute(subdir, file)));
+      const recursive = many(all.map((subdir) => asAbsolute(subdir, file)));
       return (recursive as any) as Promise<string | null>;
       /* eslint-enable no-use-before-define */
     }
@@ -494,7 +472,7 @@ async function explode(
     return path;
   };
 
-  const many = (all: string[]) => Promise.all(all.map(file => list(file)));
+  const many = (all: string[]) => Promise.all(all.map((file) => list(file)));
   const arrayOfArrays = await many(paths);
   return flatten(arrayOfArrays).filter(notNull);
 }

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

@@ -145,6 +145,7 @@ export default class Now extends EventEmitter {
       regions,
       target: target || undefined,
       projectSettings,
+      source: 'cli',
     };
 
     // Ignore specific items from vercel.json

packages/now-cli/src/util/input/edit-project-settings.ts

@@ -44,8 +44,8 @@ export default async function editProjectSettings(
 
   output.print(
     !framework.slug
-      ? `No framework detected. Default project settings:\n`
-      : `Auto-detected project settings (${chalk.bold(framework.name)}):\n`
+      ? `No framework detected. Default Project Settings:\n`
+      : `Auto-detected Project Settings (${chalk.bold(framework.name)}):\n`
   );
 
   settings.framework = framework.slug;

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

@@ -27,7 +27,8 @@ export default function createOutput({ debug: debugEnabled = false } = {}) {
   function warn(
     str: string,
     slug: string | null = null,
-    link: string | null = null
+    link: string | null = null,
+    action: string = 'Learn More'
   ) {
     const prevTerm = process.env.TERM;
 
@@ -42,7 +43,7 @@ export default function createOutput({ debug: debugEnabled = false } = {}) {
       boxen(
         chalk.bold.yellow('WARN! ') +
           str +
-          (details ? `\nMore details: ${renderLink(details)}` : ''),
+          (details ? `\n${action}: ${renderLink(details)}` : ''),
         {
           padding: {
             top: 0,
@@ -67,7 +68,7 @@ export default function createOutput({ debug: debugEnabled = false } = {}) {
     str: string,
     slug?: string,
     link?: string,
-    action = 'More details'
+    action = 'Learn More'
   ) {
     print(`${chalk.red(`Error!`)} ${str}\n`);
     const details = slug ? `https://err.sh/now/${slug}` : link;

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

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

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

@@ -15,6 +15,7 @@ import { prependEmoji, emoji } from '../emoji';
 import AJV from 'ajv';
 import { isDirectory } from '../config/global-path';
 import { NowBuildError, getPlatformEnv } from '@vercel/build-utils';
+import outputCode from '../output/code';
 
 const readFile = promisify(fs.readFile);
 const writeFile = promisify(fs.writeFile);
@@ -73,7 +74,7 @@ async function getLinkFromDir(dir: string): Promise<ProjectLink | null> {
 
     if (!ajv.validate(linkSchema, link)) {
       throw new Error(
-        `Project settings are invalid. To link your project again, remove the ${dir} directory.`
+        `Project Settings are invalid. To link your project again, remove the ${dir} directory.`
       );
     }
 
@@ -87,7 +88,7 @@ async function getLinkFromDir(dir: string): Promise<ProjectLink | null> {
     // link file can't be read
     if (error.name === 'SyntaxError') {
       throw new Error(
-        `Project settings could not be retrieved. To link your project again, remove the ${dir} directory.`
+        `Project Settings could not be retrieved. To link your project again, remove the ${dir} directory.`
       );
     }
 
@@ -141,13 +142,27 @@ export async function getLinkedProject(
   }
 
   const spinner = output.spinner('Retrieving project…', 1000);
-  let org: Org | null;
-  let project: Project | ProjectNotFound | null;
+  let org: Org | null = null;
+  let project: Project | ProjectNotFound | null = null;
   try {
     [org, project] = await Promise.all([
       getOrgById(client, link.orgId),
       getProjectByIdOrName(client, link.projectId, link.orgId),
     ]);
+  } catch (err) {
+    if (err?.status === 403) {
+      spinner();
+      throw new NowBuildError({
+        message: `Could not retrieve Project Settings. To link your Project, remove the ${outputCode(
+          '.vercel'
+        )} directory and deploy again.`,
+        code: 'PROJECT_UNAUTHORIZED',
+        link: 'https://vercel.link/cannot-load-project-settings',
+      });
+    }
+
+    // Not a special case 403, we should still throw it
+    throw err;
   } finally {
     spinner();
   }

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

@@ -6,7 +6,6 @@ export default async function responseError(
   fallbackMessage = null,
   parsedBody = {}
 ) {
-  let message;
   let bodyError;
 
   if (res.status >= 400 && res.status < 500) {
@@ -20,12 +19,9 @@ export default async function responseError(
 
     // Some APIs wrongly return `err` instead of `error`
     bodyError = body.error || body.err || body;
-    message = bodyError.message;
   }
 
-  if (message == null) {
-    message = fallbackMessage === null ? 'Response Error' : fallbackMessage;
-  }
+  const msg = bodyError?.message || fallbackMessage || 'Response Error';
 
-  return new APIError(message, res, bodyError);
+  return new APIError(msg, res, bodyError);
 }

packages/now-cli/test/dev-server.unit.js

@@ -71,7 +71,7 @@ function testFixture(name, fn) {
 }
 
 function validateResponseHeaders(t, res, podId = null) {
-  t.is(res.headers.get('server'), 'now');
+  t.is(res.headers.get('server'), 'Vercel');
   t.truthy(res.headers.get('cache-control').length > 0);
   t.truthy(
     /^dev1::(dev1::)?[0-9a-z]{5}-[1-9][0-9]+-[a-f0-9]{12}$/.test(

packages/now-cli/test/dev-validate.unit.js

@@ -0,0 +1,283 @@
+import test from 'ava';
+import { validateConfig } from '../src/util/dev/validate';
+
+test('[dev-validate] should not error with empty config', async (t) => {
+  const config = {};
+  const error = validateConfig(config);
+  t.deepEqual(error, null);
+});
+
+test('[dev-validate] should not error with complete config', async (t) => {
+  const config = {
+    version: 2,
+    public: true,
+    regions: ['sfo1', 'iad1'],
+    cleanUrls: true,
+    headers: [{ source: '/', headers: [{ key: 'x-id', value: '123' }] }],
+    rewrites: [{ source: '/help', destination: '/support' }],
+    redirects: [{ source: '/kb', destination: 'https://example.com' }],
+    trailingSlash: false,
+    functions: { 'api/user.go': { memory: 128, maxDuration: 5 } },
+  };
+  const error = validateConfig(config);
+  t.deepEqual(error, null);
+});
+
+test('[dev-validate] should not error with builds and routes', async (t) => {
+  const config = {
+    builds: [{ src: 'api/index.js', use: '@vercel/node' }],
+    routes: [{ src: '/(.*)', dest: '/api/index.js' }],
+  };
+  const error = validateConfig(config);
+  t.deepEqual(error, null);
+});
+
+test('[dev-validate] should error with invalid rewrites due to additional property and offer suggestion', async (t) => {
+  const config = {
+    rewrites: [{ src: '/(.*)', dest: '/api/index.js' }],
+  };
+  const error = validateConfig(config);
+  t.deepEqual(
+    error.message,
+    'Invalid vercel.json - `rewrites[0]` should NOT have additional property `src`. Did you mean `source`?'
+  );
+  t.deepEqual(
+    error.link,
+    'https://vercel.com/docs/configuration#project/rewrites'
+  );
+});
+
+test('[dev-validate] should error with invalid routes due to additional property and offer suggestion', async (t) => {
+  const config = {
+    routes: [{ source: '/(.*)', destination: '/api/index.js' }],
+  };
+  const error = validateConfig(config);
+  t.deepEqual(
+    error.message,
+    'Invalid vercel.json - `routes[0]` should NOT have additional property `source`. Did you mean `src`?'
+  );
+  t.deepEqual(
+    error.link,
+    'https://vercel.com/docs/configuration#project/routes'
+  );
+});
+
+test('[dev-validate] should error with invalid routes array type', async (t) => {
+  const config = {
+    routes: { src: '/(.*)', dest: '/api/index.js' },
+  };
+  const error = validateConfig(config);
+  t.deepEqual(error.message, 'Invalid vercel.json - `routes` should be array.');
+  t.deepEqual(
+    error.link,
+    'https://vercel.com/docs/configuration#project/routes'
+  );
+});
+
+test('[dev-validate] should error with invalid redirects array object', async (t) => {
+  const config = {
+    redirects: [
+      {
+        /* intentionally empty */
+      },
+    ],
+  };
+  const error = validateConfig(config);
+  t.deepEqual(
+    error.message,
+    'Invalid vercel.json - `redirects[0]` missing required property `source`.'
+  );
+  t.deepEqual(
+    error.link,
+    'https://vercel.com/docs/configuration#project/redirects'
+  );
+});
+
+test('[dev-validate] should error with invalid redirects.permanent poperty', async (t) => {
+  const config = {
+    redirects: [{ source: '/', destination: '/go', permanent: 'yes' }],
+  };
+  const error = validateConfig(config);
+  t.deepEqual(
+    error.message,
+    'Invalid vercel.json - `redirects[0].permanent` should be boolean.'
+  );
+  t.deepEqual(
+    error.link,
+    'https://vercel.com/docs/configuration#project/redirects'
+  );
+});
+
+test('[dev-validate] should error with invalid cleanUrls type', async (t) => {
+  const config = {
+    cleanUrls: 'true',
+  };
+  const error = validateConfig(config);
+  t.deepEqual(
+    error.message,
+    'Invalid vercel.json - `cleanUrls` should be boolean.'
+  );
+  t.deepEqual(
+    error.link,
+    'https://vercel.com/docs/configuration#project/cleanurls'
+  );
+});
+
+test('[dev-validate] should error with invalid trailingSlash type', async (t) => {
+  const config = {
+    trailingSlash: [true],
+  };
+  const error = validateConfig(config);
+  t.deepEqual(
+    error.message,
+    'Invalid vercel.json - `trailingSlash` should be boolean.'
+  );
+  t.deepEqual(
+    error.link,
+    'https://vercel.com/docs/configuration#project/trailingslash'
+  );
+});
+
+test('[dev-validate] should error with invalid headers property', async (t) => {
+  const config = {
+    headers: [{ 'Content-Type': 'text/html' }],
+  };
+  const error = validateConfig(config);
+  t.deepEqual(
+    error.message,
+    'Invalid vercel.json - `headers[0]` should NOT have additional property `Content-Type`. Please remove it.'
+  );
+  t.deepEqual(
+    error.link,
+    'https://vercel.com/docs/configuration#project/headers'
+  );
+});
+
+test('[dev-validate] should error with invalid headers.source type', async (t) => {
+  const config = {
+    headers: [{ source: [{ 'Content-Type': 'text/html' }] }],
+  };
+  const error = validateConfig(config);
+  t.deepEqual(
+    error.message,
+    'Invalid vercel.json - `headers[0].source` should be string.'
+  );
+  t.deepEqual(
+    error.link,
+    'https://vercel.com/docs/configuration#project/headers'
+  );
+});
+
+test('[dev-validate] should error with invalid headers additional property', async (t) => {
+  const config = {
+    headers: [{ source: '/', stuff: [{ 'Content-Type': 'text/html' }] }],
+  };
+  const error = validateConfig(config);
+  t.deepEqual(
+    error.message,
+    'Invalid vercel.json - `headers[0]` should NOT have additional property `stuff`. Please remove it.'
+  );
+  t.deepEqual(
+    error.link,
+    'https://vercel.com/docs/configuration#project/headers'
+  );
+});
+
+test('[dev-validate] should error with invalid headers wrong nested headers type', async (t) => {
+  const config = {
+    headers: [{ source: '/', headers: [{ 'Content-Type': 'text/html' }] }],
+  };
+  const error = validateConfig(config);
+  t.deepEqual(
+    error.message,
+    'Invalid vercel.json - `headers[0].headers[0]` should NOT have additional property `Content-Type`. Please remove it.'
+  );
+  t.deepEqual(
+    error.link,
+    'https://vercel.com/docs/configuration#project/headers'
+  );
+});
+
+test('[dev-validate] should error with invalid headers wrong nested headers additional property', async (t) => {
+  const config = {
+    headers: [
+      { source: '/', headers: [{ key: 'Content-Type', val: 'text/html' }] },
+    ],
+  };
+  const error = validateConfig(config);
+  t.deepEqual(
+    error.message,
+    'Invalid vercel.json - `headers[0].headers[0]` should NOT have additional property `val`. Please remove it.'
+  );
+  t.deepEqual(
+    error.link,
+    'https://vercel.com/docs/configuration#project/headers'
+  );
+});
+
+test('[dev-validate] should error with too many redirects', async (t) => {
+  const config = {
+    redirects: Array.from({ length: 5000 }).map((_, i) => ({
+      source: `/${i}`,
+      destination: `/v/${i}`,
+    })),
+  };
+  const error = validateConfig(config);
+  t.deepEqual(
+    error.message,
+    'Invalid vercel.json - `redirects` should NOT have more than 1024 items.'
+  );
+  t.deepEqual(
+    error.link,
+    'https://vercel.com/docs/configuration#project/redirects'
+  );
+});
+
+test('[dev-validate] should error with too many nested headers', async (t) => {
+  const config = {
+    headers: [
+      {
+        source: '/',
+        headers: [{ key: `x-id`, value: `123` }],
+      },
+      {
+        source: '/too-many',
+        headers: Array.from({ length: 5000 }).map((_, i) => ({
+          key: `${i}`,
+          value: `${i}`,
+        })),
+      },
+    ],
+  };
+  const error = validateConfig(config);
+  t.deepEqual(
+    error.message,
+    'Invalid vercel.json - `headers[1].headers` should NOT have more than 1024 items.'
+  );
+  t.deepEqual(
+    error.link,
+    'https://vercel.com/docs/configuration#project/headers'
+  );
+});
+
+test('[dev-validate] should error with "functions" and "builds"', async (t) => {
+  const config = {
+    builds: [
+      {
+        src: 'index.html',
+        use: '@vercel/static',
+      },
+    ],
+    functions: {
+      'api/test.js': {
+        memory: 1024,
+      },
+    },
+  };
+  const error = validateConfig(config);
+  t.deepEqual(
+    error.message,
+    'The `functions` property cannot be used in conjunction with the `builds` property. Please remove one of them.'
+  );
+  t.deepEqual(error.link, 'https://vercel.link/functions-and-builds');
+});

packages/now-cli/test/dev/fixtures/00-list-directory/.well-known/keybase.txt

@@ -0,0 +1 @@
+proof goes here

packages/now-cli/test/dev/fixtures/06-gridsome/package.json

@@ -3,7 +3,7 @@
   "private": true,
   "scripts": {
     "build": "gridsome build",
-    "develop": "gridsome develop",
+    "dev": "gridsome develop -p $PORT",
     "explore": "gridsome explore"
   },
   "dependencies": {

packages/now-cli/test/dev/fixtures/06-gridsome/src/pages/404.vue

@@ -0,0 +1,14 @@
+<template>
+  <Layout>
+    <h1>Not Found</h1>
+    <p>This is a Custom Gridsome 404.</p>
+  </Layout>
+</template>
+
+<script>
+export default {
+  metaInfo: {
+    title: 'Not Found'
+  }
+}
+</script>

packages/now-cli/test/dev/fixtures/06-gridsome/src/pages/Index.vue

@@ -1,11 +1,11 @@
 <template>
   <Layout>
-    
+
     <!-- Learn how to use images here: https://gridsome.org/docs/images -->
     <g-image alt="Example image" src="~/favicon.png" width="135" />
-    
-    <h1>Hello, world!</h1>
-   
+
+    <h1>Gridsome on Vercel</h1>
+
     <p>
       Lorem ipsum dolor sit amet, consectetur adipisicing elit. Pariatur excepturi labore tempore expedita, et iste tenetur suscipit explicabo! Dolores, aperiam non officia eos quod asperiores
     </p>

packages/now-cli/test/dev/fixtures/06-gridsome/vercel.json

@@ -0,0 +1,3 @@
+{
+  "redirects": [{ "source": "/support", "destination": "/about?ref=support" }]
+}

packages/now-cli/test/dev/fixtures/07-hexo-node/source/contact.html

@@ -0,0 +1 @@
+<h1>Contact Us</h1>

packages/now-cli/test/dev/fixtures/07-hexo-node/vercel.json

@@ -0,0 +1,3 @@
+{
+  "rewrites": [{ "source": "/support", "destination": "/contact.html" }]
+}

packages/now-cli/test/dev/fixtures/10-nextjs-node/pages/contact.js

@@ -0,0 +1,3 @@
+export default function Contact() {
+  return <h1>Contact Page</h1>;
+}

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

@@ -0,0 +1,3 @@
+{
+  "rewrites": [{ "source": "/support", "destination": "/contact" }]
+}

packages/now-cli/test/dev/fixtures/custom-runtime/vercel.json

@@ -1,7 +1,7 @@
 {
   "functions": {
     "api/user.sh": {
-      "runtime": "vercel-bash@3.0.7"
+      "runtime": "vercel-bash@3.0.8"
     }
   }
 }

packages/now-cli/test/dev/fixtures/invalidate-vercel-config/vercel.json

@@ -1 +1 @@
-{ "env": { "FOO": "bar" } }
+{"env":{"FOO":"bar"}}

packages/now-cli/test/dev/fixtures/monorepo-dynamic-paths/blog/next.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  assetPrefix: '/blog',
+  env: {
+    ASSET_PREFIX: '/blog',
+  },
+};

packages/now-cli/test/dev/fixtures/monorepo-dynamic-paths/blog/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "with-zones-blog",
+  "version": "1.0.0",
+  "dependencies": {
+    "next": "latest",
+    "react": "latest",
+    "react-dom": "latest"
+  },
+  "license": "ISC"
+}

packages/now-cli/test/dev/fixtures/monorepo-dynamic-paths/blog/pages/blog/index.js

@@ -0,0 +1,22 @@
+import Link from 'next/link';
+
+export default function Blog() {
+  return (
+    <div>
+      <h3>This is our blog</h3>
+      <ul>
+        <li>
+          <Link href="/blog/post/[id]" as="/blog/post/1">
+            <a>Post 1</a>
+          </Link>
+        </li>
+        <li>
+          <Link href="/blog/post/[id]" as="/blog/post/2">
+            <a>Post 2</a>
+          </Link>
+        </li>
+      </ul>
+      <a href="/">Home</a>
+    </div>
+  );
+}

packages/now-cli/test/dev/fixtures/monorepo-dynamic-paths/blog/pages/blog/post/[id].js

@@ -0,0 +1,15 @@
+import Link from 'next/link'
+import { useRouter } from 'next/router'
+
+export default function Post() {
+  const router = useRouter()
+  return (
+    <div>
+      <h3>Post #{router.query.id}</h3>
+      <p>Lorem ipsum</p>
+      <Link href="/blog">
+        <a>Back to blog</a>
+      </Link>
+    </div>
+  )
+}

packages/now-cli/test/dev/fixtures/monorepo-dynamic-paths/home/components/Header.js

@@ -0,0 +1,7 @@
+const Header = () => (
+  <div>
+    <h2>The Company</h2>
+  </div>
+);
+
+export default Header;

packages/now-cli/test/dev/fixtures/monorepo-dynamic-paths/home/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "with-zones-home",
+  "version": "1.0.0",
+  "dependencies": {
+    "next": "latest",
+    "react": "latest",
+    "react-dom": "latest"
+  },
+  "license": "ISC"
+}

packages/now-cli/test/dev/fixtures/monorepo-dynamic-paths/home/pages/1/[id].js

@@ -0,0 +1,21 @@
+import Link from 'next/link';
+
+const About = ({ id }) => {
+  return (
+    <div>
+      <p>This is the {id} page with static props.</p>
+      <div>
+        <Link href="/">
+          <a>Go Back</a>
+        </Link>
+      </div>
+    </div>
+  );
+};
+
+export const getStaticProps = ({ params }) => {
+  return { props: { id: params.id } };
+};
+export const getStaticPaths = () => ({ paths: ['/1/dynamic'], fallback: true });
+
+export default About;

packages/now-cli/test/dev/fixtures/monorepo-dynamic-paths/home/pages/[id].js

@@ -0,0 +1,19 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+const About = () => {
+  const router = useRouter();
+  const { id } = router.query;
+  return (
+    <div>
+      <p>This is the {id} page without static props.</p>
+      <div>
+        <Link href="/">
+          <a>Go Back</a>
+        </Link>
+      </div>
+    </div>
+  );
+};
+
+export default About;

packages/now-cli/test/dev/fixtures/monorepo-dynamic-paths/home/pages/about.js

@@ -0,0 +1,19 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+const About = () => {
+  const router = useRouter();
+  const { id } = router.query;
+  return (
+    <div>
+      <p>This is the about static page.</p>
+      <div>
+        <Link href="/">
+          <a>Go Back</a>
+        </Link>
+      </div>
+    </div>
+  );
+};
+
+export default About;

packages/now-cli/test/dev/fixtures/monorepo-dynamic-paths/home/pages/index.js

@@ -0,0 +1,36 @@
+import Link from 'next/link';
+import dynamic from 'next/dynamic';
+
+const Header = dynamic(import('../components/Header'));
+
+export default function Home() {
+  return (
+    <div>
+      <Header />
+      <p>This is our homepage</p>
+      <div>
+        <a href="/blog">Blog</a>
+      </div>
+      <div>
+        <Link href="/about">
+          <a>About us</a>
+        </Link>
+      </div>
+      <div>
+        <Link href="/foo">
+          <a>foo</a>
+        </Link>
+      </div>
+      <div>
+        <Link href="/1/dynamic">
+          <a>1/dynamic</a>
+        </Link>
+      </div>
+      <div>
+        <Link href="/1/foo">
+          <a>1/foo</a>
+        </Link>
+      </div>
+    </div>
+  );
+}

packages/now-cli/test/dev/fixtures/monorepo-dynamic-paths/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "with-zones-example",
+  "private": true,
+  "workspaces": [
+    "home",
+    "blog"
+  ],
+  "devDependencies": {
+    "vercel": "canary"
+  }
+}

packages/now-cli/test/dev/fixtures/monorepo-dynamic-paths/vercel.json

@@ -0,0 +1,12 @@
+{
+  "version": 2,
+  "builds": [
+    { "src": "blog/package.json", "use": "@vercel/next@canary" },
+    { "src": "home/package.json", "use": "@vercel/next@canary" }
+  ],
+  "routes": [
+    { "src": "/blog/_next(.*)", "dest": "blog/_next$1" },
+    { "src": "/blog(.*)", "dest": "blog/blog$1" },
+    { "src": "(.*)", "dest": "home$1" }
+  ]
+}

packages/now-cli/test/dev/fixtures/node-helpers/vercel.json

@@ -1 +1 @@
-{ "builds": [{ "src": "index.js", "use": "@vercel/node@canary" }] }
+{"builds":[{"src":"index.js","use":"@vercel/node@canary"}]}

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

@@ -0,0 +1,3 @@
+ # Created by Vercel CLI
+ VERCEL_REGION=""
+ VERCEL_URL=""

packages/now-cli/test/dev/fixtures/node-ts-node-target/api/array.js

@@ -0,0 +1,4 @@
+module.exports = (req, res) => {
+  const months = [...Array(12).keys()].map(month => month + 1);
+  res.json({ months });
+};

packages/now-cli/test/dev/fixtures/node-ts-node-target/api/dump.js

@@ -0,0 +1,6 @@
+module.exports = (req, res) => {
+  res.send({
+    env: process.env,
+    headers: req.headers,
+  });
+};

packages/now-cli/test/dev/fixtures/node-ts-node-target/api/subclass.js

@@ -0,0 +1,15 @@
+const { PCRE } = require('pcre-to-regexp');
+
+// `ts-node` default "target" is "es5" which transpiles `class` statements and
+// is incompatible with dependencies that use ES6 native `class`. Setting the
+// "target" to "es2018" or newer prevents the `class` transpilation.
+//
+// See: https://github.com/vercel/vercel/discussions/4724
+// See: https://github.com/TypeStrong/ts-node/issues/903
+class P extends PCRE {}
+
+export default (req, res) => {
+  const p = new P('hi'); // This line should not throw an error
+  console.log(p);
+  res.send({ ok: true });
+};

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

@@ -0,0 +1,15 @@
+{
+  "name": "node-ts-node-target",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "pcre-to-regexp": "1.1.0"
+  }
+}