Publish Canary

- @vercel/frameworks@0.2.1-canary.2
 - @vercel/build-utils@2.9.1-canary.2
 - vercel@21.2.4-canary.3
 - @vercel/client@9.0.7-canary.2

.github/CONTRIBUTING.md

@@ -94,12 +94,3 @@ Sometimes you want to test changes to a Builder against an existing project, may
 4. Run `vercel *.tgz` to upload the tarball file and get a URL
 5. Edit any existing `vercel.json` project and replace `use` with the URL
 6. Run `vercel` or `vercel dev` to deploy with the experimental Builder
-
-## Add a New Framework
-
-You can add support for a new Framework by creating a Pull Request for this repository and following the steps below:
-
-1. Add the Framework to the `@vercel/frameworks` package: The file is located in `./packages/frameworks/frameworks.json`. You can copy the structure of an existing one and adjust the required fields. Note that the `settings` property either contains a `value` or a `placeholder`. The `value` property is used when something is not configurable, the `placeholder` is used when something is configurable and can be changed with configuration. An example would be the Output Directory for Hugo, it's `public` by default but can be changed through its config file, so we use `placeholder` with an explanation of what can be used.
-2. Add an example to the `./examples` directory: The name of the directory should equal the slug of the framework used in `@vercel/frameworks`. The `.github/EXAMPLE_README_TEMPLATE.md` file can be used to create a `README.md` file for the example.
-3. Update the `@vercel/static-build` package: The file `./packages/now-static-build/src/frameworks.ts` has to be extended. You can add default routes that will always be applied to projects that use this Framework or specify some paths that will be cached to speed up the build process.
-4. After your Pull Request has been merged and released, other users can select the example on the Vercel dashboard and deploy it.

.github/ISSUE_TEMPLATE/config.yml

@@ -4,8 +4,8 @@ contact_links:
     url: https://vercel.com/support/request
     about: Report a bug using the Vercel support form
   - name: Feature Request
-    url: https://github.com/vercel/vercel/discussions/new?category_id=66161
+    url: https://github.com/vercel/vercel/discussions/new?category=ideas
     about: Share ideas for new features
   - name: Ask a Question
-    url: https://github.com/vercel/vercel/discussions/new?category_id=66160
+    url: https://github.com/vercel/vercel/discussions/new?category=help
     about: Ask the community for help

.github/workflows/publish.yml

@@ -17,7 +17,7 @@ jobs:
       with:
         node-version: 12
     - name: Install
-      run: yarn install --check-files --frozen-lockfile
+      run: yarn install --check-files --frozen-lockfile --network-timeout 1000000
     - name: Build
       run: yarn build
       env:

.github/workflows/test-integration-cli.yml

@@ -26,7 +26,7 @@ jobs:
       - run: git fetch origin master --depth=100
       - run: git fetch origin ${{ github.ref }} --depth=100
       - run: git diff origin/master...HEAD --name-only
-      - run: yarn install
+      - run: yarn install --network-timeout 1000000
       - run: yarn run build
       - uses: actions/setup-node@v1
         with:

.github/workflows/test-integration-dev.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   test:
     name: Dev
-    timeout-minutes: 45
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
@@ -29,7 +29,7 @@ jobs:
       - name: Install Hugo
         if: matrix.os == 'macos-latest'
         run: curl -L -O https://github.com/gohugoio/hugo/releases/download/v0.56.0/hugo_0.56.0_macOS-64bit.tar.gz && tar -xzf hugo_0.56.0_macOS-64bit.tar.gz && mv ./hugo packages/now-cli/test/dev/fixtures/08-hugo/
-      - run: yarn install
+      - run: yarn install --network-timeout 1000000
       - run: yarn run build
       - uses: actions/setup-node@v1
         with:

.github/workflows/test-integration-once.yml

@@ -21,7 +21,7 @@ jobs:
       - run: git fetch origin master --depth=100
       - run: git fetch origin ${{ github.ref }} --depth=100
       - run: git diff origin/master...HEAD --name-only
-      - run: yarn install
+      - run: yarn install --network-timeout 1000000
       - run: yarn run build
       - run: yarn test-integration-once --clean false
         env:

.github/workflows/test-unit.yml

@@ -29,7 +29,7 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node }}
-      - run: yarn install
+      - run: yarn install --network-timeout 1000000
       - run: yarn run build
       - run: yarn run lint
         if: matrix.os == 'ubuntu-latest' && matrix.node == 12 # only run lint once

api/frameworks.ts

@@ -12,6 +12,11 @@ const frameworks = (_frameworks as Framework[])
       ...frameworkItem,
       detectors: undefined,
       sort: undefined,
+      dependency: undefined,
+      defaultRoutes: undefined,
+      cachePattern: undefined,
+      devCommand: undefined,
+      buildCommand: undefined,
     };
 
     if (framework.logo) {

api/package.json

@@ -5,7 +5,7 @@
   "description": "API for the vercel/vercel repo",
   "main": "index.js",
   "scripts": {
-    "build": "yarn --cwd .. && node ../utils/run.js build all"
+    "vercel-build": "yarn --cwd .. && node ../utils/run.js build all"
   },
   "dependencies": {
     "@sentry/node": "5.11.1",

api/tsconfig.json

@@ -5,6 +5,7 @@
     "strict": false,
     "forceConsistentCasingInFileNames": true,
     "noEmit": true,
+    "noEmitOnError": true,
     "esModuleInterop": true,
     "module": "commonjs",
     "moduleResolution": "node",

errors/no-credentials-found.md

@@ -6,5 +6,5 @@ You're running Vercel CLI in a non-terminal context and there are no credentials
 
 #### Possible Ways to Fix It
 
-- Specify a value for the `--token` flag (this needs to be the token of the user account as which you'd like to act). You can either get the token from the `./vercel/auth.json` file located in your user directory or [from the dashboard](https://vercel.com/account/tokens).
-- Ensure that both `~/vercel/auth.json` and `~/vercel/config.json` exist
+- Specify a value for the `--token` flag (this needs to be the token of the user account as which you'd like to act). You can create a new token on your [Settings page](https://vercel.com/account/tokens).
+- Run `vercel login` to sign in and generate a new token

examples/gatsby/api/date.ts

@@ -1,4 +1,4 @@
-import { NowRequest, NowResponse } from '@now/node';
+import { NowRequest, NowResponse } from '@vercel/node';
 
 export default (_req: NowRequest, res: NowResponse) => {
   const date = new Date().toString();

examples/gatsby/package.json

@@ -12,7 +12,7 @@
     "react-helmet": "^5.2.0"
   },
   "devDependencies": {
-    "@now/node": "^1.3.0"
+    "@vercel/node": "1.8.5"
   },
   "scripts": {
     "dev": "gatsby develop",

examples/gatsby/yarn.lock

@@ -1107,15 +1107,6 @@
     "@nodelib/fs.scandir" "2.1.3"
     fastq "^1.6.0"
 
-"@now/node@^1.3.0":
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/@now/node/-/node-1.7.1.tgz#764a0c6bcb24967f8014c4f73ad238c292996fe3"
-  integrity sha512-+srVKopsVTPDR3u9eOjJryZroLTrPp8XEOuIDGBdfFcJuS7qpAomctSbfyA7WNyjC0ExtUxELqBg5sAedG5+2g==
-  dependencies:
-    "@types/node" "*"
-    ts-node "8.9.1"
-    typescript "3.9.3"
-
 "@pieh/friendly-errors-webpack-plugin@1.7.0-chalk-2":
   version "1.7.0-chalk-2"
   resolved "https://registry.yarnpkg.com/@pieh/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.0-chalk-2.tgz#2e9da9d3ade9d18d013333eb408c457d04eabac0"
@@ -1409,6 +1400,15 @@
   dependencies:
     wonka "^4.0.14"
 
+"@vercel/node@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@vercel/node/-/node-1.8.5.tgz#2c8b9532f1bb25734a9964c52973386ed78022d4"
+  integrity sha512-1iw7FSR8Oau6vZB1MWfBnA5q2a/IqRHiSZSbt8lz0dyTF599q8pc5GcSv/TvmrYaEGzh3+N0S4cbmuMCqVlwJg==
+  dependencies:
+    "@types/node" "*"
+    ts-node "8.9.1"
+    typescript "3.9.3"
+
 "@webassemblyjs/ast@1.9.0":
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"

examples/gridsome/package.json

@@ -8,6 +8,6 @@
     "explore": "gridsome explore"
   },
   "dependencies": {
-    "gridsome": "^0.6.0"
+    "gridsome": "0.7.23"
   }
 }

examples/hexo/package.json

@@ -3,18 +3,18 @@
   "version": "0.0.0",
   "private": true,
   "hexo": {
-    "version": "3.9.0"
+    "version": "5.3.0"
   },
   "dependencies": {
-    "hexo": "^3.9.0",
-    "hexo-generator-archive": "^0.1.5",
-    "hexo-generator-category": "^0.1.3",
-    "hexo-generator-index": "^0.2.1",
-    "hexo-generator-tag": "^0.2.0",
-    "hexo-renderer-ejs": "^0.3.1",
-    "hexo-renderer-stylus": "^0.3.3",
-    "hexo-renderer-marked": "^1.0.1",
-    "hexo-server": "^0.3.3"
+    "hexo": "^5.3.0",
+    "hexo-generator-archive": "^1.0.0",
+    "hexo-generator-category": "^1.0.0",
+    "hexo-generator-index": "^2.0.0",
+    "hexo-generator-tag": "^1.0.0",
+    "hexo-renderer-ejs": "^1.0.0",
+    "hexo-renderer-marked": "^3.3.0",
+    "hexo-renderer-stylus": "^2.0.1",
+    "hexo-server": "^2.0.0"
   },
   "scripts": {
     "dev": "hexo server -p $PORT",

examples/nextjs/README.md

@@ -14,6 +14,10 @@ Open [http://localhost:3000](http://localhost:3000) with your browser to see the
 
 You can start editing the page by modifying `pages/index.js`. The page auto-updates as you edit the file.
 
+[API routes](https://nextjs.org/docs/api-routes/introduction) can be accessed on [http://localhost:3000/api/hello](http://localhost:3000/api/hello). This endpoint can be edited in `pages/api/hello.js`.
+
+The `pages/api` directory is mapped to `/api/*`. Files in this directory are treated as [API routes](https://nextjs.org/docs/api-routes/introduction) instead of React pages.
+
 ## Learn More
 
 To learn more about Next.js, take a look at the following resources:

examples/nextjs/package.json

@@ -8,7 +8,7 @@
     "start": "next start"
   },
   "dependencies": {
-    "next": "10.0.0",
+    "next": "10.0.5",
     "react": "17.0.1",
     "react-dom": "17.0.1"
   }

examples/nextjs/styles/Home.module.css

@@ -76,7 +76,6 @@
   align-items: center;
   justify-content: center;
   flex-wrap: wrap;
-
   max-width: 800px;
   margin-top: 3rem;
 }

examples/zola/.gitignore

@@ -0,0 +1,2 @@
+/public
+/.vercel

examples/zola/config.toml

@@ -0,0 +1,16 @@
+# The URL the site will be built for
+base_url = "/"
+
+# Whether to automatically compile all Sass files in the sass directory
+compile_sass = true
+
+# Whether to build a search index to be used later on by a JavaScript library
+build_search_index = false
+
+[markdown]
+# Whether to do syntax highlighting
+# Theme can be customised by setting the `highlight_theme` variable to a theme supported by Zola
+highlight_code = false
+
+[extra]
+# Put all your custom variables here

examples/zola/content/blog/_index.md

@@ -0,0 +1,6 @@
++++
+title = "List of blog posts"
+sort_by = "date"
+template = "blog.html"
+page_template = "blog-page.html"
++++

examples/zola/content/blog/first.md

@@ -0,0 +1,6 @@
++++
+title = "My first post"
+date = 2019-11-27
++++
+
+This is my first blog post.

examples/zola/content/blog/second.md

@@ -0,0 +1,6 @@
++++
+title = "My second post"
+date = 2019-11-28
++++
+
+This is my second blog post.

examples/zola/templates/base.html

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8">
+  <title>MyBlog</title>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.8.0/css/bulma.min.css">
+</head>
+
+<body>
+  <section class="section">
+    <div class="container">
+      {% block content %} {% endblock %}
+    </div>
+  </section>
+</body>
+
+</html>

examples/zola/templates/blog-page.html

@@ -0,0 +1,9 @@
+{% extends "base.html" %}
+
+{% block content %}
+<h1 class="title">
+  {{ page.title }}
+</h1>
+<p class="subtitle"><strong>{{ page.date }}</strong></p>
+{{ page.content | safe }}
+{% endblock content %}

examples/zola/templates/blog.html

@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+
+{% block content %}
+<h1 class="title">
+  {{ section.title }}
+</h1>
+<ul>
+  {% for page in section.pages %}
+  <li><a href="{{ page.permalink | safe }}">{{ page.title }}</a></li>
+  {% endfor %}
+</ul>
+{% endblock content %}

examples/zola/templates/index.html

@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+
+{% block content %}
+<h1 class="title">
+  This is my blog made with Zola.
+</h1>
+<p>Click <a href="/blog/">here</a> to see my posts.</p>
+{% endblock content %}

package.json

@@ -39,7 +39,7 @@
     "publish-from-github": "./utils/publish.sh",
     "changelog": "node utils/changelog.js",
     "build": "node utils/run.js build all",
-    "now-build": "mkdir -p public && echo '<a href=\"https://vercel.com/import\">Import</a>' > public/output.html",
+    "vercel-build": "mkdir -p public && echo '<a href=\"https://vercel.com/import\">Import</a>' > public/output.html",
     "test-unit": "node utils/run.js test-unit",
     "test-integration-cli": "node utils/run.js test-integration-cli",
     "test-integration-once": "node utils/run.js test-integration-once",

packages/frameworks/frameworks.json

@@ -1,945 +0,0 @@
-[
-  {
-    "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",
-    "useRuntime": { "src": "package.json", "use": "@vercel/next" },
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"blitz\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "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.",
-    "description": "A Next.js app and a Serverless Function API.",
-    "website": "https://nextjs.org",
-    "sort": 1,
-    "useRuntime": { "src": "package.json", "use": "@vercel/next" },
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"next\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `next build`"
-      },
-      "devCommand": {
-        "value": "next dev --port $PORT"
-      },
-      "outputDirectory": {
-        "placeholder": "Next.js default"
-      }
-    },
-    "recommendedIntegrations": [
-      {
-        "id": "oac_5lUsiANun1DEzgLg0NZx5Es3",
-        "dependencies": ["next-plugin-sentry", "next-sentry-source-maps"]
-      }
-    ]
-  },
-  {
-    "name": "Gatsby.js",
-    "slug": "gatsby",
-    "demo": "https://gatsby.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/gatsby.svg",
-    "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": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"gatsby\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `gatsby build`"
-      },
-      "devCommand": {
-        "value": "gatsby develop --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "public"
-      }
-    }
-  },
-  {
-    "name": "Hexo",
-    "slug": "hexo",
-    "demo": "https://hexo.now-examples.now.sh",
-    "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",
-    "sort": 3,
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"hexo\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `hexo generate`"
-      },
-      "devCommand": {
-        "value": "hexo server --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "public"
-      }
-    }
-  },
-  {
-    "name": "Eleventy",
-    "slug": "eleventy",
-    "demo": "https://eleventy.now-examples.now.sh",
-    "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",
-    "sort": 4,
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@11ty\\/eleventy\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `npx @11ty/eleventy`"
-      },
-      "devCommand": {
-        "value": "npx @11ty/eleventy --serve --watch --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "_site"
-      }
-    }
-  },
-  {
-    "name": "Docusaurus 2",
-    "slug": "docusaurus-2",
-    "demo": "https://docusaurus-2.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/docusaurus.svg",
-    "tagline": "Docusaurus makes it easy to maintain Open Source documentation websites.",
-    "description": "A static Docusaurus site that makes it easy to maintain OSS documentation.",
-    "website": "https://v2.docusaurus.io",
-    "detectors": {
-      "some": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@docusaurus\\/core\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `docusaurus build`"
-      },
-      "devCommand": {
-        "value": "docusaurus start --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "build"
-      }
-    }
-  },
-  {
-    "name": "Docusaurus 1",
-    "slug": "docusaurus",
-    "demo": "https://docusaurus.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/docusaurus.svg",
-    "tagline": "Docusaurus makes it easy to maintain Open Source documentation websites.",
-    "description": "A static Docusaurus site that makes it easy to maintain OSS documentation.",
-    "website": "https://docusaurus.io/",
-    "detectors": {
-      "some": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"docusaurus\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `docusaurus-build`"
-      },
-      "devCommand": {
-        "value": "docusaurus-start --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "build"
-      }
-    }
-  },
-  {
-    "name": "Preact",
-    "slug": "preact",
-    "demo": "https://preact.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/preact.svg",
-    "tagline": "Preact is a fast 3kB alternative to React with the same modern API.",
-    "description": "A Preact app, created with the Preact CLI.",
-    "website": "https://preactjs.com",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"preact-cli\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `preact build`"
-      },
-      "devCommand": {
-        "value": "preact watch --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "build"
-      }
-    }
-  },
-  {
-    "name": "Dojo",
-    "slug": "dojo",
-    "demo": "https://dojo.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/dojo.png",
-    "tagline": "Dojo is a modern progressive, TypeScript first framework.",
-    "description": "A Dojo app, created with the Dojo CLI's cli-create-app command.",
-    "website": "https://dojo.io",
-    "detectors": {
-      "some": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@dojo\\/framework\":\\s*\".+?\"[^}]*}"
-        },
-        {
-          "path": ".dojorc"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `dojo build`"
-      },
-      "devCommand": {
-        "value": "dojo build -m dev -w -s -p $PORT"
-      },
-      "outputDirectory": {
-        "value": "output/dist"
-      }
-    }
-  },
-  {
-    "name": "Ember.js",
-    "slug": "ember",
-    "demo": "https://ember.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/ember.svg",
-    "tagline": "Ember.js helps webapp developers be more productive out of the box.",
-    "description": "An Ember app, created with the Ember CLI.",
-    "website": "https://emberjs.com/",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"ember-cli\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `ember build`"
-      },
-      "devCommand": {
-        "value": "ember serve --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "dist"
-      }
-    }
-  },
-  {
-    "name": "Vue.js",
-    "slug": "vue",
-    "demo": "https://vue.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/vue.svg",
-    "tagline": "Vue.js is a versatile JavaScript framework that is as approachable as it is performant.",
-    "description": "A Vue.js app, created with the Vue CLI.",
-    "website": "https://vuejs.org",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@vue\\/cli-service\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `vue-cli-service build`"
-      },
-      "devCommand": {
-        "value": "vue-cli-service serve --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "dist"
-      }
-    }
-  },
-  {
-    "name": "Scully",
-    "slug": "scully",
-    "demo": "https://scully.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/scullyio-logo.png",
-    "tagline": "Scully is a static site generator for Angular.",
-    "description": "The Static Site Generator for Angular apps.",
-    "website": "https://github.com/scullyio/scully",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@scullyio\\/init\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `ng build && scully`"
-      },
-      "devCommand": {
-        "value": "ng serve --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "dist"
-      }
-    }
-  },
-  {
-    "name": "Ionic Angular",
-    "slug": "ionic-angular",
-    "demo": "https://ionic-angular.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/ionic.svg",
-    "tagline": "Ionic Angular allows you to build mobile PWAs with Angular and the Ionic Framework.",
-    "description": "An Ionic Angular site, created with the Ionic CLI.",
-    "website": "https://ionicframework.com",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@ionic\\/angular\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `ng build`"
-      },
-      "devCommand": {
-        "value": "ng start"
-      },
-      "outputDirectory": {
-        "value": "www"
-      }
-    }
-  },
-  {
-    "name": "Angular",
-    "slug": "angular",
-    "demo": "https://angular.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/angular.svg",
-    "tagline": "Angular is a TypeScript-based cross-platform framework from Google.",
-    "description": "An Angular app, created with the Angular CLI.",
-    "website": "https://angular.io",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@angular\\/cli\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `ng build`"
-      },
-      "devCommand": {
-        "value": "ng serve --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "dist"
-      }
-    }
-  },
-  {
-    "name": "Polymer",
-    "slug": "polymer",
-    "demo": "https://polymer.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/polymer.svg",
-    "tagline": "Polymer is an open-source webapps library from Google, for building using Web Components.",
-    "description": "A Polymer app, created with the Polymer CLI.",
-    "website": "https://www.polymer-project.org/",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"polymer-cli\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `polymer build`"
-      },
-      "devCommand": {
-        "value": "polymer serve --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "build"
-      }
-    }
-  },
-  {
-    "name": "Svelte",
-    "slug": "svelte",
-    "demo": "https://svelte.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/svelte.svg",
-    "tagline": "Svelte lets you write high performance reactive apps with significantly less boilerplate. ",
-    "description": "A Svelte app, using the Svelte template, and a Serverless Function API.",
-    "website": "https://svelte.dev",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"sirv-cli\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `rollup -c`"
-      },
-      "devCommand": {
-        "value": "sirv public --single --dev --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "public"
-      }
-    }
-  },
-  {
-    "name": "Ionic React",
-    "slug": "ionic-react",
-    "demo": "https://ionic-react.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/ionic.svg",
-    "tagline": "Ionic React allows you to build mobile PWAs with React and the Ionic Framework.",
-    "description": "An Ionic React site, created with the Ionic CLI.",
-    "website": "https://ionicframework.com",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@ionic\\/react\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `react-scripts build`"
-      },
-      "devCommand": {
-        "value": "react-scripts start"
-      },
-      "outputDirectory": {
-        "value": "build"
-      }
-    }
-  },
-  {
-    "name": "Create React App",
-    "slug": "create-react-app",
-    "demo": "https://react-functions.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/react.svg",
-    "tagline": "Create React App allows you to get going with React in no time.",
-    "description": "A React app, bootstrapped with create-react-app, and a Serverless Function API.",
-    "website": "https://create-react-app.dev",
-    "detectors": {
-      "some": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"react-scripts\":\\s*\".+?\"[^}]*}"
-        },
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"react-dev-utils\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `react-scripts build`"
-      },
-      "devCommand": {
-        "value": "react-scripts start"
-      },
-      "outputDirectory": {
-        "value": "build"
-      }
-    }
-  },
-  {
-    "name": "Gridsome",
-    "slug": "gridsome",
-    "demo": "https://gridsome.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/gridsome.svg",
-    "tagline": "Gridsome is a Vue.js-powered framework for building websites & apps that are fast by default.",
-    "description": "A Gridsome app, created with the Gridsome CLI.",
-    "website": "https://gridsome.org/",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"gridsome\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `gridsome build`"
-      },
-      "devCommand": {
-        "value": "gridsome develop -p $PORT"
-      },
-      "outputDirectory": {
-        "value": "dist"
-      }
-    }
-  },
-  {
-    "name": "UmiJS",
-    "slug": "umijs",
-    "demo": "https://umijs.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/umi.svg",
-    "tagline": "UmiJS is an extensible enterprise-level React application framework.",
-    "description": "An UmiJS app, created using the Umi CLI.",
-    "website": "https://umijs.org",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"umi\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `umi build`"
-      },
-      "devCommand": {
-        "value": "umi dev --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "dist"
-      }
-    }
-  },
-  {
-    "name": "Sapper",
-    "slug": "sapper",
-    "demo": "https://sapper.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/svelte.svg",
-    "tagline": "Sapper is a framework for building high-performance universal web apps with Svelte.",
-    "description": "A Sapper app, using the Sapper template.",
-    "website": "https://sapper.svelte.dev",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"sapper\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `sapper export`"
-      },
-      "devCommand": {
-        "value": "sapper dev --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "__sapper__/export"
-      }
-    }
-  },
-  {
-    "name": "Saber",
-    "slug": "saber",
-    "demo": "https://saber.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/saber.svg",
-    "tagline": "Saber is a framework for building static sites in Vue.js that supports data from any source.",
-    "description": "A Saber site, created with npm init.",
-    "website": "https://saber.land/",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"saber\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `saber build`"
-      },
-      "devCommand": {
-        "value": "saber --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "public"
-      }
-    }
-  },
-  {
-    "name": "Stencil",
-    "slug": "stencil",
-    "demo": "https://stencil.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/stencil.svg",
-    "tagline": "Stencil is a powerful toolchain for building Progressive Web Apps and Design Systems.",
-    "description": "A Stencil site, created with the Stencil CLI.",
-    "website": "https://stenciljs.com/",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@stencil\\/core\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `stencil build`"
-      },
-      "devCommand": {
-        "value": "stencil build --dev --watch --serve --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "www"
-      }
-    }
-  },
-  {
-    "name": "Nuxt.js",
-    "slug": "nuxtjs",
-    "demo": "https://nuxtjs.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/nuxt.svg",
-    "tagline": "Nuxt.js is the web comprehensive framework that lets you dream big with Vue.js.",
-    "description": "A Nuxt.js app, bootstrapped with create-nuxt-app.",
-    "website": "https://nuxtjs.org",
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"nuxt(-edge)?\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `nuxt generate`"
-      },
-      "devCommand": {
-        "value": "nuxt"
-      },
-      "outputDirectory": {
-        "value": "dist"
-      }
-    }
-  },
-  {
-    "name": "RedwoodJS",
-    "slug": "redwoodjs",
-    "demo": "https://redwoodjs.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/redwoodjs.svg",
-    "tagline": "RedwoodJS is a full-stack framework for the Jamstack.",
-    "description": "A RedwoodJS app, bootstraped with create-redwood-app.",
-    "website": "https://redwoodjs.com",
-    "useRuntime": { "src": "package.json", "use": "@vercel/redwood" },
-    "ignoreRuntimes": ["@vercel/node"],
-    "detectors": {
-      "every": [
-        {
-          "path": "package.json",
-          "matchContent": "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"@redwoodjs\\/core\":\\s*\".+?\"[^}]*}"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "value": "yarn rw build && yarn rw db up --no-db-client --auto-approve && yarn rw dataMigrate up"
-      },
-      "devCommand": {
-        "value": "yarn rw dev --fwd=\"--port=$PORT --open=false\""
-      },
-      "outputDirectory": {
-        "placeholder": "RedwoodJS default"
-      }
-    }
-  },
-  {
-    "name": "Hugo",
-    "slug": "hugo",
-    "demo": "https://hugo.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/hugo.svg",
-    "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": [
-        {
-          "path": "config.yaml"
-        },
-        {
-          "path": "config.toml"
-        },
-        {
-          "path": "config.json"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "None"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `hugo -D --gc`"
-      },
-      "devCommand": {
-        "value": "hugo server -D -w -p $PORT"
-      },
-      "outputDirectory": {
-        "placeholder": "`public` or `publishDir` from the `config` file"
-      }
-    }
-  },
-  {
-    "name": "Jekyll",
-    "slug": "jekyll",
-    "demo": "https://jekyll.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/jekyll.svg",
-    "tagline": "Jekyll makes it super easy to transform your plain text into static websites and blogs.",
-    "description": "A Jekyll site, created with the Jekyll CLI.",
-    "website": "https://jekyllrb.com/",
-    "detectors": {
-      "every": [
-        {
-          "path": "_config.yml"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "value": "bundle install"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `jekyll build`"
-      },
-      "devCommand": {
-        "value": "bundle exec jekyll serve --watch --port $PORT"
-      },
-      "outputDirectory": {
-        "placeholder": "`_site` or `destination` from `_config.yml`"
-      }
-    }
-  },
-  {
-    "name": "Brunch",
-    "slug": "brunch",
-    "demo": "https://brunch.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/brunch.svg",
-    "tagline": "Brunch is a fast and simple webapp build tool with seamless incremental compilation for rapid development.",
-    "description": "A Brunch app, created with the Brunch CLI.",
-    "website": "https://brunch.io/",
-    "detectors": {
-      "every": [
-        {
-          "path": "brunch-config.js"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run build` or `brunch build --production`"
-      },
-      "devCommand": {
-        "value": "brunch watch --server --port $PORT"
-      },
-      "outputDirectory": {
-        "value": "public"
-      }
-    }
-  },
-  {
-    "name": "Middleman",
-    "slug": "middleman",
-    "demo": "https://middleman.now-examples.now.sh",
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/middleman.svg",
-    "tagline": "Middleman is a static site generator that uses all the shortcuts and tools in modern web development.",
-    "description": "A Middleman app, created with the Middleman CLI.",
-    "website": "https://middlemanapp.com/",
-    "detectors": {
-      "every": [
-        {
-          "path": "config.rb"
-        }
-      ]
-    },
-    "settings": {
-      "installCommand": {
-        "value": "bundle install"
-      },
-      "buildCommand": {
-        "value": "`npm run build` or `bundle exec middleman build`"
-      },
-      "devCommand": {
-        "value": "bundle exec middleman server -p $PORT"
-      },
-      "outputDirectory": {
-        "value": "build"
-      }
-    }
-  },
-  {
-    "name": "Other",
-    "slug": null,
-    "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/other.svg",
-    "description": "No framework or a unoptimized framework.",
-    "settings": {
-      "installCommand": {
-        "placeholder": "`yarn install` or `npm install`"
-      },
-      "buildCommand": {
-        "placeholder": "`npm run vercel-build` or `npm run build`"
-      },
-      "devCommand": {
-        "placeholder": "None"
-      },
-      "outputDirectory": {
-        "placeholder": "`public` if it exists, or `.`"
-      }
-    }
-  }
-]

packages/frameworks/index.d.ts

@@ -1,38 +0,0 @@
-export interface FrameworkDetectionItem {
-  path: string;
-  matchContent?: string;
-}
-
-export interface SettingPlaceholder {
-  placeholder: string;
-}
-export interface SettingValue {
-  value: string;
-}
-export type Setting = SettingValue | SettingPlaceholder;
-
-export interface Framework {
-  name: string;
-  slug: string | null;
-  logo: string;
-  demo?: string;
-  tagline?: string;
-  website?: string;
-  description: string;
-  sort?: number;
-  useRuntime?: { src: string; use: string };
-  ignoreRuntimes?: string[];
-  detectors?: {
-    every?: FrameworkDetectionItem[];
-    some?: FrameworkDetectionItem[];
-  };
-  settings: {
-    buildCommand: Setting;
-    devCommand: Setting;
-    outputDirectory: Setting;
-  };
-  recommendedIntegrations?: {
-    id: string;
-    dependencies: string[];
-  }[];
-}

packages/frameworks/package.json

@@ -1,14 +1,26 @@
 {
   "name": "@vercel/frameworks",
-  "version": "0.2.0",
-  "main": "frameworks.json",
+  "version": "0.2.1-canary.2",
+  "main": "./dist/frameworks.js",
+  "types": "./dist/frameworks.d.ts",
+  "files": [
+    "dist"
+  ],
   "license": "UNLICENSED",
   "scripts": {
+    "build": "tsc",
     "test-unit": "jest --env node --verbose --runInBand --bail"
   },
+  "dependencies": {
+    "@iarna/toml": "2.2.3",
+    "js-yaml": "3.13.1"
+  },
   "devDependencies": {
     "@types/jest": "24.0.22",
+    "@types/js-yaml": "3.12.1",
     "@types/node": "12.0.4",
+    "@types/node-fetch": "2.5.8",
+    "@vercel/routing-utils": "1.9.3-canary.0",
     "ajv": "6.12.2",
     "jest": "24.9.0",
     "ts-jest": "24.1.0",

packages/frameworks/src/read-config-file.ts

@@ -0,0 +1,41 @@
+import yaml from 'js-yaml';
+import toml from '@iarna/toml';
+import { promises } from 'fs';
+
+const { readFile } = promises;
+
+async function readFileOrNull(file: string) {
+  try {
+    const data = await readFile(file);
+    return data;
+  } catch (err) {
+    if (err.code !== 'ENOENT') {
+      throw err;
+    }
+  }
+
+  return null;
+}
+
+export async function readConfigFile<T>(
+  files: string | string[]
+): Promise<T | null> {
+  files = Array.isArray(files) ? files : [files];
+
+  for (const name of files) {
+    const data = await readFileOrNull(name);
+
+    if (data) {
+      const str = data.toString('utf8');
+      if (name.endsWith('.json')) {
+        return JSON.parse(str) as T;
+      } else if (name.endsWith('.toml')) {
+        return (toml.parse(str) as unknown) as T;
+      } else if (name.endsWith('.yaml') || name.endsWith('.yml')) {
+        return yaml.safeLoad(str, { filename: name }) as T;
+      }
+    }
+  }
+
+  return null;
+}

packages/frameworks/src/types.ts

@@ -0,0 +1,179 @@
+import { Route } from '@vercel/routing-utils';
+
+export interface FrameworkDetectionItem {
+  /**
+   * A file path
+   * @example "package.json"
+   */
+  path: string;
+  /**
+   * A matcher
+   * @example "\"(dev)?(d|D)ependencies\":\\s*{[^}]*\"next\":\\s*\".+?\"[^}]*}"
+   */
+  matchContent?: string;
+}
+
+export interface SettingPlaceholder {
+  /**
+   * A placeholder value for when the framework has not a predefined one
+   * @example "`npm run build` or `next build`"
+   */
+  placeholder: string;
+}
+
+export interface SettingValue {
+  /**
+   * A predefined setting for the detected framework
+   * @example "next dev --port $PORT"
+   */
+  value: string;
+}
+
+export type Setting = SettingValue | SettingPlaceholder;
+
+/**
+ * Framework detection information.
+ */
+export interface Framework {
+  /**
+   * Name of the framework
+   * @example "Next.js"
+   */
+  name: string;
+  /**
+   * A unique identifier for the framework
+   * @example "nextjs"
+   */
+  slug: string | null;
+  /**
+   * A URL to the logo of the framework
+   * @example "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/next.svg"
+   */
+  logo: string;
+  /**
+   * A URL to a deployed example of the framework
+   * @example "https://nextjs.now-examples.vercel.app"
+   */
+  demo?: string;
+  /**
+   * A marketing tagline for the framework
+   * @example "Next.js makes you productive with React instantly — whether you want to build static or dynamic sites."
+   */
+  tagline?: string;
+  /**
+   * A URL to the official website of the framework
+   * @example "https://nextjs.org"
+   */
+  website?: string;
+  /**
+   * Short description of the framework
+   * @example "A Next.js app and a Serverless Function API."
+   */
+  description: string;
+  /**
+   * A ponderated value to sort matching frameworks
+   * @example 1
+   */
+  sort?: number;
+  /**
+   * Runtime configuration required to run the framework in Vercel
+   */
+  useRuntime?: {
+    /**
+     * Runtime source
+     * @example "package.json"
+     */
+    src: string;
+    /**
+     * Runtime
+     * @example "@vercel/next"
+     */
+    use: string;
+  };
+  ignoreRuntimes?: string[];
+  /**
+   * Detectors used to find out the framework
+   */
+  detectors?: {
+    /**
+     * Collection of detectors that must be matched for the framework
+     * to be detected.
+     */
+    every?: FrameworkDetectionItem[];
+    /**
+     * Collection of detectors where one match triggers the framework
+     * to be detected.
+     */
+    some?: FrameworkDetectionItem[];
+  };
+  settings: {
+    /**
+     * Default Install Command or a placeholder
+     */
+    installCommand: Setting;
+    /**
+     * Default Build Command or a placeholder
+     */
+    buildCommand: Setting;
+    /**
+     * Default Development Command or a placeholder
+     */
+    devCommand: Setting;
+    /**
+     * Default Output Directory
+     */
+    outputDirectory: Setting;
+  };
+  /**
+   * A list of recommended integrations for the framework
+   */
+  recommendedIntegrations?: {
+    /**
+     * Id of the recommended integration
+     * @example "oac_5lUsiANun1DEzgLg0NZx5Es3"
+     */
+    id: string;
+    /**
+     * Dependencies of the recommended integration
+     * @example ["next-plugin-sentry", "next-sentry-source-maps"]
+     */
+    dependencies: string[];
+  }[];
+  /**
+   * Name of a dependency in `package.json` to detect this framework.
+   * @example "hexo"
+   */
+  dependency?: string;
+  /**
+   * Function that returns the name of the directory that the framework outputs
+   * its build results to. In some cases this is read from a configuration file.
+   */
+  getOutputDirName: (dirPrefix: string) => Promise<string>;
+  /**
+   * An array (or a function that returns an array) of default `Route` rules that
+   * the framework uses.
+   * @example [{ handle: 'filesystem' }, { src: '.*', status: 404, dest: '404.html' }]
+   */
+  defaultRoutes?: Route[] | ((dirPrefix: string) => Promise<Route[]>);
+  /**
+   * A glob string of files to cache for future deployments.
+   * @example ".cache/**"
+   */
+  cachePattern?: string;
+  /**
+   * The default build command for the framework.
+   * @example "next build"
+   */
+  buildCommand: string | null;
+  /**
+   * The default development command for the framework.
+   * @example "next dev"
+   */
+  devCommand: string | null;
+  /**
+   * The default version of the framework command that is available within the
+   * build image. Usually an environment variable can be set to override this.
+   * @example "0.13.0"
+   */
+  defaultVersion?: string;
+}

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

@@ -1,9 +1,11 @@
 import Ajv from 'ajv';
+import assert from 'assert';
 import { join } from 'path';
 import { existsSync } from 'fs';
 import { isString } from 'util';
-import { Framework } from '../';
-const frameworkList = require('../frameworks.json') as Framework[];
+import fetch from 'node-fetch';
+import { URL, URLSearchParams } from 'url';
+import frameworkList from '../src/frameworks';
 
 const SchemaFrameworkDetectionItem = {
   type: 'array',
@@ -53,8 +55,15 @@ const Schema = {
   type: 'array',
   items: {
     type: 'object',
-    required: ['name', 'slug', 'logo', 'description', 'settings'],
-    additionalProperties: false,
+    required: [
+      'name',
+      'slug',
+      'logo',
+      'description',
+      'settings',
+      'buildCommand',
+      'devCommand',
+    ],
     properties: {
       name: { type: 'string' },
       slug: { type: ['string', 'null'] },
@@ -122,10 +131,25 @@ const Schema = {
           },
         },
       },
+
+      dependency: { type: 'string' },
+      cachePattern: { type: 'string' },
+      buildCommand: { type: ['string', 'null'] },
+      devCommand: { type: ['string', 'null'] },
     },
   },
 };
 
+async function getDeployment(host: string) {
+  const query = new URLSearchParams();
+  query.set('url', host);
+  const res = await fetch(
+    `https://api.vercel.com/v11/deployments/get?${query}`
+  );
+  const body = await res.json();
+  return body;
+}
+
 describe('frameworks', () => {
   it('ensure there is an example for every framework', async () => {
     const root = join(__dirname, '..', '..', '..');
@@ -173,4 +197,30 @@ describe('frameworks', () => {
       }
     });
   });
+
+  it('ensure unique slug', async () => {
+    const slugs = new Set<string>();
+    for (const { slug } of frameworkList) {
+      if (typeof slug === 'string') {
+        assert(!slugs.has(slug), `Slug "${slug}" is not unique`);
+        slugs.add(slug);
+      }
+    }
+  });
+
+  it('ensure all demo URLs are "public"', async () => {
+    await Promise.all(
+      frameworkList
+        .filter(f => typeof f.demo === 'string')
+        .map(async f => {
+          const url = new URL(f.demo!);
+          const deployment = await getDeployment(url.hostname);
+          assert.equal(
+            deployment.public,
+            true,
+            `Demo URL ${f.demo} is not "public"`
+          );
+        })
+    );
+  });
 });

packages/frameworks/tsconfig.json

@@ -15,6 +15,6 @@
     "strict": true,
     "target": "esnext"
   },
-  "include": ["src/**/*", "test/**/*"],
+  "include": ["src/*.ts"],
   "exclude": ["node_modules"]
 }

packages/now-build-utils/build.js

@@ -0,0 +1,30 @@
+#!/usr/bin/env node
+const fs = require('fs-extra');
+const execa = require('execa');
+const { join } = require('path');
+
+async function main() {
+  const outDir = join(__dirname, 'dist');
+
+  // Start fresh
+  await fs.remove(outDir);
+
+  // Compile TypeScript
+  await execa('tsc', [], { stdio: 'inherit' });
+
+  // Run `ncc`
+  const mainDir = join(outDir, 'main');
+  await execa('ncc', ['build', 'src/index.ts', '-o', mainDir], {
+    stdio: 'inherit',
+  });
+  // Move compiled ncc file to out dir
+  await fs.rename(join(mainDir, 'index.js'), join(outDir, 'index.js'));
+
+  // Delete leftover "main" dir
+  await fs.remove(mainDir);
+}
+
+main().catch(err => {
+  console.error(err);
+  process.exit(1);
+});

packages/now-build-utils/build.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-out="dist"
-
-rm -rf "$out"
-
-tsc
-
-rm "$out/index.js"
-ncc build "src/index.ts" -o "$out/main"
-mv "$out/main/index.js" "$out/index.js"
-rm -rf "$out/main"

packages/now-build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.6.0",
+  "version": "2.9.1-canary.2",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -11,10 +11,10 @@
     "directory": "packages/now-build-utils"
   },
   "scripts": {
-    "build": "./build.sh",
+    "build": "node build",
     "test-unit": "jest --env node --verbose --runInBand --bail test/unit.*test.*",
     "test-integration-once": "jest --env node --verbose --runInBand --bail test/integration.test.js",
-    "prepublishOnly": "./build.sh"
+    "prepublishOnly": "node build"
   },
   "devDependencies": {
     "@iarna/toml": "2.2.3",
@@ -29,7 +29,7 @@
     "@types/node-fetch": "^2.1.6",
     "@types/semver": "6.0.0",
     "@types/yazl": "^2.4.1",
-    "@vercel/frameworks": "0.2.0",
+    "@vercel/frameworks": "0.2.1-canary.2",
     "@vercel/ncc": "0.24.0",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",

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

@@ -2,10 +2,9 @@ import minimatch from 'minimatch';
 import { valid as validSemver } from 'semver';
 import { parse as parsePath, extname } from 'path';
 import { Route, Source } from '@vercel/routing-utils';
-import _frameworks, { Framework } from '@vercel/frameworks';
+import frameworkList, { Framework } from '@vercel/frameworks';
 import { PackageJson, Builder, Config, BuilderFunctions } from './types';
 import { isOfficialRuntime } from './';
-const frameworkList = _frameworks as Framework[];
 const slugToFramework = new Map<string | null, Framework>(
   frameworkList.map(f => [f.slug, f])
 );
@@ -43,9 +42,8 @@ export function sortFiles(fileA: string, fileB: string) {
 export function detectApiExtensions(builders: Builder[]): Set<string> {
   return new Set<string>(
     builders
-      .filter(
-        b =>
-          b.config && b.config.zeroConfig && b.src && b.src.startsWith('api/')
+      .filter((b): b is Builder & { src: string } =>
+        Boolean(b.config && b.config.zeroConfig && b.src?.startsWith('api/'))
       )
       .map(b => extname(b.src))
       .filter(Boolean)
@@ -56,22 +54,28 @@ export function detectApiDirectory(builders: Builder[]): string | null {
   // TODO: We eventually want to save the api directory to
   // builder.config.apiDirectory so it is only detected once
   const found = builders.some(
-    b => b.config && b.config.zeroConfig && b.src.startsWith('api/')
+    b => b.config && b.config.zeroConfig && b.src?.startsWith('api/')
   );
   return found ? 'api' : null;
 }
 
 // TODO: Replace this function with `config.outputDirectory`
-function getPublicBuilder(builders: Builder[]): Builder | null {
-  const builder = builders.find(
-    builder =>
+function getPublicBuilder(
+  builders: Builder[]
+): (Builder & { src: string }) | null {
+  for (const builder of builders) {
+    if (
+      typeof builder.src === 'string' &&
       isOfficialRuntime('static', builder.use) &&
       /^.*\/\*\*\/\*$/.test(builder.src) &&
       builder.config &&
       builder.config.zeroConfig === true
-  );
+    ) {
+      return builder as Builder & { src: string };
+    }
+  }
 
-  return builder || null;
+  return null;
 }
 export function detectOutputDirectory(builders: Builder[]): string | null {
   // TODO: We eventually want to save the output directory to
@@ -361,7 +365,7 @@ function maybeGetApiBuilder(
     return null;
   }
 
-  const match = apiMatches.find(({ src }) => {
+  const match = apiMatches.find(({ src = '**' }) => {
     return src === fileName || minimatch(fileName, src);
   });
 
@@ -989,7 +993,6 @@ function getRouteResult(
         rewriteRoutes.push({
           src: '^/api(/.*)?$',
           status: 404,
-          continue: true,
         });
       }
     } else {

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

@@ -3,7 +3,7 @@ import { DetectorFilesystem } from './detectors/filesystem';
 
 export interface DetectFrameworkOptions {
   fs: DetectorFilesystem;
-  frameworkList: Framework[];
+  frameworkList: readonly Framework[];
 }
 
 async function matches(fs: DetectorFilesystem, framework: Framework) {

packages/now-build-utils/src/fs/node-version.ts

@@ -4,28 +4,34 @@ import { NodeVersion } from '../types';
 import { NowBuildError } from '../errors';
 import debug from '../debug';
 
-const allOptions: NodeVersion[] = [
+const allOptions = [
+  { major: 14, range: '14.x', runtime: 'nodejs14.x' },
   { major: 12, range: '12.x', runtime: 'nodejs12.x' },
-  { major: 10, range: '10.x', runtime: 'nodejs10.x' },
+  {
+    major: 10,
+    range: '10.x',
+    runtime: 'nodejs10.x',
+    discontinueDate: new Date('2021-03-30'),
+  },
   {
     major: 8,
     range: '8.10.x',
     runtime: 'nodejs8.10',
     discontinueDate: new Date('2020-01-06'),
   },
-];
+] as const;
 
 const pleaseSet =
-  'Please set "engines": { "node": "' +
+  'Please change your Project Settings or set "engines": { "node": "' +
   getLatestNodeVersion().range +
-  '" } in your `package.json` file to upgrade to Node.js ' +
+  '" } in your `package.json` file to use Node.js ' +
   getLatestNodeVersion().major +
   '.';
 const upstreamProvider =
   'This change is the result of a decision made by an upstream infrastructure provider (AWS).' +
   '\nRead more: https://docs.aws.amazon.com/lambda/latest/dg/runtime-support-policy.html';
 
-export function getLatestNodeVersion(): NodeVersion {
+export function getLatestNodeVersion() {
   return allOptions[0];
 }
 
@@ -37,7 +43,7 @@ export async function getSupportedNodeVersion(
   engineRange?: string,
   isAuto?: boolean
 ): Promise<NodeVersion> {
-  let selection = getLatestNodeVersion();
+  let selection: NodeVersion = getLatestNodeVersion();
 
   if (engineRange) {
     const found =

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

@@ -165,8 +165,8 @@ export function getSpawnOptions(
 export async function getNodeVersion(
   destPath: string,
   _nodeVersion?: string,
-  _config?: Config,
-  meta?: Meta
+  config: Config = {},
+  meta: Meta = {}
 ): Promise<NodeVersion> {
   if (meta && meta.isDev) {
     // Use the system-installed version of `node` in PATH for `vercel dev`
@@ -174,13 +174,22 @@ export async function getNodeVersion(
     return { ...latest, runtime: 'nodejs' };
   }
   const { packageJson } = await scanParentDirs(destPath, true);
-  let range: string | undefined;
+  let { nodeVersion } = config;
   let isAuto = true;
   if (packageJson && packageJson.engines && packageJson.engines.node) {
-    range = packageJson.engines.node;
+    if (
+      nodeVersion &&
+      nodeVersion !== packageJson.engines.node &&
+      !meta.isDev
+    ) {
+      console.warn(
+        'Warning: Due to `engines` existing in your `package.json` file, the Node.js Version defined in your Project Settings will not apply. Learn More: http://vercel.link/node-version'
+      );
+    }
+    nodeVersion = packageJson.engines.node;
     isAuto = false;
   }
-  return getSupportedNodeVersion(range, isAuto);
+  return getSupportedNodeVersion(nodeVersion, isAuto);
 }
 
 async function scanParentDirs(destPath: string, readPackageJson = false) {
@@ -292,6 +301,11 @@ export async function runNpmInstall(
     opts.prettyCommand = 'yarn install';
     command = 'yarn';
     commandArgs = ['install', ...args];
+
+    // Yarn v2 PnP mode may be activated, so force "node-modules" linker style
+    if (!env.YARN_NODE_LINKER) {
+      env.YARN_NODE_LINKER = 'node-modules';
+    }
   }
 
   if (process.env.NPM_ONLY_PRODUCTION) {
@@ -388,10 +402,17 @@ export async function runPackageJsonScript(
       prettyCommand,
     });
   } else {
+    // Yarn v2 PnP mode may be activated, so force "node-modules" linker style
+    const env: typeof process.env = { ...process.env, ...spawnOpts?.env };
+    if (!env.YARN_NODE_LINKER) {
+      env.YARN_NODE_LINKER = 'node-modules';
+    }
+
     const prettyCommand = `yarn run ${scriptName}`;
     console.log(`Running "${prettyCommand}"`);
     await spawnAsync('yarn', ['run', scriptName], {
       ...spawnOpts,
+      env,
       cwd: destPath,
       prettyCommand,
     });

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

@@ -336,7 +336,7 @@ export interface NodeVersion {
 
 export interface Builder {
   use: string;
-  src: string;
+  src?: string;
   config?: Config;
 }
 

packages/now-build-utils/test/fixtures/19-yarn-v2/.gitignore

@@ -1,3 +1,4 @@
+/env.txt
 /node_modules/
 /public/build/
 

packages/now-build-utils/test/fixtures/19-yarn-v2/api/index.js

@@ -0,0 +1,5 @@
+const { camelCase } = require('camel-case');
+
+module.exports = (req, res) => {
+  res.end(camelCase('camel-case module is working'));
+};

packages/now-build-utils/test/fixtures/19-yarn-v2/now.json

@@ -1,5 +0,0 @@
-{
-  "version": 2,
-  "builds": [{ "src": "package.json", "use": "@vercel/static-build" }],
-  "probes": [{ "path": "/", "mustContain": "Svelte app" }]
-}

packages/now-build-utils/test/fixtures/19-yarn-v2/package.json

@@ -4,7 +4,8 @@
   "scripts": {
     "build": "rollup -c",
     "dev": "rollup -c -w",
-    "start": "sirv public"
+    "start": "sirv public",
+    "env": "echo \"$PATH\" > env.txt"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^12.0.0",
@@ -16,6 +17,7 @@
     "svelte": "^3.0.0"
   },
   "dependencies": {
+    "camel-case": "^4.1.2",
     "sirv-cli": "^0.4.4"
   }
 }

packages/now-build-utils/test/fixtures/19-yarn-v2/vercel.json

@@ -0,0 +1,11 @@
+{
+  "version": 2,
+  "builds": [
+    { "src": "package.json", "use": "@vercel/static-build" },
+    { "src": "api/index.js", "use": "@vercel/node" }
+  ],
+  "probes": [
+    { "path": "/", "mustContain": "Svelte app" },
+    { "path": "/api", "mustContain": "camelCaseModuleIsWorking" }
+  ]
+}

packages/now-build-utils/test/fixtures/19-yarn-v2/yarn.lock

@@ -270,6 +270,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"camel-case@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "camel-case@npm:4.1.2"
+  dependencies:
+    pascal-case: ^3.1.2
+    tslib: ^2.0.3
+  checksum: 3/0b8dcfb424c9497e45984b88ef005c66bdf8e877e36365aedfc3cf73182684fde5a14cf2c526579c0351a5f27dc39a00f1edecc25d43606075fea948c504e37f
+  languageName: node
+  linkType: hard
+
 "caseless@npm:~0.12.0":
   version: 0.12.0
   resolution: "caseless@npm:0.12.0"
@@ -850,6 +860,15 @@ fsevents@~2.1.2:
   languageName: node
   linkType: hard
 
+"lower-case@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "lower-case@npm:2.0.2"
+  dependencies:
+    tslib: ^2.0.3
+  checksum: 3/aabaca9cef65f7564a1005b625664527e4d169e363101e65773f8f6ff2fdcf09884a3bc02990cd7a62cf05f3538114af25ee7bef553f1ca3208c8a77ac75cbfa
+  languageName: node
+  linkType: hard
+
 "magic-string@npm:^0.25.2":
   version: 0.25.7
   resolution: "magic-string@npm:0.25.7"
@@ -944,6 +963,16 @@ fsevents@~2.1.2:
   languageName: node
   linkType: hard
 
+"no-case@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "no-case@npm:3.0.4"
+  dependencies:
+    lower-case: ^2.0.2
+    tslib: ^2.0.3
+  checksum: 3/84db4909caec37504c6655f995a004067f8733be8cd8d849f1578661b60a1685e086325fa4e1a5e8ce94e7416c1d0f037e2a00f635a14457183de80ab4fc7612
+  languageName: node
+  linkType: hard
+
 "node-gyp@npm:latest":
   version: 6.1.0
   resolution: "node-gyp@npm:6.1.0"
@@ -1057,6 +1086,16 @@ fsevents@~2.1.2:
   languageName: node
   linkType: hard
 
+"pascal-case@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "pascal-case@npm:3.1.2"
+  dependencies:
+    no-case: ^3.0.4
+    tslib: ^2.0.3
+  checksum: 3/31708cecab221482edc81e2bd9b9d8282d72d4f1443b31f39725aa23768c5e42d93c4c014f1bc90f7f074e2a70d5091e4892ea370e550affc9ccf1d33c900bcd
+  languageName: node
+  linkType: hard
+
 "path-is-absolute@npm:^1.0.0":
   version: 1.0.1
   resolution: "path-is-absolute@npm:1.0.1"
@@ -1447,6 +1486,7 @@ fsevents@~2.1.2:
   dependencies:
     "@rollup/plugin-commonjs": ^12.0.0
     "@rollup/plugin-node-resolve": ^8.0.0
+    camel-case: ^4.1.2
     rollup: ^2.3.4
     rollup-plugin-livereload: ^1.0.0
     rollup-plugin-svelte: ^5.0.3
@@ -1517,6 +1557,13 @@ fsevents@~2.1.2:
   languageName: node
   linkType: hard
 
+"tslib@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "tslib@npm:2.0.3"
+  checksum: 3/447bfca5deaa157806c3f77eaba74d05dd0b38b014e47ce79d98b5c77ce7d91b00a687ba13ca1b5a74d35ca1098ac7a072c0a97fad06f0266612f2a03a6c8e8f
+  languageName: node
+  linkType: hard
+
 "tunnel-agent@npm:^0.6.0":
   version: 0.6.0
   resolution: "tunnel-agent@npm:0.6.0"

packages/now-build-utils/test/integration.test.js

@@ -39,7 +39,7 @@ for (const fixture of fs.readdirSync(fixturesPath)) {
 
 // few foreign tests
 
-const buildersToTestWith = ['now-next', 'now-node', 'now-static-build'];
+const buildersToTestWith = ['now-node'];
 
 // eslint-disable-next-line no-restricted-syntax
 for (const builder of buildersToTestWith) {

packages/now-build-utils/test/pkg-engine-node/package.json

@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "engines": {
+    "node": "14.x"
+  }
+}

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

@@ -182,7 +182,7 @@ describe('Test `detectBuilders`', () => {
 
     const { builders } = await detectBuilders(files);
     expect(builders!.length).toBe(7);
-    expect(builders!.some(b => b.src.endsWith('_test.go'))).toBe(false);
+    expect(builders!.some(b => b.src!.endsWith('_test.go'))).toBe(false);
   });
 
   it('just public', async () => {
@@ -1341,7 +1341,7 @@ describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
       featHandleMiss,
     });
     expect(builders!.length).toBe(7);
-    expect(builders!.some(b => b.src.endsWith('_test.go'))).toBe(false);
+    expect(builders!.some(b => b.src!.endsWith('_test.go'))).toBe(false);
     expect(errorRoutes!.length).toBe(1);
     expect((errorRoutes![0] as Source).status).toBe(404);
   });
@@ -2393,7 +2393,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
     expect(errorRoutes).toStrictEqual([
@@ -2495,7 +2494,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2533,7 +2531,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2571,7 +2568,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2604,7 +2600,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2632,7 +2627,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2663,7 +2657,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2690,7 +2683,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`', async () => {
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2725,7 +2717,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
     expect(errorRoutes).toStrictEqual([
@@ -2820,7 +2811,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2853,7 +2843,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2887,7 +2876,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2913,7 +2901,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2937,7 +2924,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2962,7 +2948,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -2983,7 +2968,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`', async ()
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -3018,7 +3002,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
 
@@ -3076,7 +3059,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -3109,7 +3091,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -3143,7 +3124,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -3162,7 +3142,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -3186,7 +3165,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -3211,7 +3189,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }
@@ -3232,7 +3209,6 @@ it('Test `detectRoutes` with `featHandleMiss=true`, `cleanUrls=true`, `trailingS
       {
         status: 404,
         src: '^/api(/.*)?$',
-        continue: true,
       },
     ]);
   }

packages/now-build-utils/test/unit.framework-detector.test.ts

@@ -1,14 +1,6 @@
-import path from 'path';
-import { readFileSync } from 'fs-extra';
-import { Framework } from '@vercel/frameworks';
+import frameworkList from '@vercel/frameworks';
 import { detectFramework, DetectorFilesystem } from '../src';
 
-const frameworkList = JSON.parse(
-  readFileSync(
-    path.join(__dirname, '..', '..', 'frameworks', 'frameworks.json')
-  ).toString()
-) as Framework[];
-
 class VirtualFilesystem extends DetectorFilesystem {
   private files: Map<string, Buffer>;
 

packages/now-build-utils/test/unit.test.js

@@ -1,3 +1,4 @@
+const ms = require('ms');
 const path = require('path');
 const fs = require('fs-extra');
 const assert = require('assert').strict;
@@ -8,6 +9,8 @@ const {
   getNodeVersion,
   getLatestNodeVersion,
   getDiscontinuedNodeVersions,
+  runNpmInstall,
+  runPackageJsonScript,
 } = require('../dist');
 
 async function expectBuilderError(promise, pattern) {
@@ -24,6 +27,19 @@ async function expectBuilderError(promise, pattern) {
   );
 }
 
+let warningMessages;
+const originalConsoleWarn = console.warn;
+beforeEach(() => {
+  warningMessages = [];
+  console.warn = m => {
+    warningMessages.push(m);
+  };
+});
+
+afterEach(() => {
+  console.warn = originalConsoleWarn;
+});
+
 it('should re-create symlinks properly', async () => {
   if (process.platform === 'win32') {
     console.log('Skipping test on windows');
@@ -81,6 +97,10 @@ it('should only match supported node versions', async () => {
     'major',
     12
   );
+  expect(await getSupportedNodeVersion('14.x', false)).toHaveProperty(
+    'major',
+    14
+  );
   expect(getSupportedNodeVersion('8.11.x', false)).rejects.toThrow();
   expect(getSupportedNodeVersion('6.x', false)).rejects.toThrow();
   expect(getSupportedNodeVersion('999.x', false)).rejects.toThrow();
@@ -104,6 +124,10 @@ it('should only match supported node versions', async () => {
     'major',
     12
   );
+  expect(await getSupportedNodeVersion('14.x', true)).toHaveProperty(
+    'major',
+    14
+  );
   const foundMessage = /Found `engines` in `package\.json` with an invalid Node\.js version range/;
   await expectBuilderError(
     getSupportedNodeVersion('8.11.x', false),
@@ -125,8 +149,8 @@ it('should match all semver ranges', async () => {
   // See https://docs.npmjs.com/files/package.json#engines
   expect(await getSupportedNodeVersion('10.0.0')).toHaveProperty('major', 10);
   expect(await getSupportedNodeVersion('10.x')).toHaveProperty('major', 10);
-  expect(await getSupportedNodeVersion('>=10')).toHaveProperty('major', 12);
-  expect(await getSupportedNodeVersion('>=10.3.0')).toHaveProperty('major', 12);
+  expect(await getSupportedNodeVersion('>=10')).toHaveProperty('major', 14);
+  expect(await getSupportedNodeVersion('>=10.3.0')).toHaveProperty('major', 14);
   expect(await getSupportedNodeVersion('8.5.0 - 10.5.0')).toHaveProperty(
     'major',
     10
@@ -150,20 +174,57 @@ it('should ignore node version in vercel dev getNodeVersion()', async () => {
   ).toHaveProperty('runtime', 'nodejs');
 });
 
+it('should select project setting from config when no package.json is found', async () => {
+  expect(
+    await getNodeVersion('/tmp', undefined, { nodeVersion: '14.x' }, {})
+  ).toHaveProperty('range', '14.x');
+  expect(warningMessages).toStrictEqual([]);
+});
+
+it('should prefer package.json engines over project setting from config and warn', async () => {
+  expect(
+    await getNodeVersion(
+      path.join(__dirname, 'pkg-engine-node'),
+      undefined,
+      { nodeVersion: '12.x' },
+      {}
+    )
+  ).toHaveProperty('range', '14.x');
+  expect(warningMessages).toStrictEqual([
+    'Warning: Due to `engines` existing in your `package.json` file, the Node.js Version defined in your Project Settings will not apply. Learn More: http://vercel.link/node-version',
+  ]);
+});
+
+it('should not warn when package.json engines matches project setting from config', async () => {
+  expect(
+    await getNodeVersion(
+      path.join(__dirname, 'pkg-engine-node'),
+      undefined,
+      { nodeVersion: '14.x' },
+      {}
+    )
+  ).toHaveProperty('range', '14.x');
+  expect(warningMessages).toStrictEqual([]);
+});
+
 it('should get latest node version', async () => {
-  expect(await getLatestNodeVersion()).toHaveProperty('major', 12);
+  expect(await getLatestNodeVersion()).toHaveProperty('major', 14);
 });
 
 it('should throw for discontinued versions', async () => {
   // Mock a future date so that Node 8 becomes discontinued
   const realDateNow = Date.now.bind(global.Date);
-  global.Date.now = () => new Date('2020-02-14').getTime();
+  global.Date.now = () => new Date('2021-04-01').getTime();
 
   expect(getSupportedNodeVersion('8.10.x', false)).rejects.toThrow();
   expect(getSupportedNodeVersion('8.10.x', true)).rejects.toThrow();
+  expect(getSupportedNodeVersion('10.x', false)).rejects.toThrow();
+  expect(getSupportedNodeVersion('10.x', true)).rejects.toThrow();
 
-  expect(getDiscontinuedNodeVersions().length).toBe(1);
-  expect(getDiscontinuedNodeVersions()[0]).toHaveProperty('range', '8.10.x');
+  const discontinued = getDiscontinuedNodeVersions();
+  expect(discontinued.length).toBe(2);
+  expect(discontinued[0]).toHaveProperty('range', '10.x');
+  expect(discontinued[1]).toHaveProperty('range', '8.10.x');
 
   global.Date.now = realDateNow;
 });
@@ -197,3 +258,18 @@ it('should support require by path for legacy builders', () => {
   expect(FileRef2).toBe(index.FileRef);
   expect(Lambda2).toBe(index.Lambda);
 });
+
+it(
+  'should have correct $PATH when running `runPackageJsonScript()` with yarn',
+  async () => {
+    const fixture = path.join(__dirname, 'fixtures', '19-yarn-v2');
+    await runNpmInstall(fixture);
+    await runPackageJsonScript(fixture, 'env');
+
+    // `yarn` was failing with ENOENT before, so as long as the
+    // script was invoked at all is enough to verify the fix
+    const out = await fs.readFile(path.join(fixture, 'env.txt'), 'utf8');
+    expect(out.trim()).toBeTruthy();
+  },
+  ms('1m')
+);

packages/now-cgi/build.js

@@ -0,0 +1,25 @@
+#!/usr/bin/env node
+const execa = require('execa');
+const { join } = require('path');
+const { homedir } = require('os');
+
+async function main() {
+  process.env.GOOS = 'linux';
+  process.env.GOARCH = 'amd64';
+  process.env.GOPATH = join(homedir(), 'go');
+
+  await execa('go', ['get', 'github.com/aws/aws-lambda-go/events'], {
+    stdio: 'inherit',
+  });
+  await execa('go', ['get', 'github.com/aws/aws-lambda-go/lambda'], {
+    stdio: 'inherit',
+  });
+  await execa('go', ['build', '-o', 'handler', 'main.go'], {
+    stdio: 'inherit',
+  });
+}
+
+main().catch(err => {
+  console.error(err);
+  process.exit(1);
+});

packages/now-cgi/build.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-export GOOS=linux
-export GOARCH=amd64
-export GOPATH=$HOME/go
-go get github.com/aws/aws-lambda-go/events
-go get github.com/aws/aws-lambda-go/lambda
-go build -o handler main.go

packages/now-cgi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/cgi",
-  "version": "1.0.6",
+  "version": "1.0.7-canary.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -8,7 +8,8 @@
     "directory": "packages/now-cgi"
   },
   "scripts": {
-    "prepublish": "./build.sh"
+    "build": "node build",
+    "prepublishOnly": "node build"
   },
   "files": [
     "index.js",

packages/now-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "20.1.3",
+  "version": "21.2.4-canary.3",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -61,11 +61,11 @@
     "node": ">= 10"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.6.0",
-    "@vercel/go": "1.1.6",
-    "@vercel/node": "1.8.5",
-    "@vercel/python": "1.2.3",
-    "@vercel/ruby": "1.2.4",
+    "@vercel/build-utils": "2.9.1-canary.2",
+    "@vercel/go": "1.1.8",
+    "@vercel/node": "1.9.1-canary.0",
+    "@vercel/python": "1.2.5-canary.1",
+    "@vercel/ruby": "1.2.6-canary.0",
     "update-notifier": "4.1.0"
   },
   "devDependencies": {
@@ -100,7 +100,7 @@
     "@types/universal-analytics": "0.4.2",
     "@types/which": "1.3.2",
     "@types/write-json-file": "2.2.1",
-    "@vercel/frameworks": "0.2.0",
+    "@vercel/frameworks": "0.2.1-canary.2",
     "@vercel/ncc": "0.24.0",
     "@zeit/fun": "0.11.2",
     "@zeit/source-map-support": "0.6.2",

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

@@ -2,7 +2,6 @@ import chalk from 'chalk';
 
 import { handleError } from '../../util/error';
 
-import createOutput from '../../util/output';
 import getArgs from '../../util/get-args';
 import getSubcommand from '../../util/get-subcommand';
 import logo from '../../util/output/logo';
@@ -92,15 +91,14 @@ export default async function main(ctx) {
     return 2;
   }
 
-  const output = createOutput({ debug: argv['--debug'] });
   const { subcommand, args } = getSubcommand(argv._.slice(1), COMMAND_CONFIG);
 
   switch (subcommand) {
     case 'ls':
-      return ls(ctx, argv, args, output);
+      return ls(ctx, argv, args);
     case 'rm':
-      return rm(ctx, argv, args, output);
+      return rm(ctx, argv, args);
     default:
-      return set(ctx, argv, args, output);
+      return set(ctx, argv, args);
   }
 }

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

@@ -10,9 +10,10 @@ import strlen from '../../util/strlen.ts';
 import getCommandFlags from '../../util/get-command-flags';
 import { getCommandName } from '../../util/pkg-name.ts';
 
-export default async function ls(ctx, opts, args, output) {
+export default async function ls(ctx, opts, args) {
   const {
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
@@ -23,6 +24,7 @@ export default async function ls(ctx, opts, args, output) {
     token,
     currentTeam,
     debug: debugEnabled,
+    output,
   });
   let contextName = null;
 
@@ -47,9 +49,9 @@ export default async function ls(ctx, opts, args, output) {
     token,
     debug: debugEnabled,
     currentTeam,
+    output,
   });
   const lsStamp = stamp();
-  let cancelWait;
 
   if (args.length > 0) {
     output.error(
@@ -60,17 +62,13 @@ export default async function ls(ctx, opts, args, output) {
     return 1;
   }
 
-  cancelWait = output.spinner(
-    `Fetching aliases under ${chalk.bold(contextName)}`
-  );
+  output.spinner(`Fetching aliases under ${chalk.bold(contextName)}`);
 
   const { aliases, pagination } = await getAliases(
     now,
     undefined,
     nextTimestamp
   );
-  if (cancelWait) cancelWait();
-
   output.log(`aliases found under ${chalk.bold(contextName)} ${lsStamp()}`);
   console.log(printAliasTable(aliases));
 

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

@@ -12,9 +12,10 @@ import { isValidName } from '../../util/is-valid-name';
 import findAliasByAliasOrId from '../../util/alias/find-alias-by-alias-or-id';
 import { getCommandName } from '../../util/pkg-name.ts';
 
-export default async function rm(ctx, opts, args, output) {
+export default async function rm(ctx, opts, args) {
   const {
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
@@ -25,6 +26,7 @@ export default async function rm(ctx, opts, args, output) {
     token,
     currentTeam,
     debug: debugEnabled,
+    output,
   });
   let contextName = null;
 
@@ -39,8 +41,13 @@ export default async function rm(ctx, opts, args, output) {
     throw err;
   }
 
-  // $FlowFixMe
-  const now = new Now({ apiUrl, token, debug: debugEnabled, currentTeam });
+  const now = new Now({
+    apiUrl,
+    token,
+    debug: debugEnabled,
+    currentTeam,
+    output,
+  });
   const [aliasOrId] = args;
 
   if (args.length !== 1) {

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

@@ -29,11 +29,11 @@ type Options = {
 export default async function set(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const {
     authConfig: { token },
+    output,
     config,
     localConfig,
   } = ctx;
@@ -49,6 +49,7 @@ export default async function set(
     token,
     currentTeam,
     debug: debugEnabled,
+    output,
   });
 
   let user: User;

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

@@ -14,7 +14,6 @@ import addBilling from './add';
 import exit from '../../util/exit';
 import Client from '../../util/client.ts';
 import getScope from '../../util/get-scope.ts';
-import createOutput from '../../util/output';
 import { getPkgName } from '../../util/pkg-name.ts';
 
 const help = () => {
@@ -90,8 +89,9 @@ function buildInquirerChoices(cards) {
     const _default =
       source.id === cards.defaultSource ? ` ${chalk.bold('(default)')}` : '';
     const id = `${chalk.cyan(`ID: ${source.id}`)}${_default}`;
-    const number = `${chalk.gray('#### ').repeat(3)}${source.last4 ||
-      source.card.last4}`;
+    const number = `${chalk.gray('#### ').repeat(3)}${
+      source.last4 || source.card.last4
+    }`;
     const str = [
       id,
       indent(source.name || source.owner.name, 2),
@@ -106,11 +106,16 @@ function buildInquirerChoices(cards) {
   });
 }
 
-async function run({ token, config: { currentTeam } }) {
+async function run({ token, output, config: { currentTeam } }) {
   const start = new Date();
-  const creditCards = new NowCreditCards({ apiUrl, token, debug, currentTeam });
-  const output = createOutput({ debug });
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const creditCards = new NowCreditCards({
+    apiUrl,
+    token,
+    debug,
+    currentTeam,
+    output,
+  });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
   let contextName = null;
 
   try {
@@ -147,8 +152,9 @@ async function run({ token, config: { currentTeam } }) {
           const id = `${chalk.gray('-')} ${chalk.cyan(
             `ID: ${source.id}`
           )}${_default}`;
-          const number = `${chalk.gray('#### ').repeat(3)}${source.last4 ||
-            source.card.last4}`;
+          const number = `${chalk.gray('#### ').repeat(3)}${
+            source.last4 || source.card.last4
+          }`;
 
           return [
             id,
@@ -231,8 +237,9 @@ async function run({ token, config: { currentTeam } }) {
         const elapsed = ms(new Date() - start);
         console.log(
           success(
-            `${card.brand || card.card.brand} ending in ${card.last4 ||
-              card.card.last4} is now the default ${chalk.gray(`[${elapsed}]`)}`
+            `${card.brand || card.card.brand} ending in ${
+              card.last4 || card.card.last4
+            } is now the default ${chalk.gray(`[${elapsed}]`)}`
           )
         );
       } else {
@@ -301,9 +308,9 @@ async function run({ token, config: { currentTeam } }) {
         const deletedCard = cards.sources.find(card => card.id === cardId);
         const remainingCards = cards.sources.filter(card => card.id !== cardId);
 
-        let text = `${deletedCard.brand ||
-          deletedCard.card.brand} ending in ${deletedCard.last4 ||
-          deletedCard.card.last4} was deleted`;
+        let text = `${deletedCard.brand || deletedCard.card.brand} ending in ${
+          deletedCard.last4 || deletedCard.card.last4
+        } was deleted`;
         //  ${chalk.gray(`[${elapsed}]`)}
 
         if (cardId === cards.defaultSource) {
@@ -317,11 +324,11 @@ async function run({ token, config: { currentTeam } }) {
               card => card.id === cards.defaultCardId
             );
 
-            text += `\n${newDefaultCard.brand ||
-              newDefaultCard.card.brand} ending in ${newDefaultCard.last4 ||
-              newDefaultCard.card.last4} in now default for ${chalk.bold(
-              contextName
-            )}`;
+            text += `\n${
+              newDefaultCard.brand || newDefaultCard.card.brand
+            } ending in ${
+              newDefaultCard.last4 || newDefaultCard.card.last4
+            } in now default for ${chalk.bold(contextName)}`;
           }
         }
 

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

@@ -8,7 +8,6 @@ import stamp from '../../util/output/stamp';
 import createCertFromFile from '../../util/certs/create-cert-from-file';
 import createCertForCns from '../../util/certs/create-cert-for-cns';
 import { NowContext } from '../../types';
-import { Output } from '../../util/output';
 import { getCommandName } from '../../util/pkg-name';
 
 interface Options {
@@ -22,11 +21,11 @@ interface Options {
 async function add(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ): Promise<number> {
   const {
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
@@ -49,6 +48,7 @@ async function add(
     token,
     currentTeam,
     debug: debugEnabled,
+    output,
   });
 
   try {
@@ -62,7 +62,13 @@ async function add(
     throw err;
   }
 
-  const now = new Now({ apiUrl, token, debug: debugEnabled, currentTeam });
+  const now = new Now({
+    apiUrl,
+    token,
+    debug: debugEnabled,
+    currentTeam,
+    output,
+  });
 
   if (overwite) {
     output.error('Overwrite option is deprecated');
@@ -71,7 +77,7 @@ async function add(
   }
 
   if (crtPath || keyPath || caPath) {
-    if (args.length !== 0 || (!crtPath || !keyPath || !caPath)) {
+    if (args.length !== 0 || !crtPath || !keyPath || !caPath) {
       output.error(
         `Invalid number of arguments to create a custom certificate entry. Usage:`
       );
@@ -113,12 +119,12 @@ async function add(
       (res, item) => res.concat(item.split(',')),
       []
     );
-    const cancelWait = output.spinner(
+    output.spinner(
       `Generating a certificate for ${chalk.bold(cns.join(', '))}`
     );
 
     cert = await createCertForCns(now, cns, contextName);
-    cancelWait();
+    output.stopSpinner();
   }
 
   if (cert instanceof Error) {

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

@@ -3,7 +3,6 @@ import chalk from 'chalk';
 // @ts-ignore
 import { handleError } from '../../util/error';
 
-import createOutput from '../../util/output';
 import getArgs from '../../util/get-args';
 import getSubcommand from '../../util/get-subcommand';
 import logo from '../../util/output/logo';
@@ -104,17 +103,17 @@ export default async function main(ctx: NowContext) {
     return 0;
   }
 
-  const output = createOutput({ debug: argv['--debug'] });
+  const { output } = ctx;
   const { subcommand, args } = getSubcommand(argv._.slice(1), COMMAND_CONFIG);
   switch (subcommand) {
     case 'issue':
-      return issue(ctx, argv, args, output);
+      return issue(ctx, argv, args);
     case 'ls':
-      return ls(ctx, argv, args, output);
+      return ls(ctx, argv, args);
     case 'rm':
-      return rm(ctx, argv, args, output);
+      return rm(ctx, argv, args);
     case 'add':
-      return add(ctx, argv, args, output);
+      return add(ctx, argv, args);
     case 'renew':
       output.error('Renewing certificates is deprecated, issue a new one.');
       return 1;

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

@@ -28,11 +28,11 @@ type Options = {
 export default async function issue(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const {
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
@@ -55,6 +55,7 @@ export default async function issue(
     token,
     currentTeam,
     debug: debugEnabled,
+    output,
   });
   let contextName = null;
 

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

@@ -8,7 +8,6 @@ import getScope from '../../util/get-scope';
 import stamp from '../../util/output/stamp';
 import getCerts from '../../util/certs/get-certs';
 import strlen from '../../util/strlen';
-import { Output } from '../../util/output';
 import { NowContext, Cert } from '../../types';
 import getCommandFlags from '../../util/get-command-flags';
 import { getCommandName } from '../../util/pkg-name';
@@ -21,17 +20,17 @@ interface Options {
 async function ls(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ): Promise<number> {
   const {
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
   const { apiUrl } = ctx;
   const { '--debug': debug, '--next': nextTimestamp } = opts;
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
   let contextName = null;
 
   try {
@@ -48,7 +47,7 @@ async function ls(
     output.error('Please provide a number for flag --next');
     return 1;
   }
-  const now = new Now({ apiUrl, token, debug, currentTeam });
+  const now = new Now({ apiUrl, token, debug, currentTeam, output });
   const lsStamp = stamp();
 
   if (args.length !== 0) {

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

@@ -18,21 +18,17 @@ type Options = {
   '--debug': boolean;
 };
 
-async function rm(
-  ctx: NowContext,
-  opts: Options,
-  args: string[],
-  output: Output
-) {
+async function rm(ctx: NowContext, opts: Options, args: string[]) {
   const {
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
   const { apiUrl } = ctx;
   const rmStamp = stamp();
   const debug = opts['--debug'];
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
 
   let contextName = null;
 

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

@@ -3,7 +3,6 @@ import { resolve, basename } from 'path';
 import { fileNameSymbol } from '@vercel/client';
 import Client from '../../util/client.ts';
 import getScope from '../../util/get-scope.ts';
-import createOutput from '../../util/output';
 import code from '../../util/output/code';
 import highlight from '../../util/output/highlight';
 import { readLocalConfig } from '../../util/config/files';
@@ -15,6 +14,7 @@ import deploy from './latest';
 export default async ctx => {
   const {
     authConfig,
+    output,
     config: { currentTeam },
     apiUrl,
   } = ctx;
@@ -48,7 +48,6 @@ export default async ctx => {
     localConfig = readLocalConfig(paths[0]);
   }
   const debugEnabled = argv['--debug'];
-  const output = createOutput({ debug: debugEnabled });
   const stats = {};
 
   if (argv['--help']) {
@@ -74,6 +73,7 @@ export default async ctx => {
       apiUrl,
       token: authConfig.token,
       currentTeam,
+      output,
       debug: debugEnabled,
     });
     try {

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

@@ -233,8 +233,7 @@ export default async function main(
   const paths = Object.keys(stats);
   const debugEnabled = argv['--debug'];
 
-  // $FlowFixMe
-  const isTTY = process.stdout.isTTY;
+  const { isTTY } = process.stdout;
   const quiet = !isTTY;
 
   // check paths
@@ -263,6 +262,7 @@ export default async function main(
     apiUrl: ctx.apiUrl,
     token: ctx.authConfig.token,
     debug: debugEnabled,
+    output,
   });
 
   // retrieve `project` and `org` from .vercel
@@ -645,6 +645,7 @@ export default async function main(
           token: ctx.authConfig.token,
           currentTeam: org.id,
           debug: debugEnabled,
+          output,
         }),
         err.meta.domain,
         contextName
@@ -727,6 +728,7 @@ export default async function main(
       token: ctx.authConfig.token,
       currentTeam: org.type === 'team' ? org.id : null,
       debug: debugEnabled,
+      output,
     }),
     deployment,
     deployStamp,

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

@@ -2,16 +2,15 @@ import { resolve, join } from 'path';
 
 import DevServer from '../../util/dev/server';
 import parseListen from '../../util/dev/parse-listen';
-import { Output } from '../../util/output';
-import { NowContext } from '../../types';
+import { NowContext, ProjectEnvVariable } from '../../types';
 import Client from '../../util/client';
 import { getLinkedProject } from '../../util/projects/link';
 import { getFrameworks } from '../../util/get-frameworks';
 import { isSettingValue } from '../../util/is-setting-value';
-import { ProjectSettings, ProjectEnvTarget } from '../../types';
+import { ProjectSettings } from '../../types';
 import getDecryptedEnvRecords from '../../util/get-decrypted-env-records';
-import { Env } from '@vercel/build-utils';
 import setupAndLink from '../../util/link/setup-and-link';
+import getSystemEnvValues from '../../util/env/get-system-env-values';
 
 type Options = {
   '--debug'?: boolean;
@@ -22,9 +21,9 @@ type Options = {
 export default async function dev(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
+  const { output } = ctx;
   const [dir = '.'] = args;
   let cwd = resolve(dir);
   const listen = parseListen(opts['--listen'] || '3000');
@@ -35,6 +34,7 @@ export default async function dev(
     token: ctx.authConfig.token,
     currentTeam: ctx.config.currentTeam,
     debug,
+    output,
   });
 
   // retrieve dev command
@@ -49,7 +49,6 @@ export default async function dev(
 
     link = await setupAndLink(
       ctx,
-      output,
       cwd,
       forceDelete,
       autoConfirm,
@@ -70,7 +69,8 @@ export default async function dev(
   let devCommand: string | undefined;
   let frameworkSlug: string | undefined;
   let projectSettings: ProjectSettings | undefined;
-  let environmentVars: Env | undefined;
+  let projectEnvs: ProjectEnvVariable[] = [];
+  let systemEnvValues: string[] = [];
   if (link.status === 'linked') {
     const { project, org } = link;
     client.currentTeam = org.type === 'team' ? org.id : undefined;
@@ -98,12 +98,12 @@ export default async function dev(
       cwd = join(cwd, project.rootDirectory);
     }
 
-    environmentVars = await getDecryptedEnvRecords(
-      output,
-      client,
-      project,
-      ProjectEnvTarget.Development
-    );
+    [{ envs: projectEnvs }, { systemEnvValues }] = await Promise.all([
+      getDecryptedEnvRecords(output, client, project.id),
+      project.autoExposeSystemEnvs
+        ? getSystemEnvValues(output, client, project.id)
+        : { systemEnvValues: [] },
+    ]);
   }
 
   const devServer = new DevServer(cwd, {
@@ -112,7 +112,8 @@ export default async function dev(
     devCommand,
     frameworkSlug,
     projectSettings,
-    environmentVars,
+    projectEnvs,
+    systemEnvValues,
   });
 
   process.once('SIGINT', () => devServer.stop());

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

@@ -7,7 +7,6 @@ import getSubcommand from '../../util/get-subcommand';
 import { NowContext } from '../../types';
 import { NowError } from '../../util/now-error';
 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';
@@ -51,7 +50,7 @@ const help = () => {
 export default async function main(ctx: NowContext) {
   let argv;
   let args;
-  let output;
+  const { output } = ctx;
 
   try {
     argv = getArgs(ctx.argv.slice(2), {
@@ -63,9 +62,7 @@ export default async function main(ctx: NowContext) {
       '--port': Number,
       '-p': '--port',
     });
-    const debug = argv['--debug'];
     args = getSubcommand(argv._.slice(1), COMMAND_CONFIG).args;
-    output = createOutput({ debug });
 
     if ('--port' in argv) {
       output.warn('`--port` is deprecated, please use `--listen` instead');
@@ -120,7 +117,7 @@ export default async function main(ctx: NowContext) {
   }
 
   try {
-    return await dev(ctx, argv, args, output);
+    return await dev(ctx, argv, args);
   } catch (err) {
     if (err.code === 'ENOTFOUND') {
       // Error message will look like the following:

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

@@ -6,7 +6,6 @@ import {
   DNSInvalidType,
 } from '../../util/errors-ts';
 import { NowContext } from '../../types';
-import { Output } from '../../util/output';
 import addDNSRecord from '../../util/dns/add-dns-record';
 import Client from '../../util/client';
 import getScope from '../../util/get-scope';
@@ -22,17 +21,17 @@ type Options = {
 export default async function add(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const {
+    apiUrl,
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
-  const { apiUrl } = ctx;
   const debug = opts['--debug'];
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
   let contextName = null;
 
   try {

packages/now-cli/src/commands/dns/import.ts

@@ -1,6 +1,5 @@
 import chalk from 'chalk';
 import { NowContext } from '../../types';
-import { Output } from '../../util/output';
 import Client from '../../util/client';
 import getScope from '../../util/get-scope';
 import { DomainNotFound, InvalidDomain } from '../../util/errors-ts';
@@ -15,17 +14,17 @@ type Options = {
 export default async function add(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const {
+    apiUrl,
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
-  const { apiUrl } = ctx;
   const debug = opts['--debug'];
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
   let contextName = null;
 
   try {

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

@@ -1,7 +1,6 @@
 import chalk from 'chalk';
 
 import { NowContext } from '../../types';
-import createOutput from '../../util/output';
 import getArgs from '../../util/get-args';
 import getSubcommand from '../../util/get-subcommand';
 import handleError from '../../util/handle-error';
@@ -112,16 +111,15 @@ export default async function main(ctx: NowContext) {
     return 2;
   }
 
-  const output = createOutput({ debug: argv['--debug'] });
   const { subcommand, args } = getSubcommand(argv._.slice(1), COMMAND_CONFIG);
   switch (subcommand) {
     case 'add':
-      return add(ctx, argv, args, output);
+      return add(ctx, argv, args);
     case 'import':
-      return importZone(ctx, argv, args, output);
+      return importZone(ctx, argv, args);
     case 'rm':
-      return rm(ctx, argv, args, output);
+      return rm(ctx, argv, args);
     default:
-      return ls(ctx, argv, args, output);
+      return ls(ctx, argv, args);
   }
 }

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

@@ -1,6 +1,5 @@
 import chalk from 'chalk';
 import ms from 'ms';
-import { Output } from '../../util/output';
 import { DomainNotFound } from '../../util/errors-ts';
 import { DNSRecord, NowContext } from '../../types';
 import Client from '../../util/client';
@@ -22,17 +21,17 @@ type Options = {
 export default async function ls(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const {
+    apiUrl,
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
-  const { apiUrl } = ctx;
   const { '--debug': debug, '--next': nextTimestamp } = opts;
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
   let contextName = null;
 
   try {

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

@@ -17,17 +17,17 @@ type Options = {
 export default async function rm(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const {
+    apiUrl,
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
-  const { apiUrl } = ctx;
   const debug = opts['--debug'];
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
 
   try {
     await getScope(client);
@@ -100,12 +100,7 @@ function readConfirmation(
     process.stdin
       .on('data', d => {
         process.stdin.pause();
-        resolve(
-          d
-            .toString()
-            .trim()
-            .toLowerCase() === 'y'
-        );
+        resolve(d.toString().trim().toLowerCase() === 'y');
       })
       .resume();
   });

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

@@ -1,7 +1,6 @@
 import chalk from 'chalk';
 
 import { NowContext } from '../../types';
-import { Output } from '../../util/output';
 import * as ERRORS from '../../util/errors-ts';
 import Client from '../../util/client';
 import formatNSTable from '../../util/format-ns-table';
@@ -24,18 +23,18 @@ type Options = {
 export default async function add(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const {
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
   const { apiUrl } = ctx;
   const debug = opts['--debug'];
   const force = opts['--force'];
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
   let contextName = null;
 
   try {

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

@@ -2,7 +2,6 @@ import chalk from 'chalk';
 import psl from 'psl';
 
 import { NowContext } from '../../types';
-import { Output } from '../../util/output';
 import * as ERRORS from '../../util/errors-ts';
 import Client from '../../util/client';
 import getDomainPrice from '../../util/domains/get-domain-price';
@@ -21,17 +20,17 @@ type Options = {
 export default async function buy(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const {
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
   const { apiUrl } = ctx;
   const debug = opts['--debug'];
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
   let contextName = null;
 
   try {
@@ -70,7 +69,10 @@ export default async function buy(
   }
 
   const availableStamp = stamp();
-  const domainPrice = await getDomainPrice(client, domainName);
+  const [domainPrice, renewalPrice] = await Promise.all([
+    getDomainPrice(client, domainName),
+    getDomainPrice(client, domainName, 'renewal'),
+  ]);
 
   if (domainPrice instanceof Error) {
     output.prettyError(domainPrice);
@@ -102,14 +104,22 @@ export default async function buy(
     return 0;
   }
 
+  const autoRenew = await promptBool(
+    renewalPrice.period === 1
+      ? `Auto renew yearly for ${chalk.bold(`$${price}`)}?`
+      : `Auto renew every ${renewalPrice.period} years for ${chalk.bold(
+          `$${price}`
+        )}?`,
+    { defaultValue: true }
+  );
+
   let buyResult;
   const purchaseStamp = stamp();
-  const stopPurchaseSpinner = output.spinner('Purchasing');
+  output.spinner('Purchasing');
 
   try {
-    buyResult = await purchaseDomain(client, domainName, price);
+    buyResult = await purchaseDomain(client, domainName, price, autoRenew);
   } catch (err) {
-    stopPurchaseSpinner();
     output.error(
       'An unexpected error occurred while purchasing your domain. Please try again later.'
     );
@@ -117,7 +127,7 @@ export default async function buy(
     return 1;
   }
 
-  stopPurchaseSpinner();
+  output.stopSpinner();
 
   if (buyResult instanceof ERRORS.SourceNotFound) {
     output.error(

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

@@ -1,7 +1,6 @@
 import chalk from 'chalk';
 
 import { NowContext } from '../../types';
-import createOutput from '../../util/output';
 import getArgs from '../../util/get-args';
 import getSubcommand from '../../util/get-subcommand';
 import handleError from '../../util/handle-error';
@@ -106,24 +105,23 @@ export default async function main(ctx: NowContext) {
     return 2;
   }
 
-  const output = createOutput({ debug: argv['--debug'] });
   const { subcommand, args } = getSubcommand(argv._.slice(1), COMMAND_CONFIG);
   switch (subcommand) {
     case 'add':
-      return add(ctx, argv, args, output);
+      return add(ctx, argv, args);
     case 'inspect':
-      return inspect(ctx, argv, args, output);
+      return inspect(ctx, argv, args);
     case 'move':
-      return move(ctx, argv, args, output);
+      return move(ctx, argv, args);
     case 'buy':
-      return buy(ctx, argv, args, output);
+      return buy(ctx, argv, args);
     case 'rm':
-      return rm(ctx, argv, args, output);
+      return rm(ctx, argv, args);
     case 'transferIn':
-      return transferIn(ctx, argv, args, output);
+      return transferIn(ctx, argv, args);
     case 'verify':
-      return verify(ctx, argv, args, output);
+      return verify(ctx, argv, args);
     default:
-      return ls(ctx, argv, args, output);
+      return ls(ctx, argv, args);
   }
 }

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

@@ -24,17 +24,17 @@ type Options = {
 export default async function inspect(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const {
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
   const { apiUrl } = ctx;
   const debug = opts['--debug'];
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
 
   let contextName = null;
 

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

@@ -7,7 +7,6 @@ import Client from '../../util/client';
 import getDomains from '../../util/domains/get-domains';
 import getScope from '../../util/get-scope';
 import stamp from '../../util/output/stamp';
-import { Output } from '../../util/output';
 import formatTable from '../../util/format-table';
 import { formatDateWithoutTime } from '../../util/format-date';
 import { Domain, NowContext } from '../../types';
@@ -24,17 +23,17 @@ type Options = {
 export default async function ls(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const {
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
   const { apiUrl } = ctx;
   const { '--debug': debug, '--next': nextTimestamp } = opts;
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
   let contextName = null;
 
   if (typeof nextTimestamp !== undefined && Number.isNaN(nextTimestamp)) {

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

@@ -2,7 +2,6 @@ import chalk from 'chalk';
 import plural from 'pluralize';
 
 import { NowContext, User, Team } from '../../types';
-import { Output } from '../../util/output';
 import * as ERRORS from '../../util/errors-ts';
 import Client from '../../util/client';
 import getScope from '../../util/get-scope';
@@ -25,17 +24,17 @@ type Options = {
 export default async function move(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const {
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
   const { apiUrl } = ctx;
   const debug = opts['--debug'];
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
   let contextName = null;
   let user = null;
 

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

@@ -26,17 +26,17 @@ type Options = {
 export default async function rm(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const {
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
   const { apiUrl } = ctx;
   const debug = opts['--debug'];
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
   const [domainName] = args;
   let contextName = null;
 

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

@@ -1,7 +1,6 @@
 import chalk from 'chalk';
 
 import { NowContext } from '../../types';
-import { Output } from '../../util/output';
 import * as ERRORS from '../../util/errors-ts';
 import Client from '../../util/client';
 import getScope from '../../util/get-scope';
@@ -24,17 +23,17 @@ type Options = {
 export default async function transferIn(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const {
     authConfig: { token },
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
   const { apiUrl } = ctx;
   const debug = opts['--debug'];
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
   let contextName = null;
 
   try {

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

@@ -1,13 +1,11 @@
 import { NowContext } from '../../types';
-import { Output } from '../../util/output';
 import { NowBuildError } from '@vercel/build-utils';
 import { getCommandName } from '../../util/pkg-name';
 
 export default async function verify(
-  _ctx: NowContext,
+  { output }: NowContext,
   _opts: {},
-  args: string[],
-  output: Output
+  args: string[]
 ) {
   const [domainName] = args;
 

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

@@ -18,7 +18,7 @@ import withSpinner from '../../util/with-spinner';
 import { emoji, prependEmoji } from '../../util/emoji';
 import { isKnownError } from '../../util/env/known-error';
 import { getCommandName } from '../../util/pkg-name';
-import { SYSTEM_ENV_VALUES } from '../../util/env/system-env';
+import getSystemEnvValues from '../../util/env/get-system-env-values';
 
 type Options = {
   '--debug': boolean;
@@ -91,7 +91,10 @@ export default async function add(
           name: `Secret (can be created using ${getCommandName('secret add')})`,
           value: ProjectEnvType.Secret,
         },
-        { name: 'Provided by System', value: ProjectEnvType.System },
+        {
+          name: 'Reference to System Environment Variable',
+          value: ProjectEnvType.System,
+        },
       ],
     })) as { inputEnvType: ProjectEnvType };
 
@@ -112,11 +115,24 @@ export default async function add(
     }
   }
 
-  const { envs } = await getEnvVariables(output, client, project.id);
+  const [{ envs }, { systemEnvValues }] = await Promise.all([
+    getEnvVariables(output, client, project.id),
+    getSystemEnvValues(output, client, project.id),
+  ]);
   const existing = new Set(
     envs.filter(r => r.key === envName).map(r => r.target)
   );
-  const choices = getEnvTargetChoices().filter(c => !existing.has(c.value));
+  const choices = getEnvTargetChoices().filter(c => {
+    // hide Development if "Secret" is chosen
+    if (
+      envType === ProjectEnvType.Secret &&
+      c.value === ProjectEnvTarget.Development
+    ) {
+      return false;
+    }
+
+    return !existing.has(c.value);
+  });
 
   if (choices.length === 0) {
     output.error(
@@ -182,7 +198,7 @@ export default async function add(
       name: 'systemEnvValue',
       type: 'list',
       message: `What’s the value of ${envName}?`,
-      choices: SYSTEM_ENV_VALUES.map(value => ({ name: value, value })),
+      choices: systemEnvValues.map(value => ({ name: value, value })),
     });
 
     envValue = systemEnvValue;

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

@@ -1,7 +1,6 @@
 import chalk from 'chalk';
 
 import { NowContext } from '../../types';
-import createOutput from '../../util/output';
 import getArgs from '../../util/get-args';
 import getSubcommand from '../../util/get-subcommand';
 import getInvalidSubcommand from '../../util/get-invalid-subcommand';
@@ -109,15 +108,15 @@ export default async function main(ctx: NowContext) {
   }
 
   const debug = argv['--debug'];
-  const output = createOutput({ debug });
   const { subcommand, args } = getSubcommand(argv._.slice(1), COMMAND_CONFIG);
   const {
     authConfig: { token },
+    apiUrl,
+    output,
     config,
   } = ctx;
   const { currentTeam } = config;
-  const { apiUrl } = ctx;
-  const client = new Client({ apiUrl, token, currentTeam, debug });
+  const client = new Client({ apiUrl, token, currentTeam, debug, output });
   const link = await getLinkedProject(output, client);
   if (link.status === 'error') {
     return link.exitCode;

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

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import { ProjectEnvTarget, Project } from '../../types';
+import { Project } from '../../types';
 import { Output } from '../../util/output';
 import confirm from '../../util/input/confirm';
 import Client from '../../util/client';
@@ -12,7 +12,8 @@ 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';
+import exposeSystemEnvs from '../../util/dev/expose-system-envs';
+import getSystemEnvValues from '../../util/env/get-system-env-values';
 
 const CONTENTS_PREFIX = '# Created by Vercel CLI\n';
 
@@ -84,15 +85,22 @@ export default async function pull(
   );
   const pullStamp = stamp();
 
-  const records: Env = await withSpinner(
-    'Downloading',
-    async () =>
-      await getDecryptedEnvRecords(
-        output,
-        client,
-        project,
-        ProjectEnvTarget.Development
-      )
+  const [
+    { envs: projectEnvs },
+    { systemEnvValues },
+  ] = await withSpinner('Downloading', () =>
+    Promise.all([
+      getDecryptedEnvRecords(output, client, project.id),
+      project.autoExposeSystemEnvs
+        ? getSystemEnvValues(output, client, project.id)
+        : { systemEnvValues: [] },
+    ])
+  );
+
+  const records = exposeSystemEnvs(
+    projectEnvs,
+    systemEnvValues,
+    project.autoExposeSystemEnvs
   );
 
   const contents =

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

@@ -4,7 +4,6 @@ import getArgs from '../../util/get-args';
 import getSubcommand from '../../util/get-subcommand';
 import { NowContext } from '../../types';
 import handleError from '../../util/handle-error';
-import createOutput from '../../util/output/create-output';
 import logo from '../../util/output/logo';
 import error from '../../util/output/error';
 import init from './init';
@@ -47,7 +46,6 @@ const help = () => {
 export default async function main(ctx: NowContext) {
   let argv;
   let args;
-  let output;
 
   try {
     argv = getArgs(ctx.argv.slice(2), {
@@ -55,7 +53,6 @@ export default async function main(ctx: NowContext) {
       '-f': Boolean,
     });
     args = getSubcommand(argv._.slice(1), COMMAND_CONFIG).args;
-    output = createOutput({ debug: argv['--debug'] });
   } catch (err) {
     handleError(err);
     return 1;
@@ -67,15 +64,15 @@ export default async function main(ctx: NowContext) {
   }
 
   if (argv._.length > 3) {
-    output.error('Too much arguments.');
+    ctx.output.error('Too much arguments.');
     return 1;
   }
 
   try {
-    return await init(ctx, argv, args, output);
+    return await init(ctx, argv, args);
   } catch (err) {
     console.log(error(err.message));
-    output.debug(err.stack);
+    ctx.output.debug(err.stack);
     return 1;
   }
 }

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

@@ -34,9 +34,9 @@ const EXAMPLE_API = 'https://now-example-files.zeit.sh';
 export default async function init(
   ctx: NowContext,
   opts: Options,
-  args: string[],
-  output: Output
+  args: string[]
 ) {
+  const { output } = ctx;
   const [name, dir] = args;
   const force = opts['-f'] || opts['--force'];
 
@@ -82,12 +82,12 @@ export default async function init(
  * Fetch example list json
  */
 async function fetchExampleList(output: Output) {
-  const stopSpinner = output.spinner('Fetching examples');
+  output.spinner('Fetching examples');
   const url = `${EXAMPLE_API}/v2/list.json`;
 
   try {
     const resp = await fetch(url);
-    stopSpinner();
+    output.stopSpinner();
 
     if (resp.status !== 200) {
       throw new Error(`Failed fetching list.json (${resp.statusText}).`);
@@ -95,7 +95,7 @@ async function fetchExampleList(output: Output) {
 
     return (await resp.json()) as Example[];
   } catch (e) {
-    stopSpinner();
+    output.stopSpinner();
   }
 }
 
@@ -127,13 +127,13 @@ async function extractExample(
   ver: string = 'v2'
 ) {
   const folder = prepareFolder(process.cwd(), dir || name, force);
-  const stopSpinner = output.spinner(`Fetching ${name}`);
+  output.spinner(`Fetching ${name}`);
 
   const url = `${EXAMPLE_API}/${ver}/download/${name}.tar.gz`;
 
   return fetch(url)
     .then(async resp => {
-      stopSpinner();
+      output.stopSpinner();
 
       if (resp.status !== 200) {
         throw new Error(`Could not get ${name}.tar.gz`);
@@ -163,7 +163,7 @@ async function extractExample(
       return 0;
     })
     .catch(e => {
-      stopSpinner();
+      output.stopSpinner();
       throw e;
     });
 }

packages/now-cli/src/commands/inspect.js

@@ -3,7 +3,6 @@ import getArgs from '../util/get-args';
 import buildsList from '../util/output/builds';
 import routesList from '../util/output/routes';
 import indent from '../util/output/indent';
-import createOutput from '../util/output';
 import Now from '../util';
 import logo from '../util/output/logo';
 import elapsed from '../util/output/elapsed.ts';
@@ -59,9 +58,13 @@ export default async function main(ctx) {
     return 2;
   }
 
-  const apiUrl = ctx.apiUrl;
+  const {
+    apiUrl,
+    output,
+    authConfig: { token },
+    config,
+  } = ctx;
   const debugEnabled = argv['--debug'];
-  const output = createOutput({ debug: debugEnabled });
   const { print, log, error } = output;
 
   // extract the first parameter
@@ -73,16 +76,13 @@ export default async function main(ctx) {
     return 1;
   }
 
-  const {
-    authConfig: { token },
-    config,
-  } = ctx;
   const { currentTeam } = config;
   const client = new Client({
     apiUrl,
     token,
     currentTeam,
     debug: debugEnabled,
+    output,
   });
   let contextName = null;
 
@@ -90,25 +90,30 @@ export default async function main(ctx) {
     ({ contextName } = await getScope(client));
   } catch (err) {
     if (err.code === 'NOT_AUTHORIZED' || err.code === 'TEAM_DELETED') {
-      output.error(err.message);
+      error(err.message);
       return 1;
     }
 
     throw err;
   }
 
-  const now = new Now({ apiUrl, token, debug: debugEnabled, currentTeam });
+  const now = new Now({
+    apiUrl,
+    token,
+    debug: debugEnabled,
+    currentTeam,
+    output,
+  });
 
   // resolve the deployment, since we might have been given an alias
   const depFetchStart = Date.now();
-  const cancelWait = output.spinner(
+  output.spinner(
     `Fetching deployment "${deploymentIdOrHost}" in ${chalk.bold(contextName)}`
   );
 
   try {
     deployment = await now.findDeployment(deploymentIdOrHost);
   } catch (err) {
-    cancelWait();
     if (err.status === 404) {
       error(
         `Failed to find deployment "${deploymentIdOrHost}" in ${chalk.bold(
@@ -136,7 +141,6 @@ export default async function main(ctx) {
       ? await now.fetch(`/v1/now/deployments/${id}/builds`)
       : { builds: [] };
 
-  cancelWait();
   log(
     `Fetched deployment "${url}" in ${chalk.bold(contextName)} ${elapsed(
       Date.now() - depFetchStart

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

@@ -1,6 +1,5 @@
 import chalk from 'chalk';
 import { NowContext } from '../../types';
-import createOutput from '../../util/output';
 import getArgs from '../../util/get-args';
 import getSubcommand from '../../util/get-subcommand';
 import handleError from '../../util/handle-error';
@@ -66,8 +65,6 @@ export default async function main(ctx: NowContext) {
     return 2;
   }
 
-  const debug = argv['--debug'];
-  const output = createOutput({ debug });
   const { args } = getSubcommand(argv._.slice(1), COMMAND_CONFIG);
   const path = args[0] || process.cwd();
   const autoConfirm = argv['--confirm'];
@@ -75,7 +72,6 @@ export default async function main(ctx: NowContext) {
 
   const link = await setupAndLink(
     ctx,
-    output,
     path,
     forceDelete,
     autoConfirm,

packages/now-cli/src/commands/list.js

@@ -3,12 +3,10 @@ import ms from 'ms';
 import table from 'text-table';
 import Now from '../util';
 import getArgs from '../util/get-args';
-import createOutput from '../util/output';
 import { handleError } from '../util/error';
 import cmd from '../util/output/cmd.ts';
 import logo from '../util/output/logo';
 import elapsed from '../util/output/elapsed.ts';
-import wait from '../util/output/wait';
 import strlen from '../util/strlen.ts';
 import Client from '../util/client.ts';
 import getScope from '../util/get-scope.ts';
@@ -51,12 +49,6 @@ const help = () => {
 
     ${chalk.cyan(`$ ${getPkgName()} ls my-app`)}
 
-  ${chalk.gray(
-    '–'
-  )} List all deployments and all instances for the app ${chalk.dim('`my-app`')}
-
-    ${chalk.cyan(`$ ${getPkgName()} ls my-app --all`)}
-
   ${chalk.gray('–')} Filter deployments by metadata
 
     ${chalk.cyan(`$ ${getPkgName()} ls -m key1=value1 -m key2=value2`)}
@@ -84,11 +76,15 @@ export default async function main(ctx) {
     return 1;
   }
 
-  const debugEnabled = argv['--debug'];
+  const {
+    authConfig: { token },
+    output,
+    apiUrl,
+    config,
+  } = ctx;
 
-  const { print, log, error, note, debug } = createOutput({
-    debug: debugEnabled,
-  });
+  const debugEnabled = argv['--debug'];
+  const { print, log, error, note, debug, spinner } = output;
 
   if (argv._.length > 2) {
     error(`${getCommandName('ls [app]')} accepts at most one argument`);
@@ -98,24 +94,19 @@ export default async function main(ctx) {
   let app = argv._[1];
   let host = null;
 
-  const apiUrl = ctx.apiUrl;
-
   if (argv['--help']) {
     help();
     return 0;
   }
 
   const meta = parseMeta(argv['--meta']);
-  const {
-    authConfig: { token },
-    config,
-  } = ctx;
   const { currentTeam, includeScheme } = config;
   const client = new Client({
     apiUrl,
     token,
     currentTeam,
     debug: debugEnabled,
+    output,
   });
   let contextName = null;
 
@@ -137,11 +128,15 @@ export default async function main(ctx) {
     return 1;
   }
 
-  const stopSpinner = wait(
-    `Fetching deployments in ${chalk.bold(contextName)}`
-  );
+  spinner(`Fetching deployments in ${chalk.bold(contextName)}`);
 
-  const now = new Now({ apiUrl, token, debug: debugEnabled, currentTeam });
+  const now = new Now({
+    apiUrl,
+    token,
+    debug: debugEnabled,
+    output,
+    currentTeam,
+  });
   const start = new Date();
 
   if (app && !isValidName(app)) {
@@ -162,7 +157,6 @@ export default async function main(ctx) {
     const hostParts = asHost.split('-');
 
     if (hostParts < 2) {
-      stopSpinner();
       error('Only deployment hostnames are allowed, no aliases');
       return 1;
     }
@@ -171,19 +165,12 @@ export default async function main(ctx) {
     host = asHost;
   }
 
-  let response;
-
-  try {
-    debug('Fetching deployments');
-    response = await now.list(app, {
-      version: 6,
-      meta,
-      nextTimestamp,
-    });
-  } catch (err) {
-    stopSpinner();
-    throw err;
-  }
+  debug('Fetching deployments');
+  const response = await now.list(app, {
+    version: 6,
+    meta,
+    nextTimestamp,
+  });
 
   let { deployments, pagination } = response;
 
@@ -199,7 +186,6 @@ export default async function main(ctx) {
       if (err.status === 404) {
         debug('Ignore findDeployment 404');
       } else {
-        stopSpinner();
         throw err;
       }
     }
@@ -216,7 +202,6 @@ export default async function main(ctx) {
     deployments = deployments.filter(deployment => deployment.url === host);
   }
 
-  stopSpinner();
   log(
     `Deployments under ${chalk.bold(contextName)} ${elapsed(
       Date.now() - start

packages/now-cli/src/commands/login.js

@@ -19,7 +19,6 @@ import getGlobalPathConfig from '../util/config/global-path';
 import hp from '../util/humanize-path';
 import logo from '../util/output/logo';
 import exit from '../util/exit';
-import createOutput from '../util/output';
 import executeLogin from '../util/login/login.ts';
 import { prependEmoji, emoji } from '../util/emoji';
 import { getCommandName, getPkgName } from '../util/pkg-name.ts';
@@ -141,15 +140,12 @@ const login = async ctx => {
     await exit(0);
   }
 
-  const debugEnabled = argv['--debug'];
-  const output = createOutput({ debug: debugEnabled });
+  const { apiUrl, output } = ctx;
 
   argv._ = argv._.slice(1);
 
-  const apiUrl = ctx.apiUrl;
   let email;
   let emailIsValid = false;
-  let stopSpinner;
 
   const possibleAddress = argv._[0];
 
@@ -190,19 +186,18 @@ const login = async ctx => {
   let verificationToken;
   let securityCode;
 
-  stopSpinner = output.spinner('Sending you an email');
+  output.spinner('Sending you an email');
 
   try {
     const data = await executeLogin(apiUrl, email);
     verificationToken = data.token;
     securityCode = data.securityCode;
   } catch (err) {
-    stopSpinner();
-    console.log(error(err.message));
+    output.error(err.message);
     return 1;
   }
 
-  stopSpinner();
+  output.stopSpinner();
 
   // Clear up `Sending email` success message
   process.stdout.write(eraseLines(possibleAddress ? 1 : 2));
@@ -215,7 +210,7 @@ const login = async ctx => {
     )}.\n`
   );
 
-  stopSpinner = output.spinner('Waiting for your confirmation');
+  output.spinner('Waiting for your confirmation');
 
   let token;
 
@@ -228,14 +223,13 @@ const login = async ctx => {
         // /now/registraton is currently returning plain text in that case
         // we just wait for the user to click on the link
       } else {
-        stopSpinner();
-        console.log(err.message);
+        output.error(err.message);
         return 1;
       }
     }
   }
 
-  stopSpinner();
+  output.stopSpinner();
   console.log(ok('Email confirmed'));
 
   // There's no need to save the user since we always

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

@@ -11,7 +11,7 @@ import {
 } from '../util/config/files';
 import getArgs from '../util/get-args';
 import { NowContext } from '../types';
-import createOutput, { Output } from '../util/output';
+import { Output } from '../util/output';
 import { getPkgName } from '../util/pkg-name';
 
 const help = () => {
@@ -54,13 +54,11 @@ export default async function main(ctx: NowContext): Promise<number> {
     return 2;
   }
 
-  const debugEnabled = argv['--debug'];
-  const output = createOutput({ debug: debugEnabled });
-  return logout(ctx.apiUrl, output);
+  return logout(ctx.apiUrl, ctx.output);
 }
 
 const logout = async (apiUrl: string, output: Output) => {
-  const spinner = output.spinner('Logging out...', 200);
+  output.spinner('Logging out…', 200);
 
   const configContent = readConfigFile();
   const authContent = readAuthConfigFile();
@@ -83,7 +81,6 @@ const logout = async (apiUrl: string, output: Output) => {
     writeToAuthConfigFile(authContent);
     output.debug('Configuration has been deleted');
   } catch (err) {
-    spinner();
     output.error(`Couldn't remove config while logging out`);
     return 1;
   }
@@ -98,14 +95,12 @@ const logout = async (apiUrl: string, output: Output) => {
   if (res.status === 403) {
     output.debug('Token is invalid so it cannot be revoked');
   } else if (res.status !== 200) {
-    spinner();
     const err = await res.json();
     output.error('Failed to revoke token');
     output.debug(err ? err.message : '');
     return 1;
   }
 
-  spinner();
   output.log('Logged out!');
   return 0;
 };

packages/now-cli/src/commands/logs.js

@@ -1,7 +1,6 @@
 import mri from 'mri';
 import chalk from 'chalk';
 import Now from '../util';
-import createOutput from '../util/output';
 import logo from '../util/output/logo';
 import elapsed from '../util/output/elapsed.ts';
 import { maybeURL, normalizeURL } from '../util/url';
@@ -59,7 +58,6 @@ export default async function main(ctx) {
   let deploymentIdOrURL;
 
   let debug;
-  let apiUrl;
   let head;
   let limit;
   let follow;
@@ -87,8 +85,12 @@ export default async function main(ctx) {
     return 2;
   }
 
-  const debugEnabled = argv.debug;
-  const output = createOutput({ debug: debugEnabled });
+  const {
+    authConfig: { token },
+    apiUrl,
+    output,
+    config,
+  } = ctx;
 
   try {
     since = argv.since ? toTimestamp(argv.since) : 0;
@@ -117,7 +119,6 @@ export default async function main(ctx) {
   }
 
   debug = argv.debug;
-  apiUrl = ctx.apiUrl;
 
   head = argv.head;
   limit = typeof argv.n === 'number' ? argv.n : 100;
@@ -125,17 +126,14 @@ export default async function main(ctx) {
   if (follow) until = 0;
   outputMode = argv.output in logPrinters ? argv.output : 'short';
 
-  const {
-    authConfig: { token },
-    config,
-  } = ctx;
   const { currentTeam } = config;
-  const now = new Now({ apiUrl, token, debug, currentTeam });
+  const now = new Now({ apiUrl, token, debug, currentTeam, output });
   const client = new Client({
     apiUrl,
     token,
     currentTeam,
-    debug: debugEnabled,
+    debug,
+    output,
   });
   let contextName = null;
 
@@ -154,14 +152,12 @@ export default async function main(ctx) {
   const id = deploymentIdOrURL;
 
   const depFetchStart = Date.now();
-  const cancelWait = output.spinner(
-    `Fetching deployment "${id}" in ${chalk.bold(contextName)}`
-  );
+  output.spinner(`Fetching deployment "${id}" in ${chalk.bold(contextName)}`);
 
   try {
     deployment = await now.findDeployment(id);
   } catch (err) {
-    cancelWait();
+    output.stopSpinner();
     now.close();
 
     if (err.status === 404) {
@@ -182,7 +178,6 @@ export default async function main(ctx) {
     throw err;
   }
 
-  cancelWait();
   output.log(
     `Fetched deployment "${deployment.url}" in ${chalk.bold(
       contextName
@@ -206,6 +201,7 @@ export default async function main(ctx) {
     quiet: false,
     debug,
     findOpts: findOpts1,
+    output,
   });
 
   const printedEventIds = new Set();
@@ -232,6 +228,7 @@ export default async function main(ctx) {
       quiet: false,
       debug,
       findOpts: findOpts2,
+      output,
     });
   }
 
@@ -324,7 +321,7 @@ function printLogRaw(log) {
 
   if (log.object) {
     console.log(log.object);
-  } else {
+  } else if (typeof log.text === 'string') {
     console.log(
       log.text
         .replace(/\n$/, '')