Publish Stable

- @now/build-utils@2.1.0
 - @now/next@2.4.0
 - @now/routing-utils@1.7.0

.circleci/config.yml

@@ -1,501 +0,0 @@
-version: 2
-jobs:
-  install:
-    docker:
-      - image: circleci/node:10
-    working_directory: ~/repo
-    environment:
-      GOPATH: $HOME/go
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - v1-dependencies-{{ checksum "yarn.lock" }}
-            # fallback to using the latest cache if no exact match is found
-            - v1-dependencies-
-      - run:
-          name: Updating apt packages
-          command: sudo apt-get update
-      - run:
-          name: Installing the latest version of Go
-          command: sudo apt-get install golang-go
-      - run:
-          name: Installing Dependencies
-          command: yarn install --check-files --frozen-lockfile
-      - save_cache:
-          paths:
-            - node_modules
-            - packages/gatsby-plugin-now/node_modules
-            - packages/now-build-utils/node_modules
-            - packages/now-cgi/node_modules
-            - packages/now-cli/node_modules
-            - packages/now-client/node_modules
-            - packages/now-go/node_modules
-            - packages/now-next/node_modules
-            - packages/now-node/node_modules
-            - packages/now-node-bridge/node_modules
-            - packages/now-python/node_modules
-            - packages/now-routing-utils/node_modules
-            - packages/now-ruby/node_modules
-            - packages/now-static-build/node_modules
-          key: v1-dependencies-{{ checksum "yarn.lock" }}
-      - persist_to_workspace:
-          root: .
-          paths:
-            - node_modules
-            - packages/gatsby-plugin-now/node_modules
-            - packages/now-build-utils/node_modules
-            - packages/now-cgi/node_modules
-            - packages/now-cli/node_modules
-            - packages/now-client/node_modules
-            - packages/now-go/node_modules
-            - packages/now-next/node_modules
-            - packages/now-node/node_modules
-            - packages/now-node-bridge/node_modules
-            - packages/now-python/node_modules
-            - packages/now-routing-utils/node_modules
-            - packages/now-ruby/node_modules
-            - packages/now-static-build/node_modules
-
-  build:
-    docker:
-      - image: circleci/node:10
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Linking dependencies
-          command: yarn bootstrap
-      - run:
-          name: Building
-          command: yarn build
-      - store_artifacts:
-          path: packages/now-cli/dist
-      - persist_to_workspace:
-          root: .
-          paths:
-            - packages/gatsby-plugin-now/test/fixtures
-            - packages/now-build-utils/dist
-            - packages/now-cgi/dist
-            - packages/now-cli/dist
-            - packages/now-cli/assets
-            - packages/now-client/dist
-            - packages/now-go/dist
-            - packages/now-next/dist
-            - packages/now-node/dist
-            - packages/now-node/test/fixtures/15-helpers/ts/types.d.ts
-            - packages/now-node/test/fixtures/11-symlinks/symlink
-            - packages/now-node-bridge/index.js
-            - packages/now-node-bridge/bridge.js
-            - packages/now-python/dist
-            - packages/now-routing-utils/dist
-            - packages/now-ruby/dist
-            - packages/now-static-build/dist
-            - packages/now-static-build/test/fixtures/10a-gatsby-redirects/plugins
-
-  test-lint:
-    docker:
-      - image: circleci/node:10
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Compiling `now dev` HTML error templates
-          command: node packages/now-cli/scripts/compile-templates.js
-      - run:
-          name: Linting Code
-          command: yarn test-lint
-
-  test-integration-macos-node-8:
-    macos:
-      xcode: '9.0.1'
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Output version
-          command: node --version
-      - run:
-          name: Running Integration Tests
-          command: yarn test-integration --clean false
-
-  test-integration-macos-node-10:
-    macos:
-      xcode: '10.0.0'
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Output version
-          command: node --version
-      - run:
-          name: Running Integration Tests
-          command: yarn test-integration --clean false
-
-  test-integration-macos-node-12:
-    macos:
-      xcode: '10.3.0'
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Output version
-          command: node --version
-      - run:
-          name: Running Integration Tests
-          command: yarn test-integration --clean false
-
-  test-integration-linux-node-8:
-    docker:
-      - image: circleci/node:8
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Output version
-          command: node --version
-      - run:
-          name: Running Integration Tests
-          command: yarn test-integration --clean false
-
-  test-integration-linux-node-10:
-    docker:
-      - image: circleci/node:10
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Output version
-          command: node --version
-      - run:
-          name: Running Integration Tests
-          command: yarn test-integration --clean false
-
-  test-integration-linux-node-12:
-    docker:
-      - image: circleci/node:12
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Output version
-          command: node --version
-      - run:
-          name: Running Integration Tests
-          command: yarn test-integration --clean false
-
-  test-integration-macos-now-dev-node-8:
-    macos:
-      xcode: '9.0.1'
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Output version
-          command: node --version
-      - run:
-          name: Downloading Hugo
-          command: 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:
-          name: Running Integration Tests for `now dev`
-          command: yarn test-integration-now-dev --clean false
-
-  test-integration-macos-now-dev-node-10:
-    macos:
-      xcode: '10.0.0'
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Output version
-          command: node --version
-      - run:
-          name: Downloading Hugo
-          command: 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:
-          name: Running Integration Tests for `now dev`
-          command: yarn test-integration-now-dev --clean false
-
-  test-integration-macos-now-dev-node-12:
-    macos:
-      xcode: '10.3.0'
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Output version
-          command: node --version
-      - run:
-          name: Downloading Hugo
-          command: 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:
-          name: Running Integration Tests for `now dev`
-          command: yarn test-integration-now-dev --clean false
-
-  test-integration-linux-now-dev-node-8:
-    docker:
-      - image: circleci/node:8
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Output version
-          command: node --version
-      - run:
-          name: Downloading Hugo
-          command: curl -L -O https://github.com/gohugoio/hugo/releases/download/v0.55.6/hugo_0.55.6_Linux-64bit.tar.gz && tar -xzf hugo_0.55.6_Linux-64bit.tar.gz && mv ./hugo packages/now-cli/test/dev/fixtures/08-hugo/
-      - run:
-          name: Running Integration Tests for `now dev`
-          command: yarn test-integration-now-dev --clean false
-
-  test-integration-linux-now-dev-node-10:
-    docker:
-      - image: circleci/node:10
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Output version
-          command: node --version
-      - run:
-          name: Downloading Hugo
-          command: curl -L -O https://github.com/gohugoio/hugo/releases/download/v0.55.6/hugo_0.55.6_Linux-64bit.tar.gz && tar -xzf hugo_0.55.6_Linux-64bit.tar.gz && mv ./hugo packages/now-cli/test/dev/fixtures/08-hugo/
-      - run:
-          name: Running Integration Tests for `now dev`
-          command: yarn test-integration-now-dev --clean false
-
-  test-integration-linux-now-dev-node-12:
-    docker:
-      - image: circleci/node:12
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Output version
-          command: node --version
-      - run:
-          name: Downloading Hugo
-          command: curl -L -O https://github.com/gohugoio/hugo/releases/download/v0.55.6/hugo_0.55.6_Linux-64bit.tar.gz && tar -xzf hugo_0.55.6_Linux-64bit.tar.gz && mv ./hugo packages/now-cli/test/dev/fixtures/08-hugo/
-      - run:
-          name: Running Integration Tests for `now dev`
-          command: yarn test-integration-now-dev --clean false
-
-  test-integration-once:
-    docker:
-      - image: circleci/node:10
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Output version
-          command: node --version
-      - run:
-          name: Running Integration Tests Once
-          command: yarn test-integration-once --clean false
-
-  test-unit:
-    docker:
-      - image: circleci/node:10
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Compiling `now dev` HTML error templates
-          command: node packages/now-cli/scripts/compile-templates.js
-      - run:
-          name: Output version
-          command: node --version
-      - run:
-          name: Running Unit Tests
-          command: yarn test-unit --clean false
-      - persist_to_workspace:
-          root: .
-          paths:
-            - packages/now-cli/.nyc_output
-
-  coverage:
-    docker:
-      - image: circleci/node:10
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Run coverage report
-          command: yarn workspace now run coverage
-
-  source-maps:
-    docker:
-      - image: circleci/node:10
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Installing Sentry CLI
-          command: npm install -g @sentry/cli
-      - run:
-          name: Creating a New Sentry Release
-          command: sentry-cli releases new now-cli@`git describe --tags`
-      - run:
-          name: Upload Sourcemap Files
-          command: sentry-cli releases files now-cli@`git describe --tags` upload-sourcemaps ./dist
-      - run:
-          name: Finalize Sentry Release
-          command: sentry-cli releases finalize now-cli@`git describe --tags`
-
-workflows:
-  version: 2
-  unscheduled:
-    jobs:
-      - install:
-          filters:
-            tags:
-              only: /.*/
-      - build:
-          requires:
-            - install
-          filters:
-            tags:
-              only: /.*/
-      - test-lint:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /.*/
-      - test-integration-macos-node-8:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /.*/
-      - test-integration-macos-node-10:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /.*/
-      - test-integration-macos-node-12:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /.*/
-      - test-integration-linux-node-8:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /.*/
-      - test-integration-linux-node-10:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /.*/
-      - test-integration-linux-node-12:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /.*/
-      - test-integration-macos-now-dev-node-8:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /.*/
-      - test-integration-macos-now-dev-node-10:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /.*/
-      - test-integration-macos-now-dev-node-12:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /.*/
-      - test-integration-linux-now-dev-node-8:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /.*/
-      - test-integration-linux-now-dev-node-10:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /.*/
-      - test-integration-linux-now-dev-node-12:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /.*/
-      - test-integration-once:
-          requires:
-            - build
-      - test-unit:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /.*/
-      - coverage:
-          requires:
-            - test-integration-macos-node-8
-            - test-integration-macos-node-10
-            - test-integration-macos-node-12
-            - test-integration-linux-node-8
-            - test-integration-linux-node-10
-            - test-integration-linux-node-12
-            - test-integration-macos-now-dev-node-8
-            - test-integration-macos-now-dev-node-10
-            - test-integration-macos-now-dev-node-12
-            - test-integration-linux-now-dev-node-8
-            - test-integration-linux-now-dev-node-10
-            - test-integration-linux-now-dev-node-12
-            - test-integration-once
-            - test-unit
-            - test-lint
-          filters:
-            tags:
-              only: /.*/

.gitattributes

@@ -1,3 +1,7 @@
 # Ignore test fixtures in GitHub Languages
 # See https://github.com/github/linguist#vendored-code
 packages/*/test/* linguist-vendored
+
+# Go build fails with Windows line endings.
+*.go text eol=lf
+go.mod text eol=lf

.github/CODEOWNERS

@@ -2,6 +2,8 @@
 # https://help.github.com/en/articles/about-code-owners
 
 *                                        @tootallnate @leo
+/.github/workflows                       @AndyBitz @styfle
+/packages/frameworks                     @AndyBitz
 /packages/now-cli/src/commands/dev/      @tootallnate @leo @styfle @AndyBitz
 /packages/now-cli/src/util/dev/          @tootallnate @leo @styfle @AndyBitz
 /packages/now-cli/src/commands/domains/  @javivelasco @mglagola @anatrajkovska
@@ -10,13 +12,16 @@
 /packages/now-build-utils                @styfle @AndyBitz
 /packages/now-node                       @styfle @tootallnate @lucleray
 /packages/now-node-bridge                @styfle @tootallnate @lucleray
-/packages/now-next                       @Timer
+/packages/now-next                       @Timer @ijjk
 /packages/now-go                         @styfle @sophearak
 /packages/now-python                     @styfle @sophearak
 /packages/now-ruby                       @styfle @coetry @nathancahill
 /packages/now-static-build               @styfle @AndyBitz
-/packages/now-routing-utils              @dav-is
+/packages/now-routing-utils              @styfle @dav-is @ijjk
 
 /examples                                @msweeneydev @timothyis
 /examples/create-react-app               @Timer
 /examples/nextjs                         @timneutkens
+/examples/hugo                           @msweeneydev @timothyis @styfle
+/examples/jekyll                         @msweeneydev @timothyis @sarupbanskota
+/examples/zola                           @msweeneydev @timothyis @styfle

.github/CONTRIBUTING.md

@@ -97,10 +97,9 @@ Sometimes you want to test changes to a Builder against an existing project, may
 
 ## Add a New Framework
 
-1. Add the framework to the `@now/frameworks` package.
-   The file is located in `packages/frameworks/frameworks.json`.
-2. Add an example to the `examples/` directory.
-   The name of the directory should equal the slug of the framework in `@now/frameworks`.
-   The `.github/EXAMPLE_README_TEMPLATE.md` file can be used to create a README for the example.
-3. Finally, `@now/static-build` must be adjusted.
-   The files `packages/now-static-build/src/frameworks.ts` has to be extended.
+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 `@now/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 `@now/frameworks`. The `.github/EXAMPLE_README_TEMPLATE.md` file can be used to create a `README.md` file for the example.
+3. Update the `@now/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 ZEIT Now dashboard and deploy it.

.github/EXAMPLE_README_TEMPLATE.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [Name](site-link) site that can be deploy
 
 Deploy your own [Name] project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now-examples/tree/master/example-directory)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now-examples/tree/master/example-directory)
 
 ### How We Created This Example
 

.github/workflows/cancel.yml

@@ -0,0 +1,18 @@
+name: Cancel
+on:
+  push:
+    branches:    
+    - '*'
+    - '!master'
+
+jobs:
+  cancel:
+    name: 'Cancel Previous Runs'
+    runs-on: ubuntu-latest
+    timeout-minutes: 3
+    steps:
+      - uses: styfle/cancel-workflow-action@0.2.0
+        with:
+          workflow_id: 435869
+          access_token: ${{ secrets.GITHUB_WORKFLOW_TOKEN }}
+

.github/workflows/continuous-integration.yml

@@ -0,0 +1,109 @@
+name: CI
+
+on:
+  push:
+    branches:
+    - master
+    tags:
+    - '!*'
+  pull_request:
+
+jobs:
+  test-unit:
+    name: Unit Tests
+    timeout-minutes: 15
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        node: [10, 12]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - run: git fetch origin master --depth=10
+      - run: git fetch origin ${{ github.ref }} --depth=10
+      - uses: actions/setup-node@v1
+      - run: yarn install
+      - run: yarn run build
+      - run: yarn run test-lint
+      - run: yarn run test-unit --clean false
+      - name: Upload Artifact
+        if: matrix.os == 'ubuntu-latest' && matrix.node == 12 # only run once
+        uses: actions/upload-artifact@v1
+        with:
+          name: test-unit-output
+          path: packages/now-cli/.nyc_output
+
+  test-integration:
+    name: Integration Tests
+    timeout-minutes: 120
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: git fetch origin master --depth=10
+      - run: git fetch origin ${{ github.ref }} --depth=10
+      - run: yarn install
+      - run: yarn run build
+      - run: yarn test-integration-once --clean false
+
+  test-now-cli:
+    name: Now CLI Tests
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        node: [10, 12]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - run: git fetch origin master --depth=10
+      - run: git fetch origin ${{ github.ref }} --depth=10
+      - 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 run build
+      - uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node }}
+      - run: yarn test-integration --clean false
+
+  test-now-dev:
+    name: "`now dev` Tests"
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        node: [10, 12]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - run: git fetch origin master --depth=10
+      - run: git fetch origin ${{ github.ref }} --depth=10
+      - 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 run build
+      - uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node }}
+      - run: yarn test-integration-now-dev --clean false
+
+  coverage:
+    name: Coverage
+    timeout-minutes: 10
+    needs: [test-unit, test-now-cli, test-now-dev, test-integration]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: git fetch origin master --depth=10
+      - run: git fetch origin ${{ github.ref }} --depth=10
+      - uses: actions/download-artifact@v1
+        with:
+          name: test-unit-output
+          path: packages/now-cli/.nyc_output
+      - run: yarn install
+      - run: yarn workspace now run coverage

.github/workflows/publish.yml

@@ -4,25 +4,18 @@ on:
   push:
     branches:
     - master
-    - canary
     tags:
     - '!*'
 
 jobs:
-  Publish:
-
+  publish:
+    name: Publish
     runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [10.x]
-
     steps:
     - uses: actions/checkout@v1
-    - name: Checkout
-      uses: actions/setup-node@v1
+    - uses: actions/setup-node@v1
       with:
-        node-version: ${{ matrix.node-version }}
+        node-version: 10
     - name: Install
       run: yarn install --check-files --frozen-lockfile
     - name: Build

README.md

@@ -1,6 +1,6 @@
-![now](https://assets.zeit.co/image/upload/v1542240976/repositories/now-cli/now-cli-repo-banner-v3.png)
+![now](https://assets.zeit.co/image/upload/v1581518533/repositories/now-cli/v4.png)
 
-[![Build Status](https://badgen.net/circleci/github/zeit/now/master)](https://circleci.com/gh/zeit/workflows/now/tree/master)
+[![CI Status](https://badgen.net/github/checks/zeit/now?label=CI)](https://github.com/zeit/now/actions?workflow=CI)
 [![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/zeit)
 
 ## Usage
@@ -16,13 +16,12 @@ To quickly start a new project, run the following commands:
 ```
 now init        # Pick an example project to clone
 cd <PROJECT>    # Change directory to the newly created project
-now dev         # Run locally during development
 now             # Deploy to the cloud
 ```
 
 ## Documentation
 
-For details on how to use Now CLI, check out our [documentation](https://zeit.co/docs).
+For details on how to use Now CLI, check out our [documentation](https://zeit.co/docs/now-cli).
 
 ## Caught a Bug?
 

api/frameworks.ts

@@ -2,17 +2,19 @@ import { NowRequest, NowResponse } from '@now/node';
 import { withApiHandler } from './_lib/util/with-api-handler';
 import frameworkList, { Framework } from '../packages/frameworks';
 
-const frameworks: Framework[] = (frameworkList as Framework[]).map(
-  framework => {
-    delete framework.detectors;
+const frameworks = (frameworkList as Framework[]).map(frameworkItem => {
+  const framework = {
+    ...frameworkItem,
+    hasDetectors: Boolean(frameworkItem.detectors),
+    detectors: undefined,
+  };
 
-    if (framework.logo) {
-      framework.logo = `https://res.cloudinary.com/zeit-inc/image/fetch/${framework.logo}`;
-    }
-
-    return framework;
+  if (framework.logo) {
+    framework.logo = `https://res.cloudinary.com/zeit-inc/image/fetch/${framework.logo}`;
   }
-);
+
+  return framework;
+});
 
 export default withApiHandler(async function(
   req: NowRequest,

examples/amp/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of an [AMP](https://amp.dev/) site that can be
 
 Deploy your own AMP project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/amp)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/amp)
 
 _Live Example: https://amp.now-examples.now.sh_
 

examples/angular/README.md

@@ -1,4 +1,4 @@
-![Angular Logo](../../packages/frameworks/logos/angular.svg)
+![Angular Logo](https://github.com/zeit/now/blob/master/packages/frameworks/logos/angular.svg)
 
 # Angular Example
 
@@ -8,7 +8,7 @@ This directory is a brief example of an [Angular](https://angular.io/) app that
 
 Deploy your own Angular project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/angular)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/angular)
 
 _Live Example: https://angular.now-examples.now.sh_
 

examples/assemble/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [Assemble](http://assemble.io/) app that
 
 Deploy your own Assemble project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/assemble)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/assemble)
 
 _Live Example: https://assemble.now-examples.now.sh_
 

examples/aurelia/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of an [Aurelia](https://aurelia.io/) app that
 
 Deploy your own Aurelia project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/aurelia)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/aurelia)
 
 _Live Example: https://aurelia.now-examples.now.sh_
 

examples/brunch/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [Brunch](https://brunch.io/) site that ca
 
 Deploy your own Brunch project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/brunch)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/brunch)
 
 _Live Example: https://brunch.now-examples.now.sh_
 

examples/charge/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [Charge.js](https://charge.js.org/) site
 
 Deploy your own Charge.js project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/charge)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/charge)
 
 _Live Example: https://charge.now-examples.now.sh_
 

examples/create-react-app/README.md

@@ -1,4 +1,4 @@
-![React Logo](../../packages/frameworks/logos/react.svg)
+![React Logo](https://github.com/zeit/now/blob/master/packages/frameworks/logos/react.svg)
 
 # React Example
 
@@ -8,7 +8,7 @@ This directory is a brief example of a [React](https://reactjs.org/) app with [S
 
 Deploy your own React project, along with Serverless Functions, with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/create-react-app-functions)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/create-react-app-functions)
 
 _Live Example: https://create-react-app.now-examples.now.sh/_
 

examples/custom-build/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of using a Custom Build script that can be dep
 
 Deploy your own Custom Built project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/custom-build)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/custom-build)
 
 _Live Example: https://custom-build.now-examples.now.sh_
 

examples/docusaurus/README.md

@@ -1,4 +1,4 @@
-![Docusaurus Logo](../../packages/frameworks/logos/docusaurus.svg)
+![Docusaurus Logo](https://github.com/zeit/now/blob/master/packages/frameworks/logos/docusaurus.svg)
 
 # Docusaurus Example
 
@@ -8,7 +8,7 @@ This directory is a brief example of a [Docusaurus](https://docusaurus.io/) site
 
 Deploy your own Docusaurus project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/docusaurus)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/docusaurus)
 
 _Live Example: https://docusaurus.now-examples.now.sh_
 

examples/docz/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [Docz](https://www.docz.site/) site that
 
 Deploy your own Docz project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/docz)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/docz)
 
 _Live Example: https://docz.now-examples.now.sh_
 

examples/eleventy/README.md

@@ -1,4 +1,4 @@
-![Eleventy Logo](../../packages/frameworks/logos/eleventy.svg)
+![Eleventy Logo](https://github.com/zeit/now/blob/master/packages/frameworks/logos/eleventy.svg)
 
 # Eleventy Example
 
@@ -8,7 +8,7 @@ This directory is a brief example of a [Eleventy](https://www.11ty.io/) site tha
 
 Deploy your own Eleventy project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/eleventy)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/eleventy)
 
 _Live Example: https://eleventy.now-examples.now.sh_
 

examples/ember/README.md

@@ -1,4 +1,4 @@
-![Ember Logo](../../packages/frameworks/logos/ember.svg)
+![Ember Logo](https://github.com/zeit/now/blob/master/packages/frameworks/logos/ember.svg)
 
 # Ember Example
 
@@ -8,7 +8,7 @@ This directory is a brief example of an [Ember](https://emberjs.com/) app that c
 
 Deploy your own Ember project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/ember)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/ember)
 
 _Live Example: https://ember.now-examples.now.sh_
 

examples/foundation/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [Foundation](https://foundation.zurb.com/
 
 Deploy your own Foundation project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/foundation)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/foundation)
 
 _Live Example: https://foundation.now-examples.now.sh_
 

examples/gatsby/README.md

@@ -1,4 +1,4 @@
-![Gatsby Logo](../../packages/frameworks/logos/gatsby.svg)
+![Gatsby Logo](https://github.com/zeit/now/blob/master/packages/frameworks/logos/gatsby.svg)
 
 # Gatsby Example
 
@@ -8,7 +8,7 @@ This directory is a brief example of a [Gatsby](https://www.gatsbyjs.org/) app w
 
 Deploy your own Gatsby project, along with Serverless Functions, with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/gatsby)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/gatsby)
 
 _Live Example: https://gatsby.now-examples.now.sh_
 

examples/gridsome/README.md

@@ -1,4 +1,4 @@
-![Gridsome Logo](../../packages/frameworks/logos/gridsome.svg)
+![Gridsome Logo](https://github.com/zeit/now/blob/master/packages/frameworks/logos/gridsome.svg)
 
 # Gridsome Example
 
@@ -8,7 +8,7 @@ This directory is a brief example of a [Gridsome](https://gridsome.org/) app tha
 
 Deploy your own Gridsome project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/gridsome)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/gridsome)
 
 _Live Example: https://gridsome.now-examples.now.sh_
 

examples/hexo/README.md

@@ -1,4 +1,4 @@
-![Hexo Logo](../../packages/frameworks/logos/hexo.svg)
+![Hexo Logo](https://github.com/zeit/now/blob/master/packages/frameworks/logos/hexo.svg)
 
 # Hexo Example
 
@@ -8,7 +8,7 @@ This directory is a brief example of a [Hexo](https://hexo.io/) site that can be
 
 Deploy your own Hexo project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/hexo)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/hexo)
 
 _Live Example: https://hexo.now-examples.now.sh_
 

examples/hugo/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [Hugo](https://gohugo.io/) app that can b
 
 Deploy your own Hugo project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/hugo)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/hugo)
 
 _Live Example: https://hugo.now-examples.now.sh_
 

examples/hugo/themes/ananke/.gitignore

@@ -28,3 +28,5 @@ npm-debug.log
 
 /junit.xml
 partials/structure/stylesheet.html
+
+!dist

examples/hugo/themes/ananke/static/dist/js/app.3fc0f988d21662902933.js

@@ -0,0 +1 @@
+!function(n){function t(e){if(r[e])return r[e].exports;var o=r[e]={i:e,l:!1,exports:{}};return n[e].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var r={};t.m=n,t.c=r,t.i=function(n){return n},t.d=function(n,r,e){t.o(n,r)||Object.defineProperty(n,r,{configurable:!1,enumerable:!0,get:e})},t.n=function(n){var r=n&&n.__esModule?function(){return n.default}:function(){return n};return t.d(r,"a",r),r},t.o=function(n,t){return Object.prototype.hasOwnProperty.call(n,t)},t.p="",t(t.s=1)}([function(n,t){},function(n,t,r){"use strict";var e=r(0);!function(n){n&&n.__esModule}(e)}]);

examples/hyperapp/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [HyperApp](https://github.com/jorgebucara
 
 Deploy your own HyperApp project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/hyperapp)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/hyperapp)
 
 _Live Example: https://hyperapp.now-examples.now.sh_
 

examples/ionic-react/readme.md

@@ -6,7 +6,7 @@ This directory is a brief example of an [Ionic React](https://ionicframework.com
 
 Deploy your own Ionic React project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/ionic-react)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/ionic-react)
 
 _Live Example: https://ionic-react.now-examples.now.sh_
 

examples/jekyll/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [Jekyll](https://jekyllrb.com/) site that
 
 Deploy your own Jekyll project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/jekyll)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/jekyll)
 
 _Live Example: https://jekyll.now-examples.now.sh_
 
@@ -25,18 +25,3 @@ You can deploy your new Jekyll project with a single command from your terminal
 ```shell
 $ now
 ```
-
-### Example Changes
-
-This example adds a `package.json` file with the following:
-
-```json
-{
-  "private": true,
-  "scripts": {
-    "build": "jekyll build && mv _site public"
-  }
-}
-```
-
-This instructs ZEIT Now to build the Jekyll website and move the output to the public directory.

examples/marko/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [Marko.js](https://markojs.com/) app that
 
 Deploy your own Marko.js project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/marko)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/marko)
 
 _Live Example: https://marko.now-examples.now.sh_
 

examples/mdx-deck/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [mdx-deck](https://github.com/jxnblk/mdx-
 
 Deploy your own mdx-deck project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/mdx-deck)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/mdx-deck)
 
 _Live Example: https://mdx-deck.now-examples.now.sh_
 

examples/metalsmith/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [Metalsmith](https://metalsmith.io/) app
 
 Deploy your own Metalsmith project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/metalsmith)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/metalsmith)
 
 _Live Example: https://metalsmith.now-examples.now.sh_
 

examples/middleman/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [Middleman](https://middlemanapp.com/) si
 
 Deploy your own Middleman project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/middleman)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/middleman)
 
 _Live Example: https://middleman.now-examples.now.sh_
 

examples/mithril/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [Mithril](https://mithril.js.org/) app th
 
 Deploy your own Mithril project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/mithril)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/mithril)
 
 _Live Example: https://mithril.now-examples.now.sh_
 

examples/mkdocs/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [MkDocs](https://www.mkdocs.org/) site th
 
 Deploy your own MkDocs project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/mkdocs)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/mkdocs)
 
 _Live Example: https://mkdocs.now-examples.now.sh_
 

examples/nextjs/.gitignore

@@ -13,7 +13,6 @@
 
 # misc
 .DS_Store
-.env
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*

examples/nextjs/README.md

@@ -1,4 +1,4 @@
-![Next.js Logo](../../packages/frameworks/logos/next.svg)
+![Next.js Logo](https://github.com/zeit/now/blob/master/packages/frameworks/logos/next.svg)
 
 # Next.js Example
 
@@ -8,7 +8,7 @@ This directory is a brief example of a [Next.js](https://nextjs.org) app that ca
 
 Deploy your own Next.js project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/nextjs)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/nextjs)
 
 _Live Example: https://nextjs.now-examples.now.sh_
 

examples/nuxtjs/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [Nuxt.js](https://nuxtjs.org) app that ca
 
 Deploy your own Nuxt.js project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/nuxtjs)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/nuxtjs)
 
 _Live Example: https://nuxtjs.now-examples.now.sh_
 

examples/pelican/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [Pelican](https://docs.getpelican.com/en/
 
 Deploy your own Pelican project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/pelican)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/pelican)
 
 _Live Example: https://pelican.now-examples.now.sh_
 

examples/polymer/README.md

@@ -1,4 +1,4 @@
-![Polymer Logo](../../packages/frameworks/logos/polymer.svg)
+![Polymer Logo](https://github.com/zeit/now/blob/master/packages/frameworks/logos/polymer.svg)
 
 # Polymer Example
 
@@ -8,7 +8,7 @@ This directory is a brief example of a [Polymer](https://www.polymer-project.org
 
 Deploy your own Polymer project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/polymer)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/polymer)
 
 _Live Example: https://polymer.now-examples.now.sh_
 

examples/preact/README.md

@@ -1,4 +1,4 @@
-![Preact Logo](../../packages/frameworks/logos/preact.svg)
+![Preact Logo](https://github.com/zeit/now/blob/master/packages/frameworks/logos/preact.svg)
 
 # Preact Example
 
@@ -8,7 +8,7 @@ This directory is a brief example of a [Preact](https://preactjs.com/) app that
 
 Deploy your own Preact project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/preact)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/preact)
 
 _Live Example: https://preact.now-examples.now.sh_
 

examples/riot/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [Riot.js](https://riot.js.org/) app that
 
 Deploy your own Riot.js project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/riot)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/riot)
 
 _Live Example: https://riot.now-examples.now.sh_
 

examples/saber/README.md

@@ -1,4 +1,4 @@
-![Saber Logo](../../packages/frameworks/logos/saber.svg)
+![Saber Logo](https://github.com/zeit/now/blob/master/packages/frameworks/logos/saber.svg)
 
 # Saber Example
 
@@ -8,7 +8,7 @@ This directory is a brief example of a [Saber](https://saber.land) site that can
 
 Deploy your own Saber project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/saber)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/saber)
 
 _Live Example: https://saber.now-examples.now.sh_
 

examples/sapper/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [Sapper](https://sapper.svelte.dev/) app
 
 Deploy your own Sapper project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/sapper)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/sapper)
 
 _Live Example: https://sapper.now-examples.now.sh_
 

examples/stencil/readme.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [Stencil](https://stenciljs.com/) app tha
 
 Deploy your own Stencil project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/stencil)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/stencil)
 
 _Live Example: https://stencil.now-examples.now.sh_
 

examples/storybook/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [Storybook](https://storybook.js.org/) ap
 
 Deploy your own Storybook project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/storybook)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/storybook)
 
 _Live Example: https://storybook.now-examples.now.sh_
 

examples/svelte/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [Svelte](https://svelte.dev/) app with [S
 
 Deploy your own Svelte project, along with Serverless Functions, with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/svelte)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/svelte)
 
 _Live Example: https://svelte.now-examples.now.sh_
 

examples/svelte/src/App.svelte

@@ -20,7 +20,7 @@
   </h2>
   <p>
     <a
-      href="https://github.com/zeit/now/tree/master/examples/svelte-functions"
+      href="https://github.com/zeit/now/tree/master/examples/svelte"
       target="_blank"
       rel="noreferrer noopener">
       This project

examples/umijs/README.md

@@ -1,4 +1,4 @@
-![UmiJS Logo](../../packages/frameworks/logos/umi.svg)
+![UmiJS Logo](https://github.com/zeit/now/blob/master/packages/frameworks/logos/umi.svg)
 
 # UmiJS Example
 
@@ -8,7 +8,7 @@ This directory is a brief example of a [UmiJS](https://umijs.org/) app that can
 
 Deploy your own UmiJS project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/umijs)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/umijs)
 
 _Live Example: https://umijs.now-examples.now.sh_
 

examples/vanilla/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a vanilla site that can be deployed with ZE
 
 Deploy your own vanilla website, along with Serverless Functions, with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/vanilla)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/vanilla)
 
 _Live Example: https://vanilla.now-examples.now.sh_
 

examples/vue/README.md

@@ -1,4 +1,4 @@
-![Vue.js Logo](../../packages/frameworks/logos/vue.svg)
+![Vue.js Logo](https://github.com/zeit/now/blob/master/packages/frameworks/logos/vue.svg)
 
 # Vue.js Example
 
@@ -8,7 +8,7 @@ This directory is a brief example of a [Vue.js](https://vuejs.org/) app that can
 
 Deploy your own Vue.js project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/vue)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/vue)
 
 _Live Example: https://vue.now-examples.now.sh_
 

examples/vuepress/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [VuePress](https://vuepress.vuejs.org/) a
 
 Deploy your own VuePress project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/vuepress)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/vuepress)
 
 _Live Example: https://vuepress.now-examples.now.sh_
 

examples/zola/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [Zola](https://www.getzola.org/) site tha
 
 Deploy your own Zola project with ZEIT Now.
 
-[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/new/project?template=https://github.com/zeit/now/tree/master/examples/zola)
+[![Deploy with ZEIT Now](https://zeit.co/button)](https://zeit.co/import/project?template=https://github.com/zeit/now/tree/master/examples/zola)
 
 _Live Example: https://zola.now-examples.now.sh_
 

now.json

@@ -1,15 +1,18 @@
 {
-  "redirects": [
+  "rewrites": [
     {
       "source": "/",
-      "destination": "https://zeit.co/new",
-      "statusCode": 307
+      "destination": "/api/frameworks"
     }
   ],
   "env": {
     "GITHUB_ACCESS_TOKEN": "@now-api-examples-github-token",
     "SENTRY_DSN": "@sentry-product-dsn"
   },
+  "github": {
+    "silent": true,
+    "autoJobCancelation": true
+  },
   "headers": [
     {
       "source": "/api/frameworks",

package.json

@@ -32,7 +32,7 @@
     "bootstrap": "lerna bootstrap",
     "publish-stable": "echo 'Run `yarn changelog` for instructions'",
     "publish-canary": "git pull && lerna version prerelease --preid canary --message 'Publish Canary' --exact",
-    "publish-from-github": "./.circleci/publish.sh",
+    "publish-from-github": "./utils/publish.sh",
     "changelog": "node utils/changelog.js",
     "build": "node utils/run.js build all",
     "test-lint": "node utils/run.js test-lint",
@@ -91,6 +91,7 @@
       "@typescript-eslint/camelcase": 0,
       "@typescript-eslint/explicit-function-return-type": 0,
       "@typescript-eslint/no-empty-function": 0,
+      "@typescript-eslint/no-unused-vars": 2,
       "@typescript-eslint/no-use-before-define": 0
     },
     "overrides": [

packages/frameworks/frameworks.json

@@ -17,7 +17,7 @@
     },
     "settings": {
       "buildCommand": {
-        "placeholder": "`next build` or `build` from `package.json`"
+        "placeholder": "`build` from `package.json` or `next build`"
       },
       "devCommand": {
         "value": "next dev --port $PORT"
@@ -580,7 +580,7 @@
     },
     "settings": {
       "buildCommand": {
-        "value": "hugo"
+        "value": "hugo -D --gc"
       },
       "devCommand": {
         "value": "hugo server -D -w -p $PORT"
@@ -808,5 +808,22 @@
     "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/foundation.svg",
     "tagline": "Foundation is the most advanced responsive front-end framework in the world.",
     "description": "A Foundation app, created with the Foundation CLI."
+  },
+  {
+    "name": "Other",
+    "slug": null,
+    "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/other.svg",
+    "description": "No framework or a unoptimized framework.",
+    "settings": {
+      "buildCommand": {
+        "placeholder": "`build` or `now-build` from `package.json` if it exists"
+      },
+      "devCommand": {
+        "placeholder": "None"
+      },
+      "outputDirectory": {
+        "placeholder": "`public` if it exists, or `.`"
+      }
+    }
   }
 ]

packages/frameworks/index.d.ts

@@ -13,11 +13,11 @@ export type Setting = SettingValue | SettingPlaceholder;
 
 export interface Framework {
   name: string;
-  slug: string;
+  slug: string | null;
   logo: string;
-  demo: string;
-  tagline: string;
-  website: string;
+  demo?: string;
+  tagline?: string;
+  website?: string;
   description: string;
   detectors?: {
     every?: FrameworkDetectionItem[];

packages/frameworks/logos/other.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 4L16 15H4L10 4Z" stroke="#666666" stroke-dasharray="2 2"/>
+</svg>

packages/frameworks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/frameworks",
-  "version": "0.0.6",
+  "version": "0.0.10",
   "main": "frameworks.json",
   "license": "UNLICENSED"
 }

packages/now-build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/build-utils",
-  "version": "1.3.6",
+  "version": "2.1.0",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",

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

@@ -1,423 +0,0 @@
-import { parse as parsePath } from 'path';
-import { Route, Source } from '@now/routing-utils';
-import { Builder } from './types';
-import { getIgnoreApiFilter, sortFiles } from './detect-builders';
-
-function escapeName(name: string) {
-  const special = '[]^$.|?*+()'.split('');
-
-  for (const char of special) {
-    name = name.replace(new RegExp(`\\${char}`, 'g'), `\\${char}`);
-  }
-
-  return name;
-}
-
-function joinPath(...segments: string[]) {
-  const joinedPath = segments.join('/');
-  return joinedPath.replace(/\/{2,}/g, '/');
-}
-
-function concatArrayOfText(texts: string[]): string {
-  if (texts.length <= 2) {
-    return texts.join(' and ');
-  }
-
-  const last = texts.pop();
-  return `${texts.join(', ')}, and ${last}`;
-}
-
-// Takes a filename or foldername, strips the extension
-// gets the part between the "[]" brackets.
-// It will return `null` if there are no brackets
-// and therefore no segment.
-function getSegmentName(segment: string): string | null {
-  const { name } = parsePath(segment);
-
-  if (name.startsWith('[') && name.endsWith(']')) {
-    return name.slice(1, -1);
-  }
-
-  return null;
-}
-
-function createRouteFromPath(
-  filePath: string,
-  featHandleMiss: boolean,
-  cleanUrls: boolean
-): { route: Source; isDynamic: boolean } {
-  const parts = filePath.split('/');
-
-  let counter = 1;
-  const query: string[] = [];
-  let isDynamic = false;
-
-  const srcParts = parts.map((segment, i): string => {
-    const name = getSegmentName(segment);
-    const isLast = i === parts.length - 1;
-
-    if (name !== null) {
-      // We can't use `URLSearchParams` because `$` would get escaped
-      query.push(`${name}=$${counter++}`);
-      isDynamic = true;
-      return `([^/]+)`;
-    } else if (isLast) {
-      const { name: fileName, ext } = parsePath(segment);
-      const isIndex = fileName === 'index';
-      const prefix = isIndex ? '\\/' : '';
-
-      const names = [
-        isIndex ? prefix : `${fileName}\\/`,
-        prefix + escapeName(fileName),
-        featHandleMiss && cleanUrls
-          ? ''
-          : prefix + escapeName(fileName) + escapeName(ext),
-      ].filter(Boolean);
-
-      // Either filename with extension, filename without extension
-      // or nothing when the filename is `index`.
-      // When `cleanUrls: true` then do *not* add the filename with extension.
-      return `(${names.join('|')})${isIndex ? '?' : ''}`;
-    }
-
-    return segment;
-  });
-
-  const { name: fileName, ext } = parsePath(filePath);
-  const isIndex = fileName === 'index';
-  const queryString = `${query.length ? '?' : ''}${query.join('&')}`;
-
-  const src = isIndex
-    ? `^/${srcParts.slice(0, -1).join('/')}${srcParts.slice(-1)[0]}$`
-    : `^/${srcParts.join('/')}$`;
-
-  let route: Source;
-  if (featHandleMiss) {
-    const extensionless = ext ? filePath.slice(0, -ext.length) : filePath;
-    route = {
-      src,
-      dest: `/${extensionless}${queryString}`,
-      check: true,
-    };
-  } else {
-    route = {
-      src,
-      dest: `/${filePath}${queryString}`,
-    };
-  }
-  return { route, isDynamic };
-}
-
-// Check if the path partially matches and has the same
-// name for the path segment at the same position
-function partiallyMatches(pathA: string, pathB: string): boolean {
-  const partsA = pathA.split('/');
-  const partsB = pathB.split('/');
-
-  const long = partsA.length > partsB.length ? partsA : partsB;
-  const short = long === partsA ? partsB : partsA;
-
-  let index = 0;
-
-  for (const segmentShort of short) {
-    const segmentLong = long[index];
-
-    const nameLong = getSegmentName(segmentLong);
-    const nameShort = getSegmentName(segmentShort);
-
-    // If there are no segments or the paths differ we
-    // return as they are not matching
-    if (segmentShort !== segmentLong && (!nameLong || !nameShort)) {
-      return false;
-    }
-
-    if (nameLong !== nameShort) {
-      return true;
-    }
-
-    index += 1;
-  }
-
-  return false;
-}
-
-// Counts how often a path occurs when all placeholders
-// got resolved, so we can check if they have conflicts
-function pathOccurrences(filePath: string, files: string[]): string[] {
-  const getAbsolutePath = (unresolvedPath: string): string => {
-    const { dir, name } = parsePath(unresolvedPath);
-    const parts = joinPath(dir, name).split('/');
-    return parts.map(part => part.replace(/\[.*\]/, '1')).join('/');
-  };
-
-  const currentAbsolutePath = getAbsolutePath(filePath);
-
-  return files.reduce((prev: string[], file: string): string[] => {
-    const absolutePath = getAbsolutePath(file);
-
-    if (absolutePath === currentAbsolutePath) {
-      prev.push(file);
-    } else if (partiallyMatches(filePath, file)) {
-      prev.push(file);
-    }
-
-    return prev;
-  }, []);
-}
-
-// Checks if a placeholder with the same name is used
-// multiple times inside the same path
-function getConflictingSegment(filePath: string): string | null {
-  const segments = new Set<string>();
-
-  for (const segment of filePath.split('/')) {
-    const name = getSegmentName(segment);
-
-    if (name !== null && segments.has(name)) {
-      return name;
-    }
-
-    if (name) {
-      segments.add(name);
-    }
-  }
-
-  return null;
-}
-
-function sortFilesBySegmentCount(fileA: string, fileB: string): number {
-  const lengthA = fileA.split('/').length;
-  const lengthB = fileB.split('/').length;
-
-  if (lengthA > lengthB) {
-    return -1;
-  }
-
-  if (lengthA < lengthB) {
-    return 1;
-  }
-
-  // Paths that have the same segment length but
-  // less placeholders are preferred
-  const countSegments = (prev: number, segment: string) =>
-    getSegmentName(segment) ? prev + 1 : 0;
-  const segmentLengthA = fileA.split('/').reduce(countSegments, 0);
-  const segmentLengthB = fileB.split('/').reduce(countSegments, 0);
-
-  if (segmentLengthA > segmentLengthB) {
-    return 1;
-  }
-
-  if (segmentLengthA < segmentLengthB) {
-    return -1;
-  }
-
-  return 0;
-}
-
-interface ApiRoutesResult {
-  defaultRoutes: Source[] | null;
-  dynamicRoutes: Source[] | null;
-  error: { [key: string]: string } | null;
-}
-
-interface RoutesResult {
-  defaultRoutes: Route[] | null;
-  redirectRoutes: Route[] | null;
-  error: { [key: string]: string } | null;
-}
-
-async function detectApiRoutes(
-  files: string[],
-  builders: Builder[],
-  featHandleMiss: boolean,
-  cleanUrls: boolean
-): Promise<ApiRoutesResult> {
-  if (!files || files.length === 0) {
-    return {
-      defaultRoutes: null,
-      dynamicRoutes: null,
-      error: null,
-    };
-  }
-
-  // The deepest routes need to be
-  // the first ones to get handled
-  const sortedFiles = files
-    .filter(getIgnoreApiFilter(builders))
-    .sort(sortFiles)
-    .sort(sortFilesBySegmentCount);
-
-  const defaultRoutes: Source[] = [];
-  const dynamicRoutes: Source[] = [];
-
-  for (const file of sortedFiles) {
-    // We only consider every file in the api directory
-    // as we will strip extensions as well as resolving "[segments]"
-    if (
-      !file.startsWith('api/') &&
-      !builders.some(b => b.src === file && b.config && b.config.functions)
-    ) {
-      continue;
-    }
-
-    const conflictingSegment = getConflictingSegment(file);
-
-    if (conflictingSegment) {
-      return {
-        defaultRoutes: null,
-        dynamicRoutes: null,
-        error: {
-          code: 'conflicting_path_segment',
-          message:
-            `The segment "${conflictingSegment}" occurs more than ` +
-            `one time in your path "${file}". Please make sure that ` +
-            `every segment in a path is unique`,
-        },
-      };
-    }
-
-    const occurrences = pathOccurrences(file, sortedFiles).filter(
-      name => name !== file
-    );
-
-    if (occurrences.length > 0) {
-      const messagePaths = concatArrayOfText(
-        occurrences.map(name => `"${name}"`)
-      );
-
-      return {
-        defaultRoutes: null,
-        dynamicRoutes: null,
-        error: {
-          code: 'conflicting_file_path',
-          message:
-            `Two or more files have conflicting paths or names. ` +
-            `Please make sure path segments and filenames, without their extension, are unique. ` +
-            `The path "${file}" has conflicts with ${messagePaths}`,
-        },
-      };
-    }
-
-    const out = createRouteFromPath(file, featHandleMiss, cleanUrls);
-    if (out.isDynamic) {
-      dynamicRoutes.push(out.route);
-    }
-    defaultRoutes.push(out.route);
-  }
-
-  return { defaultRoutes, dynamicRoutes, error: null };
-}
-
-function getPublicBuilder(builders: Builder[]): Builder | null {
-  const builder = builders.find(
-    builder =>
-      builder.use === '@now/static' &&
-      /^.*\/\*\*\/\*$/.test(builder.src) &&
-      builder.config &&
-      builder.config.zeroConfig === true
-  );
-
-  return builder || null;
-}
-
-export function detectOutputDirectory(builders: Builder[]): string | null {
-  // TODO: We eventually want to save the output directory to
-  // builder.config.outputDirectory so it is only detected once
-  const publicBuilder = getPublicBuilder(builders);
-  return publicBuilder ? publicBuilder.src.replace('/**/*', '') : null;
-}
-
-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 isZeroConfig = builders.some(b => b.config && b.config.zeroConfig);
-  return isZeroConfig ? 'api' : null;
-}
-
-export async function detectRoutes(
-  files: string[],
-  builders: Builder[],
-  featHandleMiss = false,
-  cleanUrls = false,
-  trailingSlash?: boolean
-): Promise<RoutesResult> {
-  const result = await detectApiRoutes(
-    files,
-    builders,
-    featHandleMiss,
-    cleanUrls
-  );
-  const { dynamicRoutes, defaultRoutes: allRoutes, error } = result;
-  if (error) {
-    return { defaultRoutes: null, redirectRoutes: null, error };
-  }
-  const directory = detectOutputDirectory(builders);
-  const defaultRoutes: Route[] = [];
-  const redirectRoutes: Route[] = [];
-  if (allRoutes && allRoutes.length > 0) {
-    const hasApiRoutes = allRoutes.some(
-      r => r.dest && r.dest.startsWith('/api/')
-    );
-    if (featHandleMiss) {
-      defaultRoutes.push({ handle: 'miss' });
-      const extSet = new Set(
-        builders
-          .filter(b => b.src && b.src.startsWith('api/'))
-          .map(b => parsePath(b.src).ext)
-          .filter(Boolean)
-      );
-      if (extSet.size > 0) {
-        const exts = Array.from(extSet)
-          .map(ext => ext.slice(1))
-          .join('|');
-        const extGroup = `(?:\\.(?:${exts}))`;
-        if (cleanUrls) {
-          redirectRoutes.push({
-            src: `^/(api(?:.+)?)/index${extGroup}?/?$`,
-            headers: { Location: trailingSlash ? '/$1/' : '/$1' },
-            status: 308,
-          });
-          redirectRoutes.push({
-            src: `^/api/(.+)${extGroup}/?$`,
-            headers: { Location: trailingSlash ? '/api/$1/' : '/api/$1' },
-            status: 308,
-          });
-        } else {
-          defaultRoutes.push({
-            src: `^/api/(.+)${extGroup}$`,
-            dest: '/api/$1',
-            check: true,
-          });
-        }
-      }
-      if (dynamicRoutes) {
-        defaultRoutes.push(...dynamicRoutes);
-      }
-      if (hasApiRoutes) {
-        defaultRoutes.push({
-          src: '^/api(/.*)?$',
-          status: 404,
-          continue: true,
-        });
-      }
-    } else {
-      defaultRoutes.push(...allRoutes);
-      if (hasApiRoutes) {
-        defaultRoutes.push({
-          status: 404,
-          src: '^/api(/.*)?$',
-        });
-      }
-    }
-  }
-
-  if (!featHandleMiss && directory) {
-    defaultRoutes.push({
-      src: '/(.*)',
-      dest: `/${directory}/$1`,
-    });
-  }
-
-  return { defaultRoutes, redirectRoutes, error };
-}

packages/now-build-utils/src/fs/glob.ts

@@ -5,7 +5,7 @@ import { promisify } from 'util';
 import { lstat, Stats } from 'fs-extra';
 import FileFsRef from '../file-fs-ref';
 
-type GlobOptions = vanillaGlob_.IOptions;
+export type GlobOptions = vanillaGlob_.IOptions;
 
 interface FsFiles {
   [filePath: string]: FileFsRef;

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

@@ -206,10 +206,10 @@ export async function runNpmInstall(
   debug(`Installing to ${destPath}`);
   const { hasPackageLockJson } = await scanParentDirs(destPath);
 
-  const opts = { cwd: destPath, ...spawnOpts } || {
-    cwd: destPath,
-    env: process.env,
-  };
+  const opts: SpawnOptions = { cwd: destPath, ...spawnOpts };
+  const env = opts.env || { ...process.env };
+  delete env.NODE_ENV;
+  opts.env = env;
 
   if (hasPackageLockJson) {
     commandArgs = args.filter(a => a !== '--prefer-offline');
@@ -239,10 +239,7 @@ export async function runBundleInstall(
   }
 
   assert(path.isAbsolute(destPath));
-  const opts = { cwd: destPath, ...spawnOpts } || {
-    cwd: destPath,
-    env: process.env,
-  };
+  const opts = { cwd: destPath, ...spawnOpts };
 
   await spawnAsync(
     'bundle',
@@ -270,10 +267,7 @@ export async function runPipInstall(
   }
 
   assert(path.isAbsolute(destPath));
-  const opts = { cwd: destPath, ...spawnOpts } || {
-    cwd: destPath,
-    env: process.env,
-  };
+  const opts = { cwd: destPath, ...spawnOpts };
 
   await spawnAsync(
     'pip3',

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

@@ -5,7 +5,7 @@ import { Lambda, createLambda, getLambdaOptionsFromFunction } from './lambda';
 import { Prerender } from './prerender';
 import download, { DownloadedFiles, isSymbolicLink } from './fs/download';
 import getWriteableDirectory from './fs/get-writable-directory';
-import glob from './fs/glob';
+import glob, { GlobOptions } from './fs/glob';
 import rename from './fs/rename';
 import {
   execAsync,
@@ -40,6 +40,7 @@ export {
   DownloadedFiles,
   getWriteableDirectory,
   glob,
+  GlobOptions,
   rename,
   execAsync,
   spawnAsync,
@@ -63,11 +64,11 @@ export {
 };
 
 export {
-  detectRoutes,
+  detectBuilders,
   detectOutputDirectory,
   detectApiDirectory,
-} from './detect-routes';
-export { detectBuilders } from './detect-builders';
+  detectApiExtensions,
+} from './detect-builders';
 export { detectFramework } from './detect-framework';
 export { DetectorFilesystem } from './detectors/filesystem';
 export { readConfigFile } from './fs/read-config-file';

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

@@ -4,20 +4,28 @@ import FileRef from './file-ref';
 import { Lambda } from './lambda';
 
 interface PrerenderOptions {
-  expiration: number;
+  expiration: number | false;
   lambda: Lambda;
   fallback: FileBlob | FileFsRef | FileRef | null;
   group?: number;
+  bypassToken?: string | null /* optional to be non-breaking change */;
 }
 
 export class Prerender {
   public type: 'Prerender';
-  public expiration: number;
+  public expiration: number | false;
   public lambda: Lambda;
   public fallback: FileBlob | FileFsRef | FileRef | null;
   public group?: number;
+  public bypassToken: string | null;
 
-  constructor({ expiration, lambda, fallback, group }: PrerenderOptions) {
+  constructor({
+    expiration,
+    lambda,
+    fallback,
+    group,
+    bypassToken,
+  }: PrerenderOptions) {
     this.type = 'Prerender';
     this.expiration = expiration;
     this.lambda = lambda;
@@ -32,6 +40,22 @@ export class Prerender {
     }
     this.group = group;
 
+    if (bypassToken == null) {
+      this.bypassToken = null;
+    } else if (typeof bypassToken === 'string') {
+      if (bypassToken.length < 32) {
+        // Enforce 128 bits of entropy for safety reasons (UUIDv4 size)
+        throw new Error(
+          'The `bypassToken` argument for `Prerender` must be 32 characters or more.'
+        );
+      }
+      this.bypassToken = bypassToken;
+    } else {
+      throw new Error(
+        'The `bypassToken` argument for `Prerender` must be a `string`.'
+      );
+    }
+
     if (typeof fallback === 'undefined') {
       throw new Error(
         'The `fallback` argument for `Prerender` needs to be a `FileBlob`, `FileFsRef`, `FileRef`, or null.'

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

@@ -31,6 +31,7 @@ export interface Config {
     | undefined;
   maxLambdaSize?: string;
   includeFiles?: string | string[];
+  excludeFiles?: string | string[];
   bundle?: boolean;
   ldsflags?: string;
   helpers?: boolean;

packages/now-build-utils/test/fixtures/16-node-env-install/build.js

@@ -0,0 +1,21 @@
+function checkPkgOrThrow(pkgname) {
+  try {
+    const dep = require(pkgname);
+    if (!dep) {
+      throw new Error('Undefined');
+    }
+  } catch (e) {
+    console.error(`Expected package "${pkgname}" to be installed.`);
+    process.exit(1);
+  }
+}
+
+// We expect both `dependencies` and `devDependencies` to be installed
+// even when NODE_ENV=production.
+checkPkgOrThrow('tls-check');
+checkPkgOrThrow('exeggcute');
+
+// This is to satisfy `@now/static-build` which needs a `dist` directory.
+const { exec } = require('exeggcute');
+exec('mkdir dist', __dirname);
+exec('echo "node-env:RANDOMNESS_PLACEHOLDER" > dist/index.html', __dirname);

packages/now-build-utils/test/fixtures/16-node-env-install/now.json

@@ -0,0 +1,6 @@
+{
+  "version": 2,
+  "builds": [{ "src": "package.json", "use": "@now/static-build" }],
+  "build": { "env": { "NODE_ENV": "production" } },
+  "probes": [{ "path": "/", "mustContain": "node-env:RANDOMNESS_PLACEHOLDER" }]
+}

packages/now-build-utils/test/fixtures/16-node-env-install/package.json

@@ -0,0 +1,12 @@
+{
+  "private": true,
+  "scripts": {
+    "build": "node build.js"
+  },
+  "dependencies": {
+    "tls-check": "1.0.0"
+  },
+  "devDependencies": {
+    "exeggcute": "1.0.0"
+  }
+}

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

@@ -4,7 +4,7 @@ const {
   packAndDeploy,
   testDeployment,
 } = require('../../../test/lib/deployment/test-deployment');
-const { glob, detectBuilders, detectRoutes } = require('../');
+const { glob, detectBuilders } = require('../');
 
 jest.setTimeout(4 * 60 * 1000);
 
@@ -110,8 +110,7 @@ it('Test `detectBuilders` and `detectRoutes`', async () => {
     },
   ];
 
-  const { builders } = await detectBuilders(files, pkg);
-  const { defaultRoutes } = await detectRoutes(files, builders);
+  const { builders, defaultRoutes } = await detectBuilders(files, pkg);
 
   const nowConfig = { builds: builders, routes: defaultRoutes, probes };
   await fs.writeFile(
@@ -126,7 +125,7 @@ it('Test `detectBuilders` and `detectRoutes`', async () => {
   expect(deployment).toBeDefined();
 });
 
-it('Test `detectBuilders` and `detectRoutes` with `index` files', async () => {
+it('Test `detectBuilders` with `index` files', async () => {
   const fixture = path.join(__dirname, 'fixtures', '02-zero-config-api');
   const pkg = await fs.readJSON(path.join(fixture, 'package.json'));
   const fileList = await glob('**', fixture);
@@ -192,8 +191,7 @@ it('Test `detectBuilders` and `detectRoutes` with `index` files', async () => {
     },
   ];
 
-  const { builders } = await detectBuilders(files, pkg);
-  const { defaultRoutes } = await detectRoutes(files, builders);
+  const { builders, defaultRoutes } = await detectBuilders(files, pkg);
 
   const nowConfig = { builds: builders, routes: defaultRoutes, probes };
   await fs.writeFile(

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

@@ -11,6 +11,10 @@ const {
 } = require('../dist');
 
 it('should re-create symlinks properly', async () => {
+  if (process.platform === 'win32') {
+    console.log('Skipping test on windows');
+    return;
+  }
   const files = await glob('**', path.join(__dirname, 'symlinks'));
   assert.equal(Object.keys(files).length, 2);
 
@@ -29,6 +33,10 @@ it('should re-create symlinks properly', async () => {
 });
 
 it('should create zip files with symlinks properly', async () => {
+  if (process.platform === 'win32') {
+    console.log('Skipping test on windows');
+    return;
+  }
   const files = await glob('**', path.join(__dirname, 'symlinks'));
   assert.equal(Object.keys(files).length, 2);
 
@@ -116,10 +124,7 @@ it('should throw for discontinued versions', async () => {
   const realDateNow = Date.now.bind(global.Date);
   global.Date.now = () => new Date('2020-02-14').getTime();
 
-  expect(getSupportedNodeVersion('', false)).rejects.toThrow();
   expect(getSupportedNodeVersion('8.10.x', false)).rejects.toThrow();
-
-  expect(getSupportedNodeVersion('', true)).rejects.toThrow();
   expect(getSupportedNodeVersion('8.10.x', true)).rejects.toThrow();
 
   expect(getDiscontinuedNodeVersions().length).toBe(1);

packages/now-cgi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/cgi",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "license": "MIT",
   "repository": {
     "type": "git",

packages/now-cgi/yarn.lock

@@ -15,7 +15,7 @@
 
 "@zeit/best@0.4.3":
   version "0.4.3"
-  resolved "http://registry.npmjs.org/@zeit/best/-/best-0.4.3.tgz#eaebdfa8b24121a97b1753501ea8c9330d549b30"
+  resolved "https://registry.npmjs.org/@zeit/best/-/best-0.4.3.tgz#eaebdfa8b24121a97b1753501ea8c9330d549b30"
   dependencies:
     arg "1.0.0"
     chalk "2.3.1"
@@ -144,7 +144,7 @@ call-me-maybe@^1.0.1:
 
 chalk@2.3.1:
   version "2.3.1"
-  resolved "http://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
+  resolved "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
   dependencies:
     ansi-styles "^3.2.0"
     escape-string-regexp "^1.0.5"
@@ -585,8 +585,8 @@ minimatch@^3.0.4:
     brace-expansion "^1.1.7"
 
 mixin-deep@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
@@ -704,7 +704,7 @@ rmfr@2.0.0:
 
 safe-regex@^1.1.0:
   version "1.1.0"
-  resolved "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  resolved "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
   dependencies:
     ret "~0.1.10"
 

packages/now-cli/@types/is-port-reachable/index.d.ts

@@ -0,0 +1,10 @@
+declare module 'is-port-reachable' {
+  export interface IsPortReachableOptions {
+    timeout?: number | undefined;
+    host?: string;
+  }
+  export default function(
+    port: number | undefined,
+    options?: IsPortReachableOptions
+  ): Promise<boolean>;
+}

packages/now-cli/README.md

@@ -1,4 +1,4 @@
-![now](https://assets.zeit.co/image/upload/v1542240976/repositories/now-cli/now-cli-repo-banner-v3.png)
+![now](https://assets.zeit.co/image/upload/v1581518533/repositories/now-cli/v4.png)
 
 [![Join the community on Spectrum](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/zeit)
 

packages/now-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "now",
-  "version": "17.0.0-canary.14",
+  "version": "17.0.5-canary.5",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Now",
@@ -12,7 +12,7 @@
   },
   "scripts": {
     "preinstall": "node ./scripts/preinstall.js",
-    "test-unit": "nyc ava test/*unit.js --serial --fail-fast --verbose",
+    "test-unit": "nyc ava test/unit.js test/dev-builder.unit.js test/dev-router.unit.js test/dev-server.unit.js --serial --fail-fast --verbose",
     "test-integration": "ava test/integration.js --serial --fail-fast",
     "test-integration-v1": "ava test/integration-v1.js --serial --fail-fast",
     "test-integration-now-dev": "ava test/dev/integration.js --serial --fail-fast --verbose",
@@ -59,10 +59,11 @@
     ]
   },
   "engines": {
-    "node": ">= 8"
+    "node": ">= 10"
   },
   "devDependencies": {
     "@sentry/node": "5.5.0",
+    "@sindresorhus/slugify": "0.10.0",
     "@types/ansi-escapes": "3.0.0",
     "@types/ansi-regex": "4.0.0",
     "@types/async-retry": "1.2.1",
@@ -89,10 +90,10 @@
     "@types/tar-fs": "1.16.1",
     "@types/text-table": "0.2.0",
     "@types/universal-analytics": "0.4.2",
-    "@types/which": "1.3.1",
+    "@types/which": "1.3.2",
     "@types/write-json-file": "2.2.1",
     "@zeit/dockerignore": "0.0.5",
-    "@zeit/fun": "0.11.0",
+    "@zeit/fun": "0.11.2",
     "@zeit/ncc": "0.18.5",
     "@zeit/source-map-support": "0.6.2",
     "ajv": "6.10.2",
@@ -108,7 +109,7 @@
     "chalk": "2.4.2",
     "chokidar": "2.1.6",
     "clipboardy": "2.1.0",
-    "codecov": "3.1.0",
+    "codecov": "3.6.5",
     "cpy": "7.2.0",
     "credit-card": "3.0.1",
     "date-fns": "1.29.0",
@@ -126,11 +127,13 @@
     "esm": "3.1.4",
     "execa": "3.2.0",
     "fs-extra": "7.0.1",
+    "get-port": "5.1.1",
     "glob": "7.1.2",
     "http-proxy": "1.17.0",
     "ignore": "4.0.6",
     "ini": "1.3.4",
-    "inquirer": "3.3.0",
+    "inquirer": "7.0.4",
+    "is-port-reachable": "3.0.0",
     "is-url": "1.2.2",
     "jaro-winkler": "0.2.8",
     "jsonlines": "0.1.1",
@@ -172,10 +175,10 @@
     "universal-analytics": "0.4.20",
     "update-check": "1.5.3",
     "utility-types": "2.1.0",
-    "which": "1.3.1",
+    "which": "2.0.2",
     "which-promise": "1.0.0",
     "write-json-file": "2.2.0",
     "xdg-app-paths": "5.1.0",
-    "yarn": "1.17.3"
+    "yarn": "1.22.0"
   }
 }

packages/now-cli/scripts/build.ts

@@ -50,21 +50,23 @@ async function createBuildersTarball() {
 async function main() {
   const isDev = process.argv[2] === '--dev';
 
-  // Create a tarball from all the `@now` scoped builders which will be bundled
-  // with Now CLI
-  await createBuildersTarball();
+  if (!isDev) {
+    // Create a tarball from all the `@now` scoped builders which will be bundled
+    // with Now CLI
+    await createBuildersTarball();
 
-  // `now dev` uses chokidar to watch the filesystem, but opts-out of the
-  // `fsevents` feature using `useFsEvents: false`, so delete the module here so
-  // that it is not compiled by ncc, which makes the npm package size larger
-  // than necessary.
-  await remove(join(dirRoot, '../../node_modules/fsevents'));
+    // `now dev` uses chokidar to watch the filesystem, but opts-out of the
+    // `fsevents` feature using `useFsEvents: false`, so delete the module here so
+    // that it is not compiled by ncc, which makes the npm package size larger
+    // than necessary.
+    await remove(join(dirRoot, '../../node_modules/fsevents'));
 
-  // Compile the `doT.js` template files for `now dev`
-  console.log();
-  await execa(process.execPath, [join(__dirname, 'compile-templates.js')], {
-    stdio: 'inherit',
-  });
+    // Compile the `doT.js` template files for `now dev`
+    console.log();
+    await execa(process.execPath, [join(__dirname, 'compile-templates.js')], {
+      stdio: 'inherit',
+    });
+  }
 
   // Do the initial `ncc` build
   console.log();

packages/now-cli/scripts/start.js

@@ -1,25 +1,3 @@
 #!/usr/bin/env node
 
-// This should only be used for the integration tests
-
-const { join } = require('path');
-const { spawnSync } = require('child_process');
-
-const match = process.version.match(/^v(\d+)\.(\d+)/);
-const major = match && parseInt(match[1], 10);
-
-// Must be above or equal to 10.10.0
-// const isVersion = major > 10 || (major === 10 && minor >= 10);
-
-if (major === 8 && process.platform === 'darwin') {
-  const [node, _, ...args] = process.argv; // eslint-disable-line @typescript-eslint/no-unused-vars
-  const script = join(__dirname, '../dist/index.js');
-
-  const { status } = spawnSync(node, ['--no-warnings', script, ...args], {
-    stdio: 'inherit'
-  });
-
-  process.exit(status);
-} else {
-  require('../dist/index.js');
-}
+require('../dist/index.js');

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

@@ -8,12 +8,11 @@ import getAliases from '../../util/alias/get-aliases';
 import getScope from '../../util/get-scope.ts';
 import stamp from '../../util/output/stamp.ts';
 import strlen from '../../util/strlen.ts';
-import wait from '../../util/output/wait';
 
 export default async function ls(ctx, opts, args, output) {
   const {
     authConfig: { token },
-    config
+    config,
   } = ctx;
   const { currentTeam } = config;
   const { apiUrl } = ctx;
@@ -22,7 +21,7 @@ export default async function ls(ctx, opts, args, output) {
     apiUrl,
     token,
     currentTeam,
-    debug: debugEnabled
+    debug: debugEnabled,
   });
   let contextName = null;
 
@@ -51,7 +50,7 @@ export default async function ls(ctx, opts, args, output) {
     return 1;
   }
 
-  cancelWait = wait(
+  cancelWait = output.spinner(
     args[0]
       ? `Fetching alias details for "${args[0]}" under ${chalk.bold(
           contextName
@@ -112,13 +111,13 @@ function printAliasTable(aliases) {
           ? a.deployment.url
           : chalk.gray('–'),
         a.alias,
-        ms(Date.now() - new Date(a.created))
-      ])
+        ms(Date.now() - new Date(a.created)),
+      ]),
     ],
     {
       align: ['l', 'l', 'r'],
       hsep: ' '.repeat(4),
-      stringLength: strlen
+      stringLength: strlen,
     }
   ).replace(/^/gm, '  ')}\n\n`;
 }
@@ -130,13 +129,13 @@ function printPathAliasTable(rules) {
       rules.map(rule => [
         rule.pathname ? rule.pathname : chalk.cyan('[fallthrough]'),
         rule.method ? rule.method : '*',
-        rule.dest
+        rule.dest,
       ])
     ),
     {
       align: ['l', 'l', 'l', 'l'],
       hsep: ' '.repeat(6),
-      stringLength: strlen
+      stringLength: strlen,
     }
   ).replace(/^(.*)/gm, '  $1')}\n`;
 }

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

@@ -21,7 +21,7 @@ export default async function({ creditCards, clear = false, contextName }) {
     name: {
       label: rightPad('Full Name', 12),
       placeholder: 'John Appleseed',
-      validateValue: data => data.trim().length > 0
+      validateValue: data => data.trim().length > 0,
     },
 
     cardNumber: {
@@ -36,7 +36,7 @@ export default async function({ creditCards, clear = false, contextName }) {
           return false;
         }
         return ccValidator.isValidCardNumber(data, type);
-      }
+      },
     },
 
     ccv: {
@@ -46,7 +46,7 @@ export default async function({ creditCards, clear = false, contextName }) {
       validateValue: data => {
         const brand = state.cardNumber.brand.toLowerCase();
         return ccValidator.doesCvvMatchType(data, brand);
-      }
+      },
     },
 
     expDate: {
@@ -54,8 +54,8 @@ export default async function({ creditCards, clear = false, contextName }) {
       mask: 'expDate',
       placeholder: 'mm / yyyy',
       middleware: expDateMiddleware,
-      validateValue: data => !ccValidator.isExpired(...data.split(' / '))
-    }
+      validateValue: data => !ccValidator.isExpired(...data.split(' / ')),
+    },
   };
 
   async function render() {
@@ -80,7 +80,7 @@ export default async function({ creditCards, clear = false, contextName }) {
             mask: piece.mask,
             validateKeypress: piece.validateKeypress,
             validateValue: piece.validateValue,
-            autoComplete: piece.autoComplete
+            autoComplete: piece.autoComplete,
           });
 
           piece.value = result;
@@ -135,7 +135,7 @@ export default async function({ creditCards, clear = false, contextName }) {
         name: state.name.value,
         cardNumber: state.cardNumber.value,
         ccv: state.ccv.value,
-        expDate: state.expDate.value
+        expDate: state.expDate.value,
       });
 
       stopSpinner();
@@ -156,9 +156,9 @@ export default async function({ creditCards, clear = false, contextName }) {
       stopSpinner();
       const linesToClear = state.error ? 15 : 14;
       process.stdout.write(ansiEscapes.eraseLines(linesToClear));
-      state.error = `${chalk.red(
-        '> Error!'
-      )} ${err.message} Please make sure the info is correct`;
+      state.error = `${chalk.red('> Error!')} ${
+        err.message
+      } Please make sure the info is correct`;
       await render();
     }
   }

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

@@ -5,14 +5,11 @@ import Now from '../../util';
 import Client from '../../util/client';
 import getScope from '../../util/get-scope';
 import stamp from '../../util/output/stamp';
-import wait from '../../util/output/wait';
 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 { DomainPermissionDenied, InvalidCert } from '../../util/errors-ts';
-
 interface Options {
   '--overwrite'?: boolean;
   '--debug'?: boolean;
@@ -88,7 +85,7 @@ async function add(
     }
 
     // Create a custom certificate from the given file paths
-    cert = await createCertFromFile(now, keyPath, crtPath, caPath, contextName);
+    cert = await createCertFromFile(now, keyPath, crtPath, caPath);
   } else {
     output.warn(
       `${chalk.cyan(
@@ -112,7 +109,7 @@ async function add(
       (res, item) => res.concat(item.split(',')),
       []
     );
-    const cancelWait = wait(
+    const cancelWait = output.spinner(
       `Generating a certificate for ${chalk.bold(cns.join(', '))}`
     );
 

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

@@ -87,13 +87,7 @@ export default async function issue(
     }
 
     // Create a custom certificate from the given file paths
-    cert = await createCertFromFile(
-      client,
-      keyPath,
-      crtPath,
-      caPath,
-      contextName
-    );
+    cert = await createCertFromFile(client, keyPath, crtPath, caPath);
 
     if (cert instanceof Error) {
       output.error(cert.message);

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

@@ -38,7 +38,6 @@ export const latestHelp = () => `
     -h, --help                     Output usage information
     -v, --version                  Output the version number
     -V, --platform-version         Set the platform version to deploy to
-    -n, --name                     Set the project name of the deployment
     -A ${chalk.bold.underline('FILE')}, --local-config=${chalk.bold.underline(
   'FILE'
 )}   Path to the local ${'`now.json`'} file
@@ -66,6 +65,7 @@ export const latestHelp = () => `
     -S, --scope                    Set a custom scope
     --regions                      Set default regions to enable the deployment on
     --prod                         Create a production deployment
+    -c, --confirm                  Confirm default options and skip questions
 
   ${note(
     `To view the usage information for Now 1.0, run ${code(
@@ -96,7 +96,6 @@ export const latestHelp = () => `
 `;
 
 export const latestArgs = {
-  '--name': String,
   '--force': Boolean,
   '--public': Boolean,
   '--no-clipboard': Boolean,
@@ -107,10 +106,8 @@ export const latestArgs = {
   // This is not an array in favor of matching
   // the config property name.
   '--regions': String,
-  '--target': String,
   '--prod': Boolean,
   '--confirm': Boolean,
-  '-n': '--name',
   '-f': '--force',
   '-p': '--public',
   '-e': '--env',
@@ -118,6 +115,11 @@ export const latestArgs = {
   '-C': '--no-clipboard',
   '-m': '--meta',
   '-c': '--confirm',
+
+  // deprecated
+  '--name': String,
+  '-n': '--name',
+  '--target': String,
 };
 
 export const legacyArgsMri = {

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

@@ -186,8 +186,7 @@ export default async ctx => {
       contextName,
       output,
       stats,
-      localConfig || {},
-      isFile,
+      localConfig,
       parts.latestArgs
     );
   }

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

@@ -1,5 +1,6 @@
 import ms from 'ms';
 import bytes from 'bytes';
+import { join } from 'path';
 import { write as copy } from 'clipboardy';
 import chalk from 'chalk';
 import title from 'title';
@@ -47,8 +48,12 @@ import {
 import getProjectName from '../../util/get-project-name';
 import selectOrg from '../../util/input/select-org';
 import inputProject from '../../util/input/input-project';
-import validatePaths from '../../util/validate-paths';
 import { prependEmoji, emoji } from '../../util/emoji';
+import { inputRootDirectory } from '../../util/input/input-root-directory';
+import validatePaths, {
+  validateRootDirectory,
+} from '../../util/validate-paths';
+import { readLocalConfig } from '../../util/config/files';
 
 const addProcessEnv = async (log, env) => {
   let val;
@@ -90,7 +95,7 @@ const printDeploymentStatus = async (
   },
   deployStamp,
   isClipboardEnabled,
-  quiet
+  isFile
 ) => {
   const isProdDeployment = target === 'production';
 
@@ -113,7 +118,7 @@ const printDeploymentStatus = async (
     // print preview/production url
     let previewUrl;
     let isWildcard;
-    if (Array.isArray(aliasList) && aliasList.length > 0) {
+    if (!isFile && Array.isArray(aliasList) && aliasList.length > 0) {
       // search for a non now.sh/non wildcard domain
       // but fallback to the first alias in the list
       const mainAlias =
@@ -130,22 +135,22 @@ const printDeploymentStatus = async (
     }
 
     // copy to clipboard
+    let isCopiedToClipboard = false;
     if (isClipboardEnabled && !isWildcard) {
-      await copy(previewUrl).catch(error =>
-        output.debug(`Error copying to clipboard: ${error}`)
-      );
-    }
-
-    // write to stdout
-    if (quiet) {
-      process.stdout.write(`https://${deploymentUrl}`);
+      await copy(previewUrl)
+        .then(() => {
+          isCopiedToClipboard = true;
+        })
+        .catch(error => output.debug(`Error copying to clipboard: ${error}`));
     }
 
     output.print(
       prependEmoji(
         `${isProdDeployment ? 'Production' : 'Preview'}: ${chalk.bold(
           previewUrl
-        )} ${deployStamp()}`,
+        )}${
+          isCopiedToClipboard ? chalk.gray(` [copied to clipboard]`) : ''
+        } ${deployStamp()}`,
         emoji('success')
       ) + `\n`
     );
@@ -201,7 +206,6 @@ export default async function main(
   output,
   stats,
   localConfig,
-  isFile,
   args
 ) {
   let argv = null;
@@ -224,26 +228,161 @@ export default async function main(
   // $FlowFixMe
   const isTTY = process.stdout.isTTY;
   const quiet = !isTTY;
-  const autoConfirm = argv['--confirm'];
 
   // check paths
-  const path = await validatePaths(output, paths);
-  if (typeof path === 'number') {
-    return path;
+  const pathValidation = await validatePaths(output, paths);
+
+  if (!pathValidation.valid) {
+    return pathValidation.exitCode;
   }
 
-  // build `meta`
-  const meta = Object.assign(
-    {},
-    parseMeta(localConfig.meta),
-    parseMeta(argv['--meta'])
-  );
+  const { isFile, path } = pathValidation;
+  const autoConfirm = argv['--confirm'] || isFile;
 
   // --no-scale
   if (argv['--no-scale']) {
     warn(`The option --no-scale is only supported on Now 1.0 deployments`);
   }
 
+  // deprecate --name
+  if (argv['--name']) {
+    output.print(
+      `${prependEmoji(
+        `The ${param('--name')} flag is deprecated (https://zeit.ink/1B)`,
+        emoji('warning')
+      )}\n`
+    );
+  }
+
+  const client = new Client({
+    apiUrl: ctx.apiUrl,
+    token: ctx.authConfig.token,
+    debug: debugEnabled,
+  });
+
+  // retrieve `project` and `org` from .now
+  const link = await getLinkedProject(output, client, path);
+
+  if (link.status === 'error') {
+    return link.exitCode;
+  }
+
+  let { org, project, status } = link;
+  let newProjectName = null;
+  let rootDirectory = project ? project.rootDirectory : null;
+
+  if (status === 'not_linked') {
+    const shouldStartSetup =
+      autoConfirm ||
+      (await confirm(
+        `Set up and deploy ${chalk.cyan(`“${toHumanPath(path)}”`)}?`,
+        true
+      ));
+
+    if (!shouldStartSetup) {
+      output.print(`Aborted. Project not set up.\n`);
+      return 0;
+    }
+
+    org = await selectOrg(
+      output,
+      'Which scope do you want to deploy to?',
+      client,
+      ctx.config.currentTeam,
+      autoConfirm
+    );
+
+    // We use `localConfig` here to read the name
+    // even though the `now.json` file can change
+    // afterwards, this is fine since the property
+    // will be deprecated and can be replaced with
+    // user input.
+    const detectedProjectName = getProjectName({
+      argv,
+      nowConfig: localConfig || {},
+      isFile,
+      paths,
+    });
+
+    const projectOrNewProjectName = await inputProject(
+      output,
+      client,
+      org,
+      detectedProjectName,
+      autoConfirm
+    );
+
+    if (typeof projectOrNewProjectName === 'string') {
+      newProjectName = projectOrNewProjectName;
+      rootDirectory = await inputRootDirectory(path, output, autoConfirm);
+    } else {
+      project = projectOrNewProjectName;
+      rootDirectory = project.rootDirectory;
+
+      // we can already link the project
+      await linkFolderToProject(
+        output,
+        path,
+        {
+          projectId: project.id,
+          orgId: org.id,
+        },
+        project.name,
+        org.slug
+      );
+      status = 'linked';
+    }
+  }
+
+  const sourcePath = rootDirectory ? join(path, rootDirectory) : path;
+
+  if (
+    rootDirectory &&
+    (await validateRootDirectory(
+      output,
+      path,
+      sourcePath,
+      project
+        ? `To change your project settings, go to https://zeit.co/${org.slug}/${project.name}/settings`
+        : ''
+    )) === false
+  ) {
+    return 1;
+  }
+
+  // If Root Directory is used we'll try to read the config
+  // from there instead and use it if it exists.
+  if (rootDirectory) {
+    const rootDirectoryConfig = readLocalConfig(sourcePath);
+
+    if (rootDirectoryConfig) {
+      debug(`Read local config from root directory (${rootDirectory})`);
+      localConfig = rootDirectoryConfig;
+    } else if (localConfig) {
+      output.print(
+        `${prependEmoji(
+          `The ${highlight(
+            'now.json'
+          )} file should be inside of the provided root directory.`,
+          emoji('warning')
+        )}\n`
+      );
+    }
+  }
+
+  localConfig = localConfig || {};
+
+  if (localConfig.name) {
+    output.print(
+      `${prependEmoji(
+        `The ${code('name')} property in ${highlight(
+          'now.json'
+        )} is deprecated (https://zeit.ink/5F)`,
+        emoji('warning')
+      )}\n`
+    );
+  }
+
   // build `env`
   const isObject = item =>
     Object.prototype.toString.call(item) === '[object Object]';
@@ -283,6 +422,13 @@ export default async function main(
     }
   }
 
+  // build `meta`
+  const meta = Object.assign(
+    {},
+    parseMeta(localConfig.meta),
+    parseMeta(argv['--meta'])
+  );
+
   // Merge dotenv config, `env` from now.json, and `--env` / `-e` arguments
   const deploymentEnv = Object.assign(
     {},
@@ -340,81 +486,6 @@ export default async function main(
     target = 'production';
   }
 
-  const client = new Client({
-    apiUrl: ctx.apiUrl,
-    token: ctx.authConfig.token,
-    debug: debugEnabled,
-  });
-
-  // retrieve `project` and `org` from .now
-  let [org, project] = await getLinkedProject(client, path);
-  let newProjectName = null;
-
-  if (!org || !project) {
-    const { NOW_PROJECT_ID, NOW_ORG_ID } = process.env;
-    if (NOW_PROJECT_ID && NOW_ORG_ID) {
-      output.print(
-        `${chalk.red('Error!')} Project not found (${JSON.stringify({
-          NOW_PROJECT_ID,
-          NOW_ORG_ID,
-        })})\n`
-      );
-      return 1;
-    }
-
-    const shouldStartSetup =
-      autoConfirm ||
-      (await confirm(
-        `Set up and deploy ${chalk.cyan(`“${toHumanPath(path)}”`)}?`,
-        true
-      ));
-
-    if (!shouldStartSetup) {
-      output.print(`Aborted. Project not set up.\n`);
-      return 0;
-    }
-
-    org = await selectOrg(
-      'Which scope do you want to deploy to?',
-      client,
-      ctx.config.currentTeam,
-      autoConfirm
-    );
-
-    const detectedProjectName = getProjectName({
-      argv,
-      nowConfig: localConfig,
-      isFile,
-      paths,
-    });
-
-    const projectOrNewProjectName = await inputProject(
-      output,
-      client,
-      org,
-      detectedProjectName,
-      autoConfirm
-    );
-
-    if (typeof projectOrNewProjectName === 'string') {
-      newProjectName = projectOrNewProjectName;
-    } else {
-      project = projectOrNewProjectName;
-
-      // we can already link the project
-      await linkFolderToProject(
-        output,
-        path,
-        {
-          projectId: project.id,
-          orgId: org.id,
-        },
-        project.name,
-        org.slug
-      );
-    }
-  }
-
   const currentTeam = org.type === 'team' ? org.id : undefined;
   const now = new Now({ apiUrl, token, debug: debugEnabled, currentTeam });
   let deployStamp = stamp();
@@ -442,11 +513,11 @@ export default async function main(
       output,
       now,
       contextName,
-      [path],
+      [sourcePath],
       createArgs,
       org,
-      autoConfirm,
-      !!newProjectName
+      !project && !isFile,
+      path
     );
 
     if (
@@ -455,6 +526,10 @@ export default async function main(
     ) {
       let { projectSettings, framework } = deployment;
 
+      if (rootDirectory) {
+        projectSettings.rootDirectory = rootDirectory;
+      }
+
       const settings = await editProjectSettings(
         output,
         projectSettings,
@@ -470,11 +545,11 @@ export default async function main(
         output,
         now,
         contextName,
-        [path],
+        [sourcePath],
         createArgs,
         org,
-        !!newProjectName,
-        false
+        false,
+        path
       );
     }
 
@@ -483,6 +558,19 @@ export default async function main(
       return 1;
     }
 
+    if (deployment instanceof Error) {
+      output.error(
+        `${deployment.message ||
+          'An unexpected error occurred while deploying your project'} (http://zeit.ink/P4)`
+      );
+      return 1;
+    }
+
+    if (deployment.readyState === 'CANCELED') {
+      output.log('The deployment has been canceled');
+      return 1;
+    }
+
     const deploymentResponse = await getDeploymentByIdOrHost(
       now,
       contextName,
@@ -569,7 +657,12 @@ export default async function main(
       output.error('Build failed');
       output.error(
         `Check your logs at ${now.url}/_logs or run ${code(
-          `now logs ${now.url}`
+          `now logs ${now.url}`,
+          {
+            // Backticks are interpreted as part of the URL, causing CMD+Click
+            // behavior to fail in editors like VSCode.
+            backticks: false,
+          }
         )}`
       );
 
@@ -598,7 +691,7 @@ export default async function main(
     deployment,
     deployStamp,
     !argv['--no-clipboard'],
-    quiet
+    isFile
   );
 }
 
@@ -646,6 +739,11 @@ function handleCreateDeployError(output, error) {
       return 1;
     }
 
+    if (dataPath === '.name') {
+      output.error(message);
+      return 1;
+    }
+
     if (keyword === 'type') {
       const prop = dataPath.substr(1, dataPath.length);
 

packages/now-cli/src/commands/deploy/legacy.ts

@@ -1,4 +1,4 @@
-import { resolve, basename, join } from 'path';
+import { resolve, basename } from 'path';
 import { eraseLines } from 'ansi-escapes';
 // @ts-ignore
 import { write as copy } from 'clipboardy';
@@ -70,7 +70,6 @@ import {
   InvalidRegionOrDCForScale,
 } from '../../util/errors';
 import { SchemaValidationFailed } from '../../util/errors';
-import readPackage from '../../util/read-package';
 
 interface Env {
   [name: string]: string | null | undefined;
@@ -213,43 +212,6 @@ const promptForEnvFields = async (list: string[]) => {
   return answers;
 };
 
-async function canUseZeroConfig(cwd: string): Promise<boolean> {
-  try {
-    const pkg = await readPackage(join(cwd, 'package.json'));
-
-    if (!pkg || pkg instanceof Error) {
-      return false;
-    }
-
-    const deps = Object.assign({}, pkg.dependencies, pkg.devDependencies);
-
-    // We can only check for a few frontends,
-    // since can never be sure if APIs will work
-    // with zero-config
-    if (
-      deps.next ||
-      deps.nuxt ||
-      deps.gatsby ||
-      deps.hexo ||
-      deps.gridsome ||
-      deps.umi ||
-      deps.docusaurus ||
-      deps['@docusaurus/core'] ||
-      deps['preact-cli'] ||
-      deps['ember-cli'] ||
-      deps['@vue/cli-service'] ||
-      deps['@angular/cli'] ||
-      deps['polymer-cli'] ||
-      deps['sirv-cli'] ||
-      deps['react-scripts']
-    ) {
-      return true;
-    }
-  } catch (_) {}
-
-  return false;
-}
-
 export default async function main(
   ctx: any,
   contextName: string,
@@ -890,7 +852,7 @@ async function sync({
     const { url } = now;
     const dcs =
       deploymentType !== 'static' && deployment.scale
-        ? chalk` ({bold ${Object.keys(deployment.scale).join(', ')})`
+        ? ` (${ chalk.bold(Object.keys(deployment.scale).join(', ')) })`
         : '';
 
     if (isTTY) {

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

@@ -1,10 +1,15 @@
 import path from 'path';
+import chalk from 'chalk';
 
-import pkg from '../../../package.json';
 import DevServer from '../../util/dev/server';
 import parseListen from '../../util/dev/parse-listen';
 import { Output } from '../../util/output';
 import { NowContext } 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 cmd from '../../util/output/cmd';
 
 type Options = {
   '--debug'?: boolean;
@@ -18,10 +23,62 @@ export default async function dev(
   output: Output
 ) {
   const [dir = '.'] = args;
-  const cwd = path.resolve(dir);
+  let cwd = path.resolve(dir);
   const listen = parseListen(opts['--listen'] || '3000');
   const debug = opts['--debug'] || false;
-  const devServer = new DevServer(cwd, { output, debug });
+
+  const client = new Client({
+    apiUrl: ctx.apiUrl,
+    token: ctx.authConfig.token,
+    currentTeam: ctx.config.currentTeam,
+    debug,
+  });
+
+  // retrieve dev command
+  const [link, frameworks] = await Promise.all([
+    getLinkedProject(output, client, cwd),
+    getFrameworks(),
+  ]);
+
+  if (link.status === 'error') {
+    return link.exitCode;
+  }
+
+  if (link.status === 'not_linked' && !process.env.__NOW_SKIP_DEV_COMMAND) {
+    output.print(
+      `${chalk.red(
+        'Error!'
+      )} Your codebase isn’t linked to a project on ZEIT Now. Run ${cmd(
+        'now'
+      )} to link it.\n`
+    );
+    return 1;
+  }
+
+  let devCommand: undefined | string;
+  if (link.status === 'linked') {
+    const { project } = link;
+
+    if (project.devCommand) {
+      devCommand = project.devCommand;
+    } else if (project.framework) {
+      const framework = frameworks.find(f => f.slug === project.framework);
+
+      if (framework) {
+        const defaults = framework.settings.devCommand;
+
+        if (isSettingValue(defaults)) {
+          devCommand = defaults.value;
+        }
+      }
+    }
+
+    if (project.rootDirectory) {
+      cwd = path.join(cwd, project.rootDirectory);
+    }
+  }
+
+  const devServer = new DevServer(cwd, { output, debug, devCommand });
 
   process.once('SIGINT', () => devServer.stop());
 

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

@@ -13,7 +13,6 @@ import param from '../../util/output/param';
 import promptBool from '../../util/input/prompt-bool';
 import purchaseDomain from '../../util/domains/purchase-domain';
 import stamp from '../../util/output/stamp';
-import wait from '../../util/output/wait';
 
 type Options = {
   '--debug': boolean;
@@ -27,7 +26,7 @@ export default async function buy(
 ) {
   const {
     authConfig: { token },
-    config
+    config,
   } = ctx;
   const { currentTeam } = config;
   const { apiUrl } = ctx;
@@ -100,7 +99,7 @@ export default async function buy(
 
   let buyResult;
   const purchaseStamp = stamp();
-  const stopPurchaseSpinner = wait('Purchasing');
+  const stopPurchaseSpinner = output.spinner('Purchasing');
 
   try {
     buyResult = await purchaseDomain(client, domainName, price);

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

@@ -9,7 +9,6 @@ import listInput from '../../util/input/list';
 import listItem from '../../util/output/list-item';
 import promptBool from '../../util/input/prompt-bool';
 import toHumanPath from '../../util/humanize-path';
-import wait from '../../util/output/wait';
 import { Output } from '../../util/output';
 import { NowContext } from '../../types';
 import success from '../../util/output/success';
@@ -24,10 +23,10 @@ type Options = {
 };
 
 type Example = {
-  name: string,
-  visible: boolean,
-  suggestions: string[]
-}
+  name: string;
+  visible: boolean;
+  suggestions: string[];
+};
 
 const EXAMPLE_API = 'https://now-example-files.zeit.sh';
 
@@ -40,7 +39,7 @@ export default async function init(
   const [name, dir] = args;
   const force = opts['-f'] || opts['--force'];
 
-  const examples = await fetchExampleList();
+  const examples = await fetchExampleList(output);
 
   if (!examples) {
     throw new Error(`Could not fetch example list.`);
@@ -56,22 +55,22 @@ export default async function init(
       return 0;
     }
 
-    return extractExample(chosen, dir, force);
+    return extractExample(output, chosen, dir, force);
   }
 
   if (exampleList.includes(name)) {
-    return extractExample(name, dir, force);
+    return extractExample(output, name, dir, force);
   }
 
   const oldExample = examples.find(x => !x.visible && x.name === name);
   if (oldExample) {
-    return extractExample(name, dir, force, 'v1');
+    return extractExample(output, name, dir, force, 'v1');
   }
 
   const found = await guess(exampleList, name);
 
   if (typeof found === 'string') {
-    return extractExample(found, dir, force);
+    return extractExample(output, found, dir, force);
   }
 
   console.log(info('No changes made.'));
@@ -81,8 +80,8 @@ export default async function init(
 /**
  * Fetch example list json
  */
-async function fetchExampleList() {
-  const stopSpinner = wait('Fetching examples');
+async function fetchExampleList(output: Output) {
+  const stopSpinner = output.spinner('Fetching examples');
   const url = `${EXAMPLE_API}/v2/list.json`;
 
   try {
@@ -93,7 +92,7 @@ async function fetchExampleList() {
       throw new Error(`Failed fetching list.json (${resp.statusText}).`);
     }
 
-    return await resp.json() as Example[];
+    return (await resp.json()) as Example[];
   } catch (e) {
     stopSpinner();
   }
@@ -106,22 +105,28 @@ async function chooseFromDropdown(message: string, exampleList: string[]) {
   const choices = exampleList.map(name => ({
     name,
     value: name,
-    short: name
+    short: name,
   }));
 
   return listInput({
     message,
     separator: false,
-    choices
+    choices,
   });
 }
 
 /**
  * Extract example to directory
  */
-async function extractExample(name: string, dir: string, force?: boolean, ver: string = 'v2') {
+async function extractExample(
+  output: Output,
+  name: string,
+  dir: string,
+  force?: boolean,
+  ver: string = 'v2'
+) {
   const folder = prepareFolder(process.cwd(), dir || name, force);
-  const stopSpinner = wait(`Fetching ${name}`);
+  const stopSpinner = output.spinner(`Fetching ${name}`);
 
   const url = `${EXAMPLE_API}/${ver}/download/${name}.tar.gz`;
 

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

@@ -9,7 +9,6 @@ import createOutput from '../util/output';
 import Now from '../util';
 import logo from '../util/output/logo';
 import elapsed from '../util/output/elapsed.ts';
-import wait from '../util/output/wait';
 import { handleError } from '../util/error';
 import strlen from '../util/strlen.ts';
 import Client from '../util/client.ts';
@@ -79,13 +78,16 @@ export default async function main(ctx) {
     return 1;
   }
 
-  const { authConfig: { token }, config } = ctx;
+  const {
+    authConfig: { token },
+    config,
+  } = ctx;
   const { currentTeam } = config;
   const client = new Client({
     apiUrl,
     token,
     currentTeam,
-    debug: debugEnabled
+    debug: debugEnabled,
   });
   let contextName = null;
 
@@ -104,7 +106,7 @@ export default async function main(ctx) {
 
   // resolve the deployment, since we might have been given an alias
   const depFetchStart = Date.now();
-  const cancelWait = wait(
+  const cancelWait = output.spinner(
     `Fetching deployment "${id}" in ${chalk.bold(contextName)}`
   );
 
@@ -140,7 +142,7 @@ export default async function main(ctx) {
     limits,
     version,
     routes,
-    readyState
+    readyState,
   } = deployment;
 
   const isBuilds = version === 2;
@@ -159,7 +161,7 @@ export default async function main(ctx) {
             )}/events?types=event`
           )
         ),
-    isBuilds ? now.fetch(buildsUrl) : { builds: [] }
+    isBuilds ? now.fetch(buildsUrl) : { builds: [] },
   ]);
 
   cancelWait();
@@ -174,7 +176,9 @@ export default async function main(ctx) {
   print(`    ${chalk.cyan('version')}\t${version}\n`);
   print(`    ${chalk.cyan('id')}\t\t${finalId}\n`);
   print(`    ${chalk.cyan('name')}\t${name}\n`);
-  print(`    ${chalk.cyan('readyState')}\t${stateString(state || readyState)}\n`);
+  print(
+    `    ${chalk.cyan('readyState')}\t${stateString(state || readyState)}\n`
+  );
   if (!isBuilds) {
     print(`    ${chalk.cyan('type')}\t${type}\n`);
   }
@@ -255,7 +259,7 @@ export default async function main(ctx) {
       `${table(t, {
         align: ['l', 'c', 'c', 'c'],
         hsep: ' '.repeat(8),
-        stringLength: strlen
+        stringLength: strlen,
       }).replace(/^(.*)/gm, '    $1')}\n`
     );
     print('\n');
@@ -269,9 +273,9 @@ export default async function main(ctx) {
     events.forEach(data => {
       if (!data.event) return; // keepalive
       print(
-        `    ${chalk.gray(
-          new Date(data.created).toISOString()
-        )} ${data.event} ${getEventMetadata(data)}\n`
+        `    ${chalk.gray(new Date(data.created).toISOString())} ${
+          data.event
+        } ${getEventMetadata(data)}\n`
       );
     });
     print('\n');

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

@@ -8,10 +8,7 @@ import chalk from 'chalk';
 import ua from '../util/ua.ts';
 import getArgs from '../util/get-args';
 import error from '../util/output/error';
-import aborted from '../util/output/aborted';
-import wait from '../util/output/wait';
 import highlight from '../util/output/highlight';
-import info from '../util/output/info';
 import ok from '../util/output/ok';
 import cmd from '../util/output/cmd.ts';
 import param from '../util/output/param.ts';
@@ -24,7 +21,8 @@ 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 executeLogin from '../util/login/login.ts';
+import { prependEmoji, emoji } from '../util/emoji';
 
 const debug = debugFactory('now:sh:login');
 
@@ -57,7 +55,7 @@ const help = () => {
 const verify = async ({ apiUrl, email, verificationToken }) => {
   const query = {
     email,
-    token: verificationToken
+    token: verificationToken,
   };
 
   debug('GET /now/registration/verify');
@@ -68,7 +66,7 @@ const verify = async ({ apiUrl, email, verificationToken }) => {
     res = await fetch(
       `${apiUrl}/now/registration/verify?${stringifyQuery(query)}`,
       {
-        headers: { 'User-Agent': ua }
+        headers: { 'User-Agent': ua },
       }
     );
   } catch (err) {
@@ -105,12 +103,12 @@ const readEmail = async () => {
   let email;
 
   try {
-    email = await promptEmail({ start: info('Enter your email: ') });
+    email = await promptEmail({ start: `Enter your email: ` });
   } catch (err) {
     console.log(); // \n
 
     if (err.message === 'User abort') {
-      throw new Error(aborted('No changes made.'));
+      throw new Error(`${chalk.red('Aborted!')} No changes made`);
     }
 
     if (err.message === 'stdin lacks setRawMode support') {
@@ -192,7 +190,7 @@ const login = async ctx => {
   let verificationToken;
   let securityCode;
 
-  stopSpinner = wait('Sending you an email');
+  stopSpinner = output.spinner('Sending you an email');
 
   try {
     const data = await executeLogin(apiUrl, email);
@@ -200,7 +198,7 @@ const login = async ctx => {
     securityCode = data.securityCode;
   } catch (err) {
     stopSpinner();
-    console.log(error(err.message))
+    console.log(error(err.message));
     return 1;
   }
 
@@ -209,18 +207,15 @@ const login = async ctx => {
   // Clear up `Sending email` success message
   process.stdout.write(eraseLines(possibleAddress ? 1 : 2));
 
-  console.log(
-    info(
-      `We sent an email to ${highlight(
-        email
-      )}. Please follow the steps provided`,
-      `  inside it and make sure the security code matches ${highlight(
-        securityCode
-      )}.`
-    )
+  output.print(
+    `We sent an email to ${highlight(
+      email
+    )}. Please follow the steps provided inside it and make sure the security code matches ${highlight(
+      securityCode
+    )}.\n`
   );
 
-  stopSpinner = wait('Waiting for your confirmation');
+  stopSpinner = output.spinner('Waiting for your confirmation');
 
   let token;
 
@@ -256,8 +251,15 @@ const login = async ctx => {
   output.debug(`Saved credentials in "${hp(getNowDir())}"`);
 
   console.log(
-    `${chalk.cyan('> Congratulations!')} ` +
-    `You are now logged in. In order to deploy something, run ${cmd('now')}.`
+    `${chalk.cyan('Congratulations!')} ` +
+      `You are now logged in. In order to deploy something, run ${cmd('now')}.`
+  );
+
+  output.print(
+    `${prependEmoji(
+      `Connect your Git Repositories to deploy every branch push automatically (https://zeit.ink/1X).`,
+      emoji('tip')
+    )}\n`
   );
 
   return ctx;

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

@@ -6,7 +6,6 @@ import logo from '../util/output/logo';
 import elapsed from '../util/output/elapsed.ts';
 import { maybeURL, normalizeURL, parseInstanceURL } from '../util/url';
 import printEvents from '../util/events';
-import wait from '../util/output/wait';
 import Client from '../util/client.ts';
 import getScope from '../util/get-scope.ts';
 
@@ -165,7 +164,7 @@ export default async function main(ctx) {
   const id = deploymentIdOrURL;
 
   const depFetchStart = Date.now();
-  const cancelWait = wait(
+  const cancelWait = output.spinner(
     `Fetching deployment "${id}" in ${chalk.bold(contextName)}`
   );
 
@@ -287,12 +286,12 @@ function printLogShort(log) {
     data = JSON.stringify(obj, null, 2);
   } else {
     data = (log.text || '')
-          .replace(/\n$/, '')
-          .replace(/^\n/, '')
-          // eslint-disable-next-line no-control-regex
-          .replace(/\x1b\[1000D/g, '')
-          .replace(/\x1b\[0K/g, '')
-          .replace(/\x1b\[1A/g, '');
+      .replace(/\n$/, '')
+      .replace(/^\n/, '')
+      // eslint-disable-next-line no-control-regex
+      .replace(/\x1b\[1000D/g, '')
+      .replace(/\x1b\[0K/g, '')
+      .replace(/\x1b\[1A/g, '');
     if (/warning/i.test(data)) {
       data = chalk.yellow(data);
     } else if (log.type === 'stderr') {

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

@@ -6,7 +6,6 @@ import table from 'text-table';
 import Now from '../util';
 import getAliases from '../util/alias/get-aliases';
 import createOutput from '../util/output';
-import wait from '../util/output/wait';
 import logo from '../util/output/logo';
 import cmd from '../util/output/cmd.ts';
 import elapsed from '../util/output/elapsed.ts';
@@ -132,7 +131,7 @@ export default async function main(ctx) {
     throw err;
   }
 
-  const cancelWait = wait(
+  const cancelWait = output.spinner(
     `Fetching deployment(s) ${ids
       .map(id => `"${id}"`)
       .join(' ')} in ${chalk.bold(contextName)}`

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

@@ -11,6 +11,7 @@ import logo from '../util/output/logo';
 import Client from '../util/client.ts';
 import getScope from '../util/get-scope.ts';
 import createOutput from '../util/output';
+import confirm from '../util/input/confirm';
 
 const help = () => {
   console.log(`
@@ -144,7 +145,7 @@ async function run({ output, token, contextName, currentTeam }) {
     const elapsed = ms(new Date() - start);
 
     console.log(
-      `> ${plural('secret', list.length, true)} found under ${chalk.bold(
+      `${plural('secret', list.length, true)} found under ${chalk.bold(
         contextName
       )} ${chalk.gray(`[${elapsed}]`)}`
     );
@@ -189,22 +190,29 @@ async function run({ output, token, contextName, currentTeam }) {
     const theSecret = list.find(secret => secret.name === args[0]);
 
     if (theSecret) {
-      const yes = argv.yes || (await readConfirmation(theSecret));
+      const yes =
+        argv.yes || (await readConfirmation(output, theSecret, contextName));
       if (!yes) {
-        console.error(error('User abort'));
+        output.print(`Aborted. Secret not deleted.\n`);
         return exit(0);
       }
     } else {
-      console.error(error(`No secret found by name "${args[0]}"`));
+      console.error(
+        error(
+          `No secret found by name "${args[0]}" under ${chalk.bold(
+            contextName
+          )}`
+        )
+      );
       return exit(1);
     }
 
     const secret = await secrets.rm(args[0]);
     const elapsed = ms(new Date() - start);
     console.log(
-      `${chalk.cyan('> Success!')} Secret ${chalk.bold(
+      `${chalk.cyan('Success!')} Secret ${chalk.bold(
         secret.name
-      )} removed ${chalk.gray(`[${elapsed}]`)}`
+      )} under ${chalk.bold(contextName)} removed ${chalk.gray(`[${elapsed}]`)}`
     );
     return secrets.close();
   }
@@ -223,9 +231,11 @@ async function run({ output, token, contextName, currentTeam }) {
     const secret = await secrets.rename(args[0], args[1]);
     const elapsed = ms(new Date() - start);
     console.log(
-      `${chalk.cyan('> Success!')} Secret ${chalk.bold(
+      `${chalk.cyan('Success!')} Secret ${chalk.bold(
         secret.oldName
-      )} renamed to ${chalk.bold(args[1])} ${chalk.gray(`[${elapsed}]`)}`
+      )} renamed to ${chalk.bold(args[1])} under ${chalk.bold(
+        contextName
+      )} ${chalk.gray(`[${elapsed}]`)}`
     );
     return secrets.close();
   }
@@ -243,7 +253,7 @@ async function run({ output, token, contextName, currentTeam }) {
       if (args.length > 2) {
         const example = chalk.cyan(`$ now secret add -- "${args[0]}"`);
         console.log(
-          `> If your secret has spaces or starts with '-', make sure to terminate command options with double dash and wrap it in quotes. Example: \n  ${example} `
+          `If your secret has spaces or starts with '-', make sure to terminate command options with double dash and wrap it in quotes. Example: \n  ${example} `
         );
       }
 
@@ -259,9 +269,9 @@ async function run({ output, token, contextName, currentTeam }) {
     }
 
     console.log(
-      `${chalk.cyan('> Success!')} Secret ${chalk.bold(
+      `${chalk.cyan('Success!')} Secret ${chalk.bold(
         name.toLowerCase()
-      )} added (${chalk.bold(contextName)}) ${chalk.gray(`[${elapsed}]`)}`
+      )} added under ${chalk.bold(contextName)} ${chalk.gray(`[${elapsed}]`)}`
     );
     return secrets.close();
   }
@@ -278,33 +288,19 @@ process.on('uncaughtException', err => {
   exit(1);
 });
 
-function readConfirmation(secret) {
-  return new Promise(resolve => {
-    const time = chalk.gray(`${ms(new Date() - new Date(secret.created))} ago`);
-    const tbl = table([[chalk.bold(secret.name), time]], {
-      align: ['r', 'l'],
-      hsep: ' '.repeat(6),
-    });
-
-    process.stdout.write(
-      '> The following secret will be removed permanently\n'
-    );
-    process.stdout.write(`  ${tbl}\n`);
-
-    process.stdout.write(
-      `${chalk.bold.red('> Are you sure?')} ${chalk.gray('[y/N] ')}`
-    );
-
-    process.stdin
-      .on('data', d => {
-        process.stdin.pause();
-        resolve(
-          d
-            .toString()
-            .trim()
-            .toLowerCase() === 'y'
-        );
-      })
-      .resume();
+async function readConfirmation(output, secret, contextName) {
+  const time = chalk.gray(`${ms(new Date() - new Date(secret.created))} ago`);
+  const tbl = table([[chalk.bold(secret.name), time]], {
+    align: ['r', 'l'],
+    hsep: ' '.repeat(6),
   });
+
+  output.print(
+    `The following secret will be removed permanently from ${chalk.bold(
+      contextName
+    )}\n`
+  );
+  output.print(`  ${tbl}\n`);
+
+  return confirm(`${chalk.bold.red('Are you sure?')}`, false);
 }