Publish Stable

- @now/cgi@1.0.2
 - @now/go@1.0.2
 - @now/python@1.1.2

.github/CODEOWNERS

@@ -2,6 +2,7 @@
 # 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

.github/workflows/cancel.yml

@@ -0,0 +1,17 @@
+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@master
+        with:
+          workflow_id: 435869
+          access_token: ${{ secrets.GITHUB_WORKFLOW_TOKEN }}
+

.github/workflows/continuous-integration.yml

@@ -12,18 +12,23 @@ jobs:
   test-unit:
     name: Unit Tests
     timeout-minutes: 15
-    runs-on: ubuntu-latest
+    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
       - uses: actions/setup-node@v1
-        with:
-          node-version: 10
       - run: yarn install && yarn run build
       - run: yarn run test-lint
       - run: yarn run test-unit --clean false
-      - uses: actions/upload-artifact@v1
+      - 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
@@ -45,7 +50,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest]
         node: [10, 12]
     runs-on: ${{ matrix.os }}
     steps:

README.md

@@ -1,6 +1,6 @@
 ![now](https://assets.zeit.co/image/upload/v1542240976/repositories/now-cli/now-cli-repo-banner-v3.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,7 +16,6 @@ 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
 ```
 

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)}]);

now.json

@@ -10,6 +10,10 @@
     "GITHUB_ACCESS_TOKEN": "@now-api-examples-github-token",
     "SENTRY_DSN": "@sentry-product-dsn"
   },
+  "github": {
+    "silent": true,
+    "autoJobCancelation": true
+  },
   "headers": [
     {
       "source": "/api/frameworks",

package.json

@@ -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

@@ -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.7",
+  "version": "0.0.8",
   "main": "frameworks.json",
   "license": "UNLICENSED"
 }

packages/now-build-utils/package.json

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

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

@@ -28,7 +28,7 @@ function getApiBuilders({ tag }: Pick<Options, 'tag'> = {}): Builder[] {
   return [
     { src: 'api/**/*.js', use: `@now/node${withTag}`, config },
     { src: 'api/**/*.ts', use: `@now/node${withTag}`, config },
-    { src: 'api/**/*.go', use: `@now/go${withTag}`, config },
+    { src: 'api/**/!(*_test).go', use: `@now/go${withTag}`, config },
     { src: 'api/**/*.py', use: `@now/python${withTag}`, config },
     { src: 'api/**/*.rb', use: `@now/ruby${withTag}`, config },
   ];
@@ -423,10 +423,18 @@ export async function detectBuilders(
 
   let frontendBuilder: Builder | null = null;
 
-  if (hasBuildScript(pkg) || buildCommand || framework) {
+  // Everything will be static if either is an empty string
+  const ignoreBuild = buildCommand === '' || outputDirectory === '';
+
+  if (!ignoreBuild && (hasBuildScript(pkg) || buildCommand || framework)) {
     frontendBuilder = detectFrontBuilder(pkg, builders, files, options);
   } else {
-    if (!options.ignoreBuildScript && pkg && builders.length === 0) {
+    if (
+      !ignoreBuild &&
+      !options.ignoreBuildScript &&
+      pkg &&
+      builders.length === 0
+    ) {
       // We only show this error when there are no api builders
       // since the dependencies of the pkg could be used for those
       errors.push({
@@ -442,7 +450,9 @@ export async function detectBuilders(
     // when there are no build steps
     const outDir = outputDirectory || 'public';
 
-    if (hasDirectory(outDir, files)) {
+    // If `outputDirectory` is an empty string,
+    // we'll default to the root directory.
+    if (hasDirectory(outDir, files) && outputDirectory !== '') {
       frontendBuilder = {
         use: '@now/static',
         src: `${outDir}/**/*`,

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/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,

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/unit.builds-and-routes-detector.test.ts

@@ -151,6 +151,27 @@ describe('Test `detectBuilders`', () => {
     expect(builders!.length).toBe(2);
   });
 
+  it('api go with test files', async () => {
+    const files = [
+      'api/index.go',
+      'api/index_test.go',
+      'api/test.go',
+      'api/testing_another.go',
+      'api/readme.md',
+      'api/config/staging.go',
+      'api/config/staging_test.go',
+      'api/config/production.go',
+      'api/config/production_test.go',
+      'api/src/controllers/health.go',
+      'api/src/controllers/user.module.go',
+      'api/src/controllers/user.module_test.go',
+    ];
+
+    const { builders } = await detectBuilders(files);
+    expect(builders!.length).toBe(7);
+    expect(builders!.some(b => b.src.endsWith('_test.go'))).toBe(false);
+  });
+
   it('just public', async () => {
     const files = ['public/index.html', 'public/favicon.ico', 'README.md'];
 
@@ -745,6 +766,53 @@ describe('Test `detectBuilders`', () => {
       },
     ]);
   });
+
+  it('All static if `buildCommand` is an empty string', async () => {
+    const files = ['index.html'];
+    const projectSettings = { buildCommand: '' };
+    const { builders, errors } = await detectBuilders(files, null, {
+      projectSettings,
+    });
+    expect(errors).toBe(null);
+    expect(builders).toBe(null);
+  });
+
+  it('All static if `outputDirectory` is an empty string', async () => {
+    const files = ['index.html'];
+    const projectSettings = { outputDirectory: '' };
+    const { builders, errors } = await detectBuilders(files, null, {
+      projectSettings,
+    });
+    expect(errors).toBe(null);
+    expect(builders).toBe(null);
+  });
+
+  it('All static if `buildCommand` is an empty string with an `outputDirectory`', async () => {
+    const files = ['out/index.html'];
+    const projectSettings = { buildCommand: '', outputDirectory: 'out' };
+    const { builders, errors } = await detectBuilders(files, null, {
+      projectSettings,
+    });
+    expect(errors).toBe(null);
+    expect(builders![0]!.use).toBe('@now/static');
+    expect(builders![0]!.src).toBe('out/**/*');
+  });
+
+  it('do not require build script when `buildCommand` is an empty string', async () => {
+    const files = ['index.html', 'about.html', 'package.json'];
+    const projectSettings = { buildCommand: '', outputDirectory: '' };
+    const pkg = {
+      scripts: {
+        build: 'false',
+      },
+    };
+
+    const { builders, errors } = await detectBuilders(files, pkg, {
+      projectSettings,
+    });
+    expect(builders).toBe(null);
+    expect(errors).toBe(null);
+  });
 });
 
 it('Test `detectRoutes`', async () => {

packages/now-cgi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/cgi",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "now",
-  "version": "17.0.0-canary.26",
+  "version": "17.0.0-canary.34",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Now",
@@ -63,6 +63,7 @@
   },
   "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",
@@ -92,7 +93,7 @@
     "@types/which": "1.3.1",
     "@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",
@@ -131,7 +132,7 @@
     "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",

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,7 +5,6 @@ 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';
@@ -110,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/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,11 @@ 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';
 
 const addProcessEnv = async (log, env) => {
   let val;
@@ -131,10 +135,13 @@ const printDeploymentStatus = async (
     }
 
     // copy to clipboard
+    let isCopiedToClipboard = false;
     if (isClipboardEnabled && !isWildcard) {
-      await copy(previewUrl).catch(error =>
-        output.debug(`Error copying to clipboard: ${error}`)
-      );
+      await copy(previewUrl)
+        .then(() => {
+          isCopiedToClipboard = true;
+        })
+        .catch(error => output.debug(`Error copying to clipboard: ${error}`));
     }
 
     // write to stdout
@@ -146,7 +153,9 @@ const printDeploymentStatus = async (
       prependEmoji(
         `${isProdDeployment ? 'Production' : 'Preview'}: ${chalk.bold(
           previewUrl
-        )} ${deployStamp()}`,
+        )}${
+          isCopiedToClipboard ? chalk.gray(` [copied to clipboard]`) : ''
+        } ${deployStamp()}`,
         emoji('success')
       ) + `\n`
     );
@@ -379,6 +388,7 @@ export default async function main(
 
   let { org, project, status } = link;
   let newProjectName = null;
+  let rootDirectory = project ? project.rootDirectory : null;
 
   if (status === 'not_linked') {
     const shouldStartSetup =
@@ -394,6 +404,7 @@ export default async function main(
     }
 
     org = await selectOrg(
+      output,
       'Which scope do you want to deploy to?',
       client,
       ctx.config.currentTeam,
@@ -417,8 +428,10 @@ export default async function main(
 
     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(
@@ -435,6 +448,22 @@ export default async function main(
     }
   }
 
+  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;
+  }
+
   const currentTeam = org.type === 'team' ? org.id : undefined;
   const now = new Now({ apiUrl, token, debug: debugEnabled, currentTeam });
   let deployStamp = stamp();
@@ -462,10 +491,11 @@ export default async function main(
       output,
       now,
       contextName,
-      [path],
+      [sourcePath],
       createArgs,
       org,
-      !project && !isFile
+      !project && !isFile,
+      path
     );
 
     if (
@@ -474,6 +504,10 @@ export default async function main(
     ) {
       let { projectSettings, framework } = deployment;
 
+      if (rootDirectory) {
+        projectSettings.rootDirectory = rootDirectory;
+      }
+
       const settings = await editProjectSettings(
         output,
         projectSettings,
@@ -489,10 +523,11 @@ export default async function main(
         output,
         now,
         contextName,
-        [path],
+        [sourcePath],
         createArgs,
         org,
-        false
+        false,
+        path
       );
     }
 
@@ -501,6 +536,14 @@ 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;
+    }
+
     const deploymentResponse = await getDeploymentByIdOrHost(
       now,
       contextName,
@@ -665,6 +708,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/dev/dev.ts

@@ -23,7 +23,7 @@ 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;
 
@@ -72,6 +72,10 @@ export default async function dev(
         }
       }
     }
+
+    if (project.rootDirectory) {
+      cwd = path.join(cwd, project.rootDirectory);
+    }
   }
 
   const devServer = new DevServer(cwd, { output, debug, devCommand });

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,7 +8,6 @@ import chalk from 'chalk';
 import ua from '../util/ua.ts';
 import getArgs from '../util/get-args';
 import error from '../util/output/error';
-import wait from '../util/output/wait';
 import highlight from '../util/output/highlight';
 import ok from '../util/output/ok';
 import cmd from '../util/output/cmd.ts';
@@ -191,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);
@@ -216,7 +215,7 @@ const login = async ctx => {
     )}.\n`
   );
 
-  stopSpinner = wait('Waiting for your confirmation');
+  stopSpinner = output.spinner('Waiting for your confirmation');
 
   let token;
 

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);
 }

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

@@ -57,7 +57,7 @@ export default async function({ apiUrl, token, teams, config }) {
         validateKeypress: validateSlugKeypress,
         initialValue: slug,
         valid: team,
-        forceLowerCase: true
+        forceLowerCase: true,
       });
     } catch (err) {
       if (err.message === 'USER_ABORT') {
@@ -95,7 +95,7 @@ export default async function({ apiUrl, token, teams, config }) {
   try {
     name = await textInput({
       label: `- ${teamNamePrefix}`,
-      validateKeypress: validateNameKeypress
+      validateKeypress: validateNameKeypress,
     });
   } catch (err) {
     if (err.message === 'USER_ABORT') {
@@ -153,7 +153,7 @@ export default async function({ apiUrl, token, teams, config }) {
     introMsg: 'Invite your teammates! When done, press enter on an empty field',
     noopMsg: `You can invite teammates later by running ${cmd(
       'now teams invite'
-    )}`
+    )}`,
   });
 
   gracefulExit();

packages/now-cli/src/commands/teams/invite.js

@@ -30,7 +30,7 @@ const domains = Array.from(
     'inbox.com',
     'mail.com',
     'gmx.com',
-    'icloud.com'
+    'icloud.com',
   ])
 );
 
@@ -56,17 +56,15 @@ const emailAutoComplete = (value, teamSlug) => {
   return false;
 };
 
-export default async function(
-  {
-    teams,
-    args,
-    config,
-    introMsg,
-    noopMsg = 'No changes made',
-    apiUrl,
-    token
-  } = {}
-) {
+export default async function({
+  teams,
+  args,
+  config,
+  introMsg,
+  noopMsg = 'No changes made',
+  apiUrl,
+  token,
+} = {}) {
   const { currentTeam: currentTeamId } = config;
 
   const stopSpinner = wait('Fetching teams');
@@ -86,7 +84,11 @@ export default async function(
 
   if (!currentTeam) {
     // We specifically need a team scope here
-    let err = `You can't run this command under ${param(user.username || user.email)}.\nPlease select a team scope using ${cmd('now switch')} or use ${cmd('--scope')}`;
+    let err = `You can't run this command under ${param(
+      user.username || user.email
+    )}.\nPlease select a team scope using ${cmd('now switch')} or use ${cmd(
+      '--scope'
+    )}`;
     return fatalError(err);
   }
 
@@ -107,7 +109,9 @@ export default async function(
           userInfo = res.name || res.username;
         } catch (err) {
           if (err.code === 'user_not_found') {
-            console.error(error(`No user exists with the email address "${email}".`));
+            console.error(
+              error(`No user exists with the email address "${email}".`)
+            );
             return 1;
           }
 
@@ -115,7 +119,11 @@ export default async function(
         }
 
         stopSpinner();
-        console.log(`${chalk.cyan(chars.tick)} ${email}${userInfo ? ` (${userInfo})` : ''} ${elapsed()}`);
+        console.log(
+          `${chalk.cyan(chars.tick)} ${email}${
+            userInfo ? ` (${userInfo})` : ''
+          } ${elapsed()}`
+        );
       } else {
         console.log(`${chalk.red(`✖ ${email}`)} ${chalk.gray('[invalid]')}`);
       }
@@ -135,7 +143,7 @@ export default async function(
       email = await textInput({
         label: `- ${inviteUserPrefix}`,
         validateValue: validateEmail,
-        autoComplete: value => emailAutoComplete(value, currentTeam.slug)
+        autoComplete: value => emailAutoComplete(value, currentTeam.slug),
       });
     } catch (err) {
       if (err.message !== 'USER_ABORT') {
@@ -149,7 +157,10 @@ export default async function(
       stopSpinner = wait(inviteUserPrefix + email);
       try {
         // eslint-disable-next-line no-await-in-loop
-        const { name, username } = await teams.inviteUser({ teamId: currentTeam.id, email });
+        const { name, username } = await teams.inviteUser({
+          teamId: currentTeam.id,
+          email,
+        });
         stopSpinner();
         const userInfo = name || username;
         email = `${email}${userInfo ? ` (${userInfo})` : ''} ${elapsed()}`;

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

@@ -27,20 +27,20 @@ export default async function({ teams, config, apiUrl, token }) {
 
   if (accountIsCurrent) {
     currentTeam = {
-      slug: user.username || user.email
+      slug: user.username || user.email,
     };
   }
 
   const teamList = list.map(({ slug, name }) => ({
     name,
     value: slug,
-    current: slug === currentTeam.slug ? chars.tick : ''
+    current: slug === currentTeam.slug ? chars.tick : '',
   }));
 
   teamList.unshift({
     name: user.email,
     value: user.username || user.email,
-    current: (accountIsCurrent && chars.tick) || ''
+    current: (accountIsCurrent && chars.tick) || '',
   });
 
   // Let's bring the current team to the beginning of the list

packages/now-cli/src/types.ts

@@ -224,6 +224,7 @@ export interface Project {
   createdAt: number;
   devCommand?: string | null;
   framework?: string | null;
+  rootDirectory?: string | null;
 }
 
 export interface Org {

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

@@ -3,7 +3,6 @@ import { Output } from '../output';
 import * as ERRORS from '../errors-ts';
 import Client from '../client';
 import createCertForAlias from '../certs/create-cert-for-alias';
-import wait from '../output/wait';
 
 export type AliasRecord = {
   uid: string;
@@ -20,7 +19,7 @@ export default async function createAlias(
   alias: string,
   externalDomain: boolean
 ) {
-  let cancelMessage = wait(`Creating alias`);
+  let cancelMessage = output.spinner(`Creating alias`);
   const result = await performCreateAlias(
     client,
     contextName,
@@ -41,7 +40,7 @@ export default async function createAlias(
       return cert;
     }
 
-    let cancelMessage = wait(`Creating alias`);
+    let cancelMessage = output.spinner(`Creating alias`);
     const secondTry = await performCreateAlias(
       client,
       contextName,
@@ -66,7 +65,7 @@ async function performCreateAlias(
       `/now/deployments/${deployment.uid}/aliases`,
       {
         method: 'POST',
-        body: { alias }
+        body: { alias },
       }
     );
   } catch (error) {
@@ -77,7 +76,10 @@ async function performCreateAlias(
       return { uid: error.uid, alias: error.alias } as AliasRecord;
     }
     if (error.code === 'deployment_not_found') {
-      return new ERRORS.DeploymentNotFound({ context: contextName, id: deployment.uid });
+      return new ERRORS.DeploymentNotFound({
+        context: contextName,
+        id: deployment.uid,
+      });
     }
     if (error.code === 'gone') {
       return new ERRORS.DeploymentFailedAliasImpossible();
@@ -94,7 +96,7 @@ async function performCreateAlias(
       }
     }
     if (error.status === 400) {
-      return new ERRORS.DeploymentNotReady({url: deployment.url })
+      return new ERRORS.DeploymentNotReady({ url: deployment.url });
     }
 
     throw error;

packages/now-cli/src/util/alias/get-deployment-for-alias.ts

@@ -3,7 +3,6 @@ import chalk from 'chalk';
 import getAppLastDeployment from '../deploy/get-app-last-deployment';
 import getAppName from '../deploy/get-app-name';
 import fetchDeploymentByIdOrHost from '../deploy/get-deployment-by-id-or-host';
-import wait from '../output/wait';
 import Client from '../client';
 import { Output } from '../output';
 import { User, Config } from '../../types';
@@ -17,7 +16,7 @@ export default async function getDeploymentForAlias(
   contextName: string,
   localConfig: Config
 ) {
-  const cancelWait = wait(
+  const cancelWait = output.spinner(
     `Fetching deployment to alias in ${chalk.bold(contextName)}`
   );
 

packages/now-cli/src/util/alias/upsert-path-alias.ts

@@ -4,7 +4,6 @@ import * as ERRORS from '../errors-ts';
 import Client from '../client';
 import createCertForAlias from '../certs/create-cert-for-alias';
 import setupDomain from '../domains/setup-domain';
-import wait from '../output/wait';
 
 const NOW_SH_REGEX = /\.now\.sh$/;
 
@@ -34,6 +33,7 @@ export default async function upsertPathAlias(
   }
 
   const result = await performUpsertPathAlias(
+    output,
     client,
     alias,
     rules,
@@ -51,23 +51,26 @@ export default async function upsertPathAlias(
       return cert;
     }
 
-    return performUpsertPathAlias(client, alias, rules, contextName);
+    return performUpsertPathAlias(output, client, alias, rules, contextName);
   }
 
   return result;
 }
 
 async function performUpsertPathAlias(
+  output: Output,
   client: Client,
   alias: string,
   rules: PathRule[],
   contextName: string
 ) {
-  const cancelMessage = wait(`Updating path alias rules for ${alias}`);
+  const cancelMessage = output.spinner(
+    `Updating path alias rules for ${alias}`
+  );
   try {
     const record = await client.fetch<AliasRecord>(`/now/aliases`, {
       body: { alias, rules },
-      method: 'POST'
+      method: 'POST',
     });
     cancelMessage();
     return record;

packages/now-cli/src/util/certs/create-cert-for-alias.ts

@@ -5,7 +5,6 @@ import createCertForCns from './create-cert-for-cns';
 import getWildcardCnsForAlias from './get-wildcard-cns-for-alias';
 import joinWords from '../output/join-words';
 import stamp from '../output/stamp';
-import wait from '../output/wait';
 
 export default async function createCertificateForAlias(
   output: Output,
@@ -15,7 +14,7 @@ export default async function createCertificateForAlias(
   shouldBeWildcard: boolean
 ) {
   const cns = shouldBeWildcard ? getWildcardCnsForAlias(alias) : [alias];
-  const cancelMessage = wait(`Generating a certificate...`);
+  const cancelMessage = output.spinner(`Generating a certificate...`);
   const certStamp = stamp();
   const cert = await createCertForCns(client, cns, context);
   if (cert instanceof NowError) {
@@ -25,9 +24,9 @@ export default async function createCertificateForAlias(
 
   cancelMessage();
   output.log(
-    `Certificate for ${joinWords(
-      cert.cns
-    )} (${cert.uid}) created ${certStamp()}`
+    `Certificate for ${joinWords(cert.cns)} (${
+      cert.uid
+    }) created ${certStamp()}`
   );
   return cert;
 }

packages/now-cli/src/util/deploy/create-deploy.js

@@ -11,10 +11,11 @@ export default async function createDeploy(
   paths,
   createArgs,
   org,
-  isSettingUpProject
+  isSettingUpProject,
+  cwd
 ) {
   try {
-    return await now.create(paths, createArgs, org, isSettingUpProject);
+    return await now.create(paths, createArgs, org, isSettingUpProject, cwd);
   } catch (error) {
     if (error.code === 'rate_limited') {
       throw new ERRORS_TS.DeploymentsRateLimited(error.message);

packages/now-cli/src/util/deploy/generate-cert-for-deploy.ts

@@ -4,7 +4,6 @@ import { Output } from '../output';
 import Client from '../client';
 import createCertForCns from '../certs/create-cert-for-cns';
 import setupDomain from '../domains/setup-domain';
-import wait from '../output/wait';
 import { InvalidDomain } from '../errors-ts';
 
 export default async function generateCertForDeploy(
@@ -23,7 +22,9 @@ export default async function generateCertForDeploy(
     return new InvalidDomain(deployURL);
   }
 
-  const cancelSetupWait = wait(`Setting custom suffix domain ${domain}`);
+  const cancelSetupWait = output.spinner(
+    `Setting custom suffix domain ${domain}`
+  );
   const result = await setupDomain(output, client, domain, contextName);
   cancelSetupWait();
   if (result instanceof NowError) {
@@ -31,7 +32,7 @@ export default async function generateCertForDeploy(
   }
 
   // Generate the certificate with the given parameters
-  const cancelCertWait = wait(
+  const cancelCertWait = output.spinner(
     `Generating a wildcard certificate for ${domain}`
   );
   const cert = await createCertForCns(

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

@@ -6,7 +6,6 @@ import {
   DeploymentOptions,
   NowClientOptions,
 } from 'now-client';
-import wait from '../output/wait';
 import { Output } from '../output';
 // @ts-ignore
 import Now from '../../util';
@@ -50,6 +49,7 @@ function printInspectUrl(
 export default async function processDeployment({
   isLegacy,
   org,
+  cwd,
   projectName,
   isSettingUpProject,
   skipAutoDetectionConfirmation,
@@ -70,6 +70,7 @@ export default async function processDeployment({
   projectName: string;
   isSettingUpProject: boolean;
   skipAutoDetectionConfirmation?: boolean;
+  cwd?: string;
 }) {
   if (isLegacy) return processLegacyDeployment(args);
 
@@ -104,7 +105,7 @@ export default async function processDeployment({
   let buildSpinner = null;
   let deploySpinner = null;
 
-  let deployingSpinner = wait(
+  let deployingSpinner = output.spinner(
     isSettingUpProject
       ? `Setting up project`
       : `Deploying ${chalk.bold(`${org.slug}/${projectName}`)}`,
@@ -167,7 +168,7 @@ export default async function processDeployment({
 
       await linkFolderToProject(
         output,
-        paths[0],
+        cwd || paths[0],
         {
           orgId: org.id,
           projectId: event.payload.projectId,
@@ -181,8 +182,8 @@ export default async function processDeployment({
       if (queuedSpinner === null) {
         queuedSpinner =
           event.payload.readyState === 'QUEUED'
-            ? wait('Queued', 0)
-            : wait('Building', 0);
+            ? output.spinner('Queued', 0)
+            : output.spinner('Building', 0);
       }
     }
 
@@ -192,7 +193,7 @@ export default async function processDeployment({
       }
 
       if (buildSpinner === null) {
-        buildSpinner = wait('Building', 0);
+        buildSpinner = output.spinner('Building', 0);
       }
     }
 
@@ -204,7 +205,7 @@ export default async function processDeployment({
         buildSpinner();
       }
 
-      deploySpinner = wait('Completing', 0);
+      deploySpinner = output.spinner('Completing', 0);
     }
 
     // Handle error events

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

@@ -20,7 +20,6 @@ import {
 import pkg from '../../../package.json';
 
 import { NoBuilderCacheError } from '../errors-ts';
-import wait from '../output/wait';
 import { Output } from '../output';
 import { getDistTag } from '../get-dist-tag';
 
@@ -246,7 +245,7 @@ export async function installBuilders(
     return;
   }
 
-  const stopSpinner = wait(
+  const stopSpinner = output.spinner(
     `Installing ${pluralize(
       'Runtime',
       packagesToInstall.length

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

@@ -3,18 +3,10 @@
 import ms from 'ms';
 import bytes from 'bytes';
 import { promisify } from 'util';
-import { delimiter, dirname, extname, join } from 'path';
+import { delimiter, dirname, join } from 'path';
 import { fork, ChildProcess } from 'child_process';
 import { createFunction } from '@zeit/fun';
-import {
-  Builder,
-  File,
-  Lambda,
-  FileBlob,
-  FileFsRef,
-  detectApiDirectory,
-  detectApiExtensions,
-} from '@now/build-utils';
+import { Builder, File, Lambda, FileBlob, FileFsRef } from '@now/build-utils';
 import which from 'which';
 import plural from 'pluralize';
 import minimatch from 'minimatch';
@@ -128,7 +120,7 @@ export async function executeBuild(
   const {
     builderWithPkg: { runInProcess, builder, package: pkg },
   } = match;
-  const { src: entrypoint } = match;
+  const { entrypoint } = match;
   const { env, debug, buildEnv, yarnPath, cwd: workPath } = devServer;
 
   const startTime = Date.now();
@@ -282,8 +274,8 @@ export async function executeBuild(
   }
 
   const { output } = result;
-
   const { cleanUrls } = nowConfig;
+
   // Mimic fmeta-util and perform file renaming
   Object.entries(output).forEach(([path, value]) => {
     if (cleanUrls && path.endsWith('.html')) {
@@ -294,6 +286,11 @@ export async function executeBuild(
       }
     }
 
+    const extensionless = devServer.getExtensionlessFile(path);
+    if (extensionless) {
+      path = extensionless;
+    }
+
     delete output[path];
     output[path] = value;
   });
@@ -403,6 +400,7 @@ export async function getBuildMatches(
   cwd: string,
   yarnDir: string,
   output: Output,
+  devServer: DevServer,
   fileList: string[]
 ): Promise<BuildMatch[]> {
   const matches: BuildMatch[] = [];
@@ -415,9 +413,6 @@ export async function getBuildMatches(
 
   const noMatches: Builder[] = [];
   const builds = nowConfig.builds || [{ src: '**', use: '@now/static' }];
-  const apiDir = detectApiDirectory(builds || []);
-  const apiExtensions = detectApiExtensions(builds || []);
-  const apiMatch = apiDir + '/';
 
   for (const buildConfig of builds) {
     let { src, use } = buildConfig;
@@ -436,10 +431,13 @@ export async function getBuildMatches(
     // We need to escape brackets since `glob` will
     // try to find a group otherwise
     src = src.replace(/(\[|\])/g, '[$1]');
-    const ext = extname(src);
-    if (apiDir && src.startsWith(apiMatch) && apiExtensions.has(ext)) {
-      // lambda function files are trimmed of their file extension
-      src = src.slice(0, -ext.length);
+
+    // lambda function files are trimmed of their file extension
+    const mapToEntrypoint = new Map<string, string>();
+    const extensionless = devServer.getExtensionlessFile(src);
+    if (extensionless) {
+      mapToEntrypoint.set(extensionless, src);
+      src = extensionless;
     }
 
     const files = fileList
@@ -456,6 +454,7 @@ export async function getBuildMatches(
       matches.push({
         ...buildConfig,
         src,
+        entrypoint: mapToEntrypoint.get(src) || src,
         builderWithPkg,
         buildOutput: {},
         buildResults: new Map(),

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

@@ -112,6 +112,8 @@ export default class DevServer {
   public address: string;
 
   private cachedNowConfig: NowConfig | null;
+  private apiDir: string | null;
+  private apiExtensions: Set<string>;
   private server: http.Server;
   private stopping: boolean;
   private serverUrlPrinted: boolean;
@@ -145,6 +147,8 @@ export default class DevServer {
     this.yarnPath = '/';
 
     this.cachedNowConfig = null;
+    this.apiDir = null;
+    this.apiExtensions = new Set<string>();
     this.server = http.createServer(this.devServerHandler);
     this.server.timeout = 0; // Disable timeout
     this.serverUrlPrinted = false;
@@ -291,6 +295,10 @@ export default class DevServer {
     const name = relative(this.cwd, fsPath);
     try {
       this.files[name] = await FileFsRef.fromFsPath({ fsPath });
+      const extensionless = this.getExtensionlessFile(name);
+      if (extensionless) {
+        this.files[extensionless] = await FileFsRef.fromFsPath({ fsPath });
+      }
       fileChanged(name, changed, removed);
       this.output.debug(`File created: ${name}`);
     } catch (err) {
@@ -311,6 +319,11 @@ export default class DevServer {
     const name = relative(this.cwd, fsPath);
     this.output.debug(`File deleted: ${name}`);
     fileRemoved(name, this.files, changed, removed);
+    const extensionless = this.getExtensionlessFile(name);
+    if (extensionless) {
+      this.output.debug(`File deleted: ${extensionless}`);
+      fileRemoved(extensionless, this.files, changed, removed);
+    }
   }
 
   async handleFileModified(
@@ -343,6 +356,7 @@ export default class DevServer {
       this.cwd,
       this.yarnPath,
       this.output,
+      this,
       fileList
     );
     const sources = matches.map(m => m.src);
@@ -600,6 +614,8 @@ export default class DevServer {
     await this.validateNowConfig(config);
 
     this.cachedNowConfig = config;
+    this.apiDir = detectApiDirectory(config.builds || []);
+    this.apiExtensions = detectApiExtensions(config.builds || []);
     return config;
   }
 
@@ -739,26 +755,21 @@ export default class DevServer {
 
     const opts = { output: this.output, isBuilds: true };
     const files = await getFiles(this.cwd, nowConfig, opts);
-    const results: { [filePath: string]: FileFsRef } = {};
-    const apiDir = detectApiDirectory(nowConfig.builds || []);
-    const apiExtensions = detectApiExtensions(nowConfig.builds || []);
-    const apiMatch = apiDir + '/';
+    this.files = {};
     for (const fsPath of files) {
       let path = relative(this.cwd, fsPath);
       const { mode } = await fs.stat(fsPath);
-      const ext = extname(path);
-      if (apiDir && path.startsWith(apiMatch) && apiExtensions.has(ext)) {
-        // lambda function files are trimmed of their file extension
-        path = path.slice(0, -ext.length);
+      this.files[path] = new FileFsRef({ mode, fsPath });
+      const extensionless = this.getExtensionlessFile(path);
+      if (extensionless) {
+        this.files[extensionless] = new FileFsRef({ mode, fsPath });
       }
-      results[path] = new FileFsRef({ mode, fsPath });
     }
-    this.files = results;
 
-    const builders: Set<string> = new Set(
+    const builders = new Set<string>(
       (nowConfig.builds || [])
         .filter((b: Builder) => b.use)
-        .map((b: Builder) => b.use as string)
+        .map((b: Builder) => b.use)
     );
 
     await installBuilders(builders, this.yarnPath, this.output);
@@ -1085,7 +1096,9 @@ export default class DevServer {
     // If the requested asset wasn't found in the match's
     // outputs then trigger a build
     const buildKey =
-      requestPath === null ? match.src : `${match.src}-${requestPath}`;
+      requestPath === null
+        ? match.entrypoint
+        : `${match.entrypoint}-${requestPath}`;
     let buildPromise = this.inProgressBuilds.get(buildKey);
     if (buildPromise) {
       // A build for `buildKey` is already in progress, so don't trigger
@@ -1127,6 +1140,19 @@ export default class DevServer {
     }
   }
 
+  getExtensionlessFile = (path: string) => {
+    const ext = extname(path);
+    if (
+      this.apiDir &&
+      path.startsWith(this.apiDir + '/') &&
+      this.apiExtensions.has(ext)
+    ) {
+      // lambda function files are trimmed of their file extension
+      return path.slice(0, -ext.length);
+    }
+    return null;
+  };
+
   /**
    * DevServer HTTP handler
    */

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

@@ -26,6 +26,7 @@ export interface EnvConfig {
 }
 
 export interface BuildMatch extends BuildConfig {
+  entrypoint: string;
   builderWithPkg: BuilderWithPackage;
   buildOutput: BuilderOutputs;
   buildResults: Map<string | null, BuildResult>;

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

@@ -9,7 +9,6 @@ import getDomainStatus from './get-domain-status';
 import promptBool from '../input/prompt-bool';
 import purchaseDomain from './purchase-domain';
 import stamp from '../output/stamp';
-import wait from '../output/wait';
 import * as ERRORS from '../errors-ts';
 
 const isTTY = process.stdout.isTTY;
@@ -20,7 +19,7 @@ export default async function purchaseDomainIfAvailable(
   domain: string,
   contextName: string
 ) {
-  const cancelWait = wait(`Checking status of ${chalk.bold(domain)}`);
+  const cancelWait = output.spinner(`Checking status of ${chalk.bold(domain)}`);
   const buyDomainStamp = stamp();
   const { available } = await getDomainStatus(client, domain);
 

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

@@ -1,6 +1,8 @@
 import Client from './client';
 import { APIError, InvalidToken } from './errors-ts';
 import { Team } from '../types';
+// @ts-ignore
+import NowTeams from './teams.js';
 
 let teams: Team[] | undefined;
 
@@ -8,10 +10,15 @@ export default async function getTeams(client: Client) {
   if (teams) return teams;
 
   try {
-    const res = await client.fetch<{ teams: Team[] }>('/teams');
+    // we're using NowTeams because `client.fetch` hangs on windows
+    const teamClient = new NowTeams({
+      apiUrl: client._apiUrl,
+      token: client._token,
+      debug: client._debug,
+    });
 
-    teams = res.teams;
-    return teams;
+    const teams = (await teamClient.ls()).teams;
+    return teams as Team[];
   } catch (error) {
     if (error instanceof APIError && error.status === 403) {
       throw new InvalidToken();

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

@@ -70,7 +70,8 @@ export default class Now extends EventEmitter {
       skipAutoDetectionConfirmation,
     },
     org,
-    isSettingUpProject
+    isSettingUpProject,
+    cwd
   ) {
     const opts = { output: this._output, hasNowJson };
     const { log, warn } = this._output;
@@ -183,6 +184,7 @@ export default class Now extends EventEmitter {
       projectName: name,
       isSettingUpProject,
       skipAutoDetectionConfirmation,
+      cwd,
     });
 
     // We report about files whose sizes are too big

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

@@ -11,6 +11,10 @@ export interface ProjectSettings {
   devCommand: string | null;
 }
 
+export interface ProjectSettingsWithFramework extends ProjectSettings {
+  framework: string | null;
+}
+
 const fields: { name: string; value: keyof ProjectSettings }[] = [
   { name: 'Build Command', value: 'buildCommand' },
   { name: 'Output Directory', value: 'outputDirectory' },
@@ -22,22 +26,30 @@ export default async function editProjectSettings(
   projectSettings: ProjectSettings | null,
   framework: Framework | null
 ) {
-  // create new settings object filled with "null" values
-  const settings: Partial<ProjectSettings> = {};
+  // create new settings object, missing values will be filled with `null`
+  const settings: Partial<ProjectSettingsWithFramework> = {
+    ...projectSettings,
+  };
 
   for (let field of fields) {
     settings[field.value] =
       (projectSettings && projectSettings[field.value]) || null;
   }
 
+  // skip editing project settings if no framework is detected
   if (!framework) {
+    settings.framework = null;
     return settings;
   }
 
   output.print(
-    `Auto-detected project settings (${chalk.bold(framework.name)}):\n`
+    !framework.slug
+      ? `No framework detected. Default project settings:\n`
+      : `Auto-detected project settings (${chalk.bold(framework.name)}):\n`
   );
 
+  settings.framework = framework.slug;
+
   for (let field of fields) {
     const defaults = framework.settings[field.value];
 

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

@@ -6,7 +6,7 @@ import chalk from 'chalk';
 import { ProjectNotFound } from '../../util/errors-ts';
 import { Output } from '../output';
 import { Project, Org } from '../../types';
-import wait from '../output/wait';
+import slugify from '@sindresorhus/slugify';
 
 export default async function inputProject(
   output: Output,
@@ -19,16 +19,26 @@ export default async function inputProject(
     return detectedProjectName;
   }
 
+  const slugifiedName = slugify(detectedProjectName);
+
   // attempt to auto-detect a project to link
   let detectedProject = null;
-  const existingProjectSpinner = wait('Searching for existing projects…', 1000);
+  const existingProjectSpinner = output.spinner(
+    'Searching for existing projects…',
+    1000
+  );
   try {
-    const project = await getProjectByIdOrName(
-      client,
-      detectedProjectName,
-      org.id
-    );
-    detectedProject = project instanceof ProjectNotFound ? null : project;
+    const [project, slugifiedProject] = await Promise.all([
+      getProjectByIdOrName(client, detectedProjectName, org.id),
+      slugifiedName !== detectedProjectName
+        ? getProjectByIdOrName(client, slugifiedName, org.id)
+        : null,
+    ]);
+    detectedProject = !(project instanceof ProjectNotFound)
+      ? project
+      : !(slugifiedProject instanceof ProjectNotFound)
+      ? slugifiedProject
+      : null;
   } catch (error) {}
   existingProjectSpinner();
 
@@ -42,7 +52,7 @@ export default async function inputProject(
     if (
       await confirm(
         `Found project ${chalk.cyan(
-          `“${org.slug}/${detectedProjectName}”`
+          `“${org.slug}/${detectedProject.name}”`
         )}. Link to it?`,
         true
       )
@@ -74,7 +84,7 @@ export default async function inputProject(
         continue;
       }
 
-      const spinner = wait('Verifying project name…', 1000);
+      const spinner = output.spinner('Verifying project name…', 1000);
       try {
         project = await getProjectByIdOrName(client, projectName, org.id);
       } finally {
@@ -97,7 +107,7 @@ export default async function inputProject(
       type: 'input',
       name: 'newProjectName',
       message: `What’s your project’s name?`,
-      default: !detectedProject ? detectedProjectName : undefined,
+      default: !detectedProject ? slugifiedName : undefined,
     });
     newProjectName = answers.newProjectName as string;
 
@@ -106,7 +116,7 @@ export default async function inputProject(
       continue;
     }
 
-    const spinner = wait('Verifying project name…', 1000);
+    const spinner = output.spinner('Verifying project name…', 1000);
     let existingProject: Project | ProjectNotFound;
     try {
       existingProject = await getProjectByIdOrName(

packages/now-cli/src/util/input/input-root-directory.ts

@@ -0,0 +1,54 @@
+import path from 'path';
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+import { Output } from '../output';
+import { validateRootDirectory } from '../validate-paths';
+
+export async function inputRootDirectory(
+  cwd: string,
+  output: Output,
+  autoConfirm: boolean
+) {
+  if (autoConfirm) {
+    return null;
+  }
+
+  const basename = path.basename(cwd);
+
+  // eslint-disable-next-line no-constant-condition
+  while (true) {
+    const { rootDirectory } = await inquirer.prompt({
+      type: 'input',
+      name: 'rootDirectory',
+      message: `In which directory is your code located?`,
+      transformer: (input: string) => {
+        return `${chalk.dim(`${basename}/`)}${input}`;
+      },
+    });
+
+    if (!rootDirectory) {
+      return null;
+    }
+
+    const normal = path.normalize(rootDirectory);
+
+    if (normal === '.' || normal === './') {
+      return null;
+    }
+
+    const fullPath = path.join(cwd, normal);
+
+    if (
+      (await validateRootDirectory(
+        output,
+        cwd,
+        fullPath,
+        'Please choose a different one.'
+      )) === false
+    ) {
+      continue;
+    }
+
+    return normal;
+  }
+}

packages/now-cli/src/util/input/select-org.ts

@@ -3,11 +3,12 @@ import inquirer from 'inquirer';
 import getUser from '../get-user';
 import getTeams from '../get-teams';
 import { User, Team, Org } from '../../types';
-import wait from '../output/wait';
+import { Output } from '../output';
 
 type Choice = { name: string; value: Org };
 
-export default async function selectProject(
+export default async function selectOrg(
+  output: Output,
   question: string,
   client: Client,
   currentTeam?: string,
@@ -15,7 +16,7 @@ export default async function selectProject(
 ): Promise<Org> {
   require('./patch-inquirer');
 
-  const spinner = wait('Loading scopes…', 1000);
+  const spinner = output.spinner('Loading scopes…', 1000);
   let user: User;
   let teams: Team[];
   try {

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

@@ -2,6 +2,7 @@ import chalk from 'chalk';
 import boxen from 'boxen';
 import { format } from 'util';
 import { Console } from 'console';
+import wait from './wait';
 
 export type Output = ReturnType<typeof createOutput>;
 
@@ -76,6 +77,20 @@ export default function createOutput({ debug: debugEnabled = false } = {}) {
     }
   }
 
+  function spinner(message: string, delay: number = 300) {
+    if (debugEnabled) {
+      debug(`Spinner invoked (${message}) with a ${delay}ms delay`);
+      let isEnded = false;
+      return () => {
+        if (isEnded) return;
+        isEnded = true;
+        debug(`Spinner ended (${message})`);
+      };
+    }
+
+    return wait(message, delay);
+  }
+
   // This is pretty hacky, but since we control the version of Node.js
   // being used because of `pkg` it's safe to do in this case.
   const c = {
@@ -109,5 +124,6 @@ export default function createOutput({ debug: debugEnabled = false } = {}) {
     dim,
     time,
     note,
+    spinner,
   };
 }

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

@@ -2,7 +2,7 @@ import ora from 'ora';
 import chalk from 'chalk';
 import eraseLines from './erase-lines';
 
-export default function wait(msg: string, timeout: number = 300, _ora = ora) {
+export default function wait(msg: string, delay: number = 300, _ora = ora) {
   let spinner: ReturnType<typeof _ora>;
   let running = false;
 
@@ -11,7 +11,7 @@ export default function wait(msg: string, timeout: number = 300, _ora = ora) {
     spinner.color = 'gray';
     spinner.start();
     running = true;
-  }, timeout);
+  }, delay);
 
   const cancel = () => {
     clearTimeout(planned);

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

@@ -12,7 +12,6 @@ import { Project } from '../../types';
 import { Org, ProjectLink } from '../../types';
 import chalk from 'chalk';
 import { prependEmoji, emoji } from '../emoji';
-import wait from '../output/wait';
 
 const readFile = promisify(fs.readFile);
 const writeFile = promisify(fs.writeFile);
@@ -86,7 +85,7 @@ export async function getLinkedOrg(
     return { status: 'not_linked', org: null };
   }
 
-  const spinner = wait('Retrieving scope…', 1000);
+  const spinner = output.spinner('Retrieving scope…', 1000);
   try {
     const org = await getOrgById(client, orgId);
 
@@ -141,7 +140,7 @@ export async function getLinkedProject(
     return { status: 'not_linked', org: null, project: null };
   }
 
-  const spinner = wait('Retrieving project…', 1000);
+  const spinner = output.spinner('Retrieving project…', 1000);
   let org: Org | null;
   let project: Project | ProjectNotFound | null;
   try {

packages/now-cli/src/util/scale/patch-deployment-scale.ts

@@ -1,5 +1,4 @@
 import chalk from 'chalk';
-import wait from '../output/wait';
 import joinWords from '../output/join-words';
 import * as Errors from '../errors-ts';
 import { Output } from '../output';
@@ -17,7 +16,7 @@ export default async function patchDeploymentScale(
   scaleArgs: ScaleArgs,
   url: string
 ) {
-  const cancelWait = wait(
+  const cancelWait = output.spinner(
     `Setting scale rules for ${joinWords(
       Object.keys(scaleArgs).map(dc => `${chalk.bold(dc)}`)
     )}`
@@ -28,7 +27,7 @@ export default async function patchDeploymentScale(
       `/v3/now/deployments/${encodeURIComponent(deploymentId)}/instances`,
       {
         method: 'PATCH',
-        body: scaleArgs
+        body: scaleArgs,
       }
     );
     cancelWait();

packages/now-cli/src/util/scale/set-deployment-scale.ts

@@ -4,7 +4,6 @@ import { Output } from '../output';
 import * as ERRORS from '../errors-ts';
 import Client from '../client';
 import joinWords from '../output/join-words';
-import wait from '../output/wait';
 
 type ScaleArgs = {
   min: number;
@@ -18,7 +17,7 @@ export default async function setScale(
   scaleArgs: ScaleArgs | DeploymentScale,
   url: string
 ) {
-  const cancelWait = wait(
+  const cancelWait = output.spinner(
     `Setting scale rules for ${joinWords(
       Object.keys(scaleArgs).map(dc => `${chalk.bold(dc)}`)
     )}`
@@ -29,7 +28,7 @@ export default async function setScale(
       `/v3/now/deployments/${encodeURIComponent(deploymentId)}/instances`,
       {
         method: 'PUT',
-        body: scaleArgs
+        body: scaleArgs,
       }
     );
     cancelWait();

packages/now-cli/src/util/scale/wait-verify-deployment-scale.ts

@@ -9,7 +9,6 @@ import Client from '../client';
 import joinWords from '../output/join-words';
 import stamp from '../output/stamp';
 import verifyDeploymentScale from './verify-deployment-scale';
-import wait from '../output/wait';
 
 export default async function waitForScale(
   output: Output,
@@ -19,7 +18,7 @@ export default async function waitForScale(
 ) {
   const remainingDCs = new Set(Object.keys(scale));
   const scaleStamp = stamp();
-  let cancelWait = renderWaitDcs(Array.from(remainingDCs.keys()));
+  let cancelWait = renderWaitDcs(output, Array.from(remainingDCs.keys()));
 
   for await (const dcReady of verifyDeploymentScale(
     output,
@@ -43,13 +42,13 @@ export default async function waitForScale(
     }
 
     if (remainingDCs.size > 0) {
-      cancelWait = renderWaitDcs(Array.from(remainingDCs.keys()));
+      cancelWait = renderWaitDcs(output, Array.from(remainingDCs.keys()));
     }
   }
 }
 
-function renderWaitDcs(dcs: string[]) {
-  return wait(
+function renderWaitDcs(output: Output, dcs: string[]) {
+  return output.spinner(
     `Waiting for instances in ${joinWords(
       dcs.map(dc => chalk.bold(dc))
     )} to be ready`

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

@@ -9,6 +9,48 @@ import toHumanPath from './humanize-path';
 
 const stat = promisify(lstatRaw);
 
+/**
+ * A helper function to validate the `rootDirectory` input.
+ */
+export async function validateRootDirectory(
+  output: Output,
+  cwd: string,
+  path: string,
+  errorSuffix: string
+) {
+  const pathStat = await stat(path).catch(() => null);
+  const suffix = errorSuffix ? ` ${errorSuffix}` : '';
+
+  if (!pathStat) {
+    output.print(
+      `${chalk.red('Error!')} The provided path ${chalk.cyan(
+        `“${toHumanPath(path)}”`
+      )} does not exist.${suffix}\n`
+    );
+    return false;
+  }
+
+  if (!pathStat.isDirectory()) {
+    output.print(
+      `${chalk.red('Error!')} The provided path ${chalk.cyan(
+        `“${toHumanPath(path)}”`
+      )} is a file, but expected a directory.${suffix}\n`
+    );
+    return false;
+  }
+
+  if (!path.startsWith(cwd)) {
+    output.print(
+      `${chalk.red('Error!')} The provided path ${chalk.cyan(
+        `“${toHumanPath(path)}”`
+      )} is outside of the project.${suffix}\n`
+    );
+    return false;
+  }
+
+  return true;
+}
+
 export default async function validatePaths(
   output: Output,
   paths: string[]
@@ -25,10 +67,7 @@ export default async function validatePaths(
   const path = paths[0];
 
   // can only deploy a directory
-  let pathStat;
-  try {
-    pathStat = await stat(path);
-  } catch (error) {}
+  const pathStat = await stat(path).catch(() => null);
 
   if (!pathStat) {
     output.print(

packages/now-cli/test/dev/fixtures/custom-runtime/.gitignore

@@ -0,0 +1 @@
+.now

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

@@ -1,7 +1,7 @@
 {
   "functions": {
-    "api/user": {
-      "runtime": "now-bash@1.0.3"
+    "api/user.sh": {
+      "runtime": "now-bash@3.0.0"
     }
   }
 }

packages/now-cli/test/dev/fixtures/python-flask/.gitignore

@@ -0,0 +1 @@
+.now

packages/now-cli/test/dev/fixtures/python-flask/api/date.py

@@ -0,0 +1,9 @@
+from flask import Flask, Response
+from datetime import datetime
+app = Flask(__name__)
+
+@app.route('/', defaults={'path': ''})
+@app.route('/<path:path>')
+def date(path):
+    d = datetime.now().isoformat()
+    return Response("Current date is %s" % (d), mimetype='text/html')

packages/now-cli/test/dev/fixtures/python-flask/api/user.py

@@ -0,0 +1,8 @@
+from flask import Flask, Response, request
+app = Flask(__name__)
+
+@app.route('/', defaults={'path': ''})
+@app.route('/<path:path>')
+def user(path):
+    name = request.args.get('name')
+    return Response("Hello %s" % (name), mimetype='text/html')

packages/now-cli/test/dev/fixtures/python-flask/index.html

@@ -0,0 +1 @@
+Home Page for Python

packages/now-cli/test/dev/fixtures/python-flask/requirements.txt

@@ -0,0 +1 @@
+Flask==1.0.3

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

@@ -1367,13 +1367,40 @@ test('[now dev] 25-nextjs-src-dir', async t => {
 });
 
 test(
-  '[now dev] Use runtime from the functions property',
-  testFixtureStdio('custom-runtime', async (t, port) => {
-    const response = await fetchWithRetry(`http://localhost:${port}/api/user`);
+  '[now dev] Use `@now/python` with Flask requirements.txt',
+  testFixtureStdio('python-flask', async (t, port) => {
+    const name = 'Alice';
+    const year = new Date().getFullYear();
+    const user = await fetchWithRetry(
+      `http://localhost:${port}/api/user?name=${name}`
+    );
+    const date = await fetchWithRetry(`http://localhost:${port}/api/date`);
+    const ext = await fetchWithRetry(`http://localhost:${port}/api/date.py`);
 
-    validateResponseHeaders(t, response);
+    validateResponseHeaders(t, user);
+    validateResponseHeaders(t, date);
+    validateResponseHeaders(t, ext);
 
-    const body = await response.text();
-    t.regex(body, /Hello, from Bash!/gm);
+    t.regex(await user.text(), new RegExp(`Hello ${name}`));
+    t.regex(await date.text(), new RegExp(`Current date is ${year}`));
+    t.regex(await ext.text(), new RegExp(`Current date is ${year}`));
+  })
+);
+
+test(
+  '[now dev] Use runtime from the functions property',
+  testFixtureStdio('custom-runtime', async (t, port) => {
+    const extensionless = await fetchWithRetry(
+      `http://localhost:${port}/api/user`
+    );
+    const extension = await fetchWithRetry(
+      `http://localhost:${port}/api/user.sh`
+    );
+
+    validateResponseHeaders(t, extensionless);
+    validateResponseHeaders(t, extension);
+
+    t.regex(await extensionless.text(), /Hello, from Bash!/gm);
+    t.regex(await extension.text(), /Hello, from Bash!/gm);
   })
 );

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

@@ -485,6 +485,9 @@ CMD ["node", "index.js"]`,
         },
       }),
     },
+    'project-root-directory': {
+      'src/index.html': '<h1>I am a website.</h1>',
+    },
   };
 
   for (const typeName of Object.keys(spec)) {

packages/now-cli/test/integration.js

@@ -213,6 +213,18 @@ test.before(async () => {
   }
 });
 
+test.after.always(async () => {
+  // Make sure the token gets revoked
+  await execa(binaryPath, ['logout', ...defaultArgs]);
+
+  if (!tmpDir) {
+    return;
+  }
+
+  // Remove config directory entirely
+  tmpDir.removeCallback();
+});
+
 test('login', async t => {
   // Delete the current token
   const logoutOutput = await execute(['logout']);
@@ -2077,6 +2089,11 @@ test('should show prompts to set up project', async t => {
   );
   now.stdin.write(`${projectName}\n`);
 
+  await waitForPrompt(now, chunk =>
+    chunk.includes('In which directory is your code located?')
+  );
+  now.stdin.write('\n');
+
   await waitForPrompt(now, chunk =>
     chunk.includes('Want to override the settings?')
   );
@@ -2132,49 +2149,6 @@ test('should show prompts to set up project', async t => {
   t.is(text.includes('<h1>custom hello</h1>'), true, text);
 });
 
-test('should not prompt "project settings overwrite" for undetected projects', async t => {
-  const directory = fixture('static-deployment');
-  const projectName = `static-deployment-${
-    Math.random()
-      .toString(36)
-      .split('.')[1]
-  }`;
-
-  // remove previously linked project if it exists
-  await remove(path.join(directory, '.now'));
-
-  const now = execa(binaryPath, [directory, ...defaultArgs]);
-
-  await waitForPrompt(now, chunk => /Set up and deploy [^?]+\?/.test(chunk));
-  now.stdin.write('yes\n');
-
-  await waitForPrompt(now, chunk =>
-    chunk.includes('Which scope do you want to deploy to?')
-  );
-  now.stdin.write('\n');
-
-  await waitForPrompt(now, chunk =>
-    chunk.includes('Link to existing project?')
-  );
-  now.stdin.write('no\n');
-
-  await waitForPrompt(now, chunk =>
-    chunk.includes('What’s your project’s name?')
-  );
-  now.stdin.write(`${projectName}\n`);
-
-  await waitForPrompt(now, chunk => {
-    t.false(
-      chunk.includes('Want to override the settings?'),
-      'Should not ask to override'
-    );
-    return chunk.includes('Linked to');
-  });
-
-  const output = await now;
-  t.is(output.exitCode, 0, formatOutput(output));
-});
-
 test('should prefill "project name" prompt with folder name', async t => {
   const projectName = `static-deployment-${
     Math.random()
@@ -2210,6 +2184,16 @@ test('should prefill "project name" prompt with folder name', async t => {
   );
   now.stdin.write(`\n`);
 
+  await waitForPrompt(now, chunk =>
+    chunk.includes('In which directory is your code located?')
+  );
+  now.stdin.write('\n');
+
+  await waitForPrompt(now, chunk =>
+    chunk.includes('Want to override the settings?')
+  );
+  now.stdin.write('no\n');
+
   const output = await now;
   t.is(output.exitCode, 0, formatOutput(output));
 });
@@ -2260,6 +2244,16 @@ test('should prefill "project name" prompt with --name', async t => {
   );
   now.stdin.write(`\n`);
 
+  await waitForPrompt(now, chunk =>
+    chunk.includes('In which directory is your code located?')
+  );
+  now.stdin.write('\n');
+
+  await waitForPrompt(now, chunk =>
+    chunk.includes('Want to override the settings?')
+  );
+  now.stdin.write('no\n');
+
   const output = await now;
   t.is(output.exitCode, 0, formatOutput(output));
 });
@@ -2311,6 +2305,16 @@ test('should prefill "project name" prompt with now.json `name`', async t => {
   );
   now.stdin.write(`\n`);
 
+  await waitForPrompt(now, chunk =>
+    chunk.includes('In which directory is your code located?')
+  );
+  now.stdin.write('\n');
+
+  await waitForPrompt(now, chunk =>
+    chunk.includes('Want to override the settings?')
+  );
+  now.stdin.write('no\n');
+
   const output = await now;
   t.is(output.exitCode, 0, formatOutput(output));
 
@@ -2420,6 +2424,39 @@ test('deploy shows notice when project in `.now` does not exists', async t => {
   t.is(detectedNotice, true, 'did not detect notice');
 });
 
+test('use `rootDirectory` from project when deploying', async t => {
+  const directory = fixture('project-root-directory');
+
+  const firstResult = await execute([directory, '--confirm', '--public']);
+  t.is(firstResult.exitCode, 0, formatOutput(firstResult));
+
+  const { host: firstHost } = new URL(firstResult.stdout);
+  const response = await apiFetch(`/v12/now/deployments/get?url=${firstHost}`);
+  t.is(response.status, 200);
+  const { projectId } = await response.json();
+  t.is(typeof projectId, 'string', projectId);
+
+  const projectResponse = await apiFetch(`/v2/projects/${projectId}`, {
+    method: 'PATCH',
+    body: JSON.stringify({
+      rootDirectory: 'src',
+    }),
+  });
+  console.log('response', await projectResponse.text());
+  t.is(projectResponse.status, 200);
+
+  const secondResult = await execute([directory, '--public']);
+  t.is(secondResult.exitCode, 0, formatOutput(secondResult));
+
+  const pageResponse = await fetch(secondResult.stdout);
+  t.is(pageResponse.status, 200);
+  t.regex(await pageResponse.text(), /I am a website/gm);
+
+  await apiFetch(`/v2/projects/${projectId}`, {
+    method: 'DELETE',
+  });
+});
+
 test('whoami with unknown `NOW_ORG_ID` should error', async t => {
   const output = await execute(['whoami'], {
     env: { NOW_ORG_ID: 'asdf' },
@@ -2465,15 +2502,3 @@ test('whoami with local .now scope', async t => {
   // clean up
   await remove(path.join(directory, '.now'));
 });
-
-test.after.always(async () => {
-  // Make sure the token gets revoked
-  await execa(binaryPath, ['logout', ...defaultArgs]);
-
-  if (!tmpDir) {
-    return;
-  }
-
-  // Remove config directory entirely
-  tmpDir.removeCallback();
-});

packages/now-go/go-helpers.ts

@@ -12,7 +12,8 @@ const platformMap = new Map([['win32', 'windows']]);
 
 // Location where the `go` binary will be installed after `postinstall`
 const GO_DIR = join(__dirname, 'go');
-const GO_BIN = join(GO_DIR, 'bin/go');
+const GO_BIN = join(GO_DIR, 'bin', 'go');
+const GO_FLAGS = process.platform === 'win32' ? [] : ['-ldflags', '-s -w'];
 
 const getPlatform = (p: string) => platformMap.get(p) || p;
 const getArch = (a: string) => archMap.get(a) || a;
@@ -23,16 +24,17 @@ const getGoUrl = (version: string, platform: string, arch: string) => {
   return `https://dl.google.com/go/go${version}.${goPlatform}-${goArch}.${ext}`;
 };
 
+export const OUT_EXTENSION = process.platform === 'win32' ? '.exe' : '';
+
 export async function getAnalyzedEntrypoint(filePath: string, modulePath = '') {
   debug('Analyzing entrypoint %o', filePath);
-  const bin = join(__dirname, 'analyze');
+  const bin = join(__dirname, `analyze${OUT_EXTENSION}`);
 
   const isAnalyzeExist = await pathExists(bin);
   if (!isAnalyzeExist) {
     const src = join(__dirname, 'util', 'analyze.go');
-    const dest = join(__dirname, 'analyze');
     const go = await downloadGo();
-    await go.build(src, dest);
+    await go.build(src, bin);
   }
 
   const args = [`-modpath=${modulePath}`, filePath];
@@ -49,7 +51,7 @@ function createGoPathTree(goPath: string, platform: string, arch: string) {
   debug('Creating GOPATH directory structure for %o (%s)', goPath, tuple);
   return Promise.all([
     mkdirp(join(goPath, 'bin')),
-    mkdirp(join(goPath, 'pkg', tuple))
+    mkdirp(join(goPath, 'pkg', tuple)),
   ]);
 }
 
@@ -92,7 +94,7 @@ class GoWrapper {
 
     const flags = process.env.GO_BUILD_FLAGS
       ? stringArgv(process.env.GO_BUILD_FLAGS)
-      : ['-ldflags', '-s -w'];
+      : GO_FLAGS;
 
     return this.execute('build', ...flags, '-o', dest, ...sources);
   }
@@ -110,7 +112,7 @@ export async function createGo(
     ...process.env,
     PATH: path,
     GOPATH: goPath,
-    ...opts.env
+    ...opts.env,
   };
   if (goMod) {
     env.GO111MODULE = 'on';

packages/now-go/index.ts

@@ -1,4 +1,4 @@
-import { join, sep, dirname, basename } from 'path';
+import { join, sep, dirname, basename, normalize } from 'path';
 import { readFile, writeFile, pathExists, move } from 'fs-extra';
 import { homedir } from 'os';
 import execa from 'execa';
@@ -14,7 +14,8 @@ import {
   debug,
 } from '@now/build-utils';
 
-import { createGo, getAnalyzedEntrypoint } from './go-helpers';
+import { createGo, getAnalyzedEntrypoint, OUT_EXTENSION } from './go-helpers';
+const handlerFileName = `handler${OUT_EXTENSION}`;
 
 interface Analyzed {
   found?: boolean;
@@ -321,7 +322,7 @@ Learn more: https://zeit.co/docs/v2/advanced/builders/#go
     }
 
     debug('Running `go build`...');
-    const destPath = join(outDir, 'handler');
+    const destPath = join(outDir, handlerFileName);
 
     try {
       const src = [join(baseGoModPath, mainModGoFileName)];
@@ -385,12 +386,12 @@ Learn more: https://zeit.co/docs/v2/advanced/builders/#go
     }
 
     debug('Running `go build`...');
-    const destPath = join(outDir, 'handler');
+    const destPath = join(outDir, handlerFileName);
     try {
       const src = [
         join(entrypointDirname, mainGoFileName),
         downloadedFiles[entrypoint].fsPath,
-      ];
+      ].map(file => normalize(file));
       await go.build(src, destPath);
     } catch (err) {
       console.log('failed to `go build`');
@@ -400,7 +401,7 @@ Learn more: https://zeit.co/docs/v2/advanced/builders/#go
 
   const lambda = await createLambda({
     files: { ...(await glob('**', outDir)), ...includedFiles },
-    handler: 'handler',
+    handler: handlerFileName,
     runtime: 'go1.x',
     environment: {},
   });

packages/now-go/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/go",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://zeit.co/docs/runtimes#official-runtimes/go",

packages/now-go/test/test.js

@@ -3,14 +3,24 @@ const path = require('path');
 
 const {
   packAndDeploy,
-  testDeployment
+  testDeployment,
 } = require('../../../test/lib/deployment/test-deployment.js');
 
 jest.setTimeout(4 * 60 * 1000);
-const buildUtilsUrl = '@canary';
+let buildUtilsUrl;
 let builderUrl;
 
 beforeAll(async () => {
+  if (!buildUtilsUrl) {
+    const buildUtilsPath = path.resolve(
+      __dirname,
+      '..',
+      '..',
+      'now-build-utils'
+    );
+    buildUtilsUrl = await packAndDeploy(buildUtilsPath);
+    console.log('buildUtilsUrl', buildUtilsUrl);
+  }
   const builderPath = path.resolve(__dirname, '..');
   builderUrl = await packAndDeploy(builderPath);
   console.log('builderUrl', builderUrl);

packages/now-python/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/python",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "./dist/index.js",
   "license": "MIT",
   "homepage": "https://zeit.co/docs/runtimes#official-runtimes/python",

packages/now-python/src/index.ts

@@ -8,6 +8,7 @@ import {
   getWriteableDirectory,
   download,
   glob,
+  GlobOptions,
   createLambda,
   shouldServe,
   BuildOptions,
@@ -174,8 +175,16 @@ export const build = async ({
   // Use the system-installed version of `python3` when running via `now dev`
   const runtime = meta.isDev ? 'python3' : 'python3.6';
 
+  const globOptions: GlobOptions = {
+    cwd: workPath,
+    ignore:
+      config && typeof config.excludeFiles === 'string'
+        ? config.excludeFiles
+        : 'node_modules/**',
+  };
+
   const lambda = await createLambda({
-    files: await glob('**', workPath),
+    files: await glob('**', globOptions),
     handler: `${nowHandlerPyFilename}.now_handler`,
     runtime,
     environment: {},

packages/now-python/test/fixtures/25-exclude-files/api/no.py

@@ -0,0 +1,15 @@
+from http.server import BaseHTTPRequestHandler
+from cowpy import cow
+from os import path
+
+class handler(BaseHTTPRequestHandler):
+
+    def do_GET(self):
+        self.send_response(200)
+        self.send_header('Content-type', 'text/plain')
+        self.end_headers()
+        first = path.exists('ignoreme/first.txt')
+        second = path.exists('ignoreme/second.txt')
+        message = cow.Cowacter().milk(('%s:%s:RANDOMNESS_PLACEHOLDER') % (first, second))
+        self.wfile.write(message.encode())
+        return

packages/now-python/test/fixtures/25-exclude-files/api/yes.py

@@ -0,0 +1,15 @@
+from http.server import BaseHTTPRequestHandler
+from cowpy import cow
+from os import path
+
+class handler(BaseHTTPRequestHandler):
+
+    def do_GET(self):
+        self.send_response(200)
+        self.send_header('Content-type', 'text/plain')
+        self.end_headers()
+        first = path.exists('ignoreme/first.txt')
+        second = path.exists('ignoreme/second.txt')
+        message = cow.Cowacter().milk(('%s:%s:RANDOMNESS_PLACEHOLDER') % (first, second))
+        self.wfile.write(message.encode())
+        return

packages/now-python/test/fixtures/25-exclude-files/ignoreme/first.txt

@@ -0,0 +1 @@
+First file to ignore

packages/now-python/test/fixtures/25-exclude-files/ignoreme/second.txt

@@ -0,0 +1 @@
+Second file to ignore

packages/now-python/test/fixtures/25-exclude-files/now.json

@@ -0,0 +1,21 @@
+{
+  "version": 2,
+  "builds": [
+    { "src": "api/yes.py", "use": "@now/python" },
+    {
+      "src": "api/no.py",
+      "use": "@now/python",
+      "config": { "excludeFiles": "ignoreme/**" }
+    }
+  ],
+  "probes": [
+    {
+      "path": "/api/yes.py",
+      "mustContain": "True:True:RANDOMNESS_PLACEHOLDER"
+    },
+    {
+      "path": "/api/no.py",
+      "mustContain": "False:False:RANDOMNESS_PLACEHOLDER"
+    }
+  ]
+}

packages/now-python/test/fixtures/25-exclude-files/requirements.txt

@@ -0,0 +1 @@
+cowpy==1.0.3

packages/now-static-build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/static-build",
-  "version": "0.14.11-canary.1",
+  "version": "0.14.11",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://zeit.co/docs/runtimes#official-runtimes/static-builds",
@@ -21,10 +21,12 @@
   "devDependencies": {
     "@types/cross-spawn": "6.0.0",
     "@types/ms": "0.7.31",
+    "@types/node-fetch": "2.5.4",
     "@types/promise-timeout": "1.3.0",
     "get-port": "5.0.0",
     "is-port-reachable": "2.0.1",
     "ms": "2.1.2",
+    "node-fetch": "2.6.0",
     "typescript": "3.5.2"
   }
 }

packages/now-static-build/src/frameworks.ts

@@ -365,6 +365,21 @@ const frameworkList: Framework[] = [
     buildCommand: 'stencil build',
     getOutputDirName: async () => 'www',
     defaultRoutes: [
+      { 
+        src: '/assets/(.*)',
+        headers: { 'cache-control': 'max-age=2592000' },
+        continue: true,
+      },
+      {
+        src: '/build/p-.*',
+        headers: { 'cache-control': 'max-age=31536000, immutable' },
+        continue: true,
+      },
+      {
+        src: '/sw.js',
+        headers: { 'cache-control': 'no-cache' },
+        continue: true,
+      },
       {
         handle: 'filesystem',
       },

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

@@ -1,5 +1,6 @@
 import ms from 'ms';
 import path from 'path';
+import fetch from 'node-fetch';
 import getPort from 'get-port';
 import isPortReachable from 'is-port-reachable';
 import { ChildProcess, SpawnOptions } from 'child_process';
@@ -223,6 +224,20 @@ function getFramework(
   return framework;
 }
 
+async function fetchBinary(url: string, framework: string, version: string) {
+  const res = await fetch(url);
+  if (res.status === 404) {
+    throw new NowBuildError({
+      code: 'NOW_STATIC_BUILD_BINARY_NOT_FOUND',
+      message: `Version ${version} of ${framework} does not exist. Please specify a different one.`,
+      link: 'https://zeit.co/docs/v2/build-step#framework-versioning',
+    });
+  }
+  await spawnAsync(`curl -sSL ${url} | tar -zx -C /usr/local/bin`, [], {
+    shell: true,
+  });
+}
+
 export async function build({
   files,
   entrypoint,
@@ -284,25 +299,19 @@ export async function build({
         const isOldVersion = major === 0 && minor < 43;
         const prefix = isOldVersion ? `hugo_` : `hugo_extended_`;
         const url = `https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/${prefix}${HUGO_VERSION}_Linux-64bit.tar.gz`;
-        await spawnAsync(`curl -sSL ${url} | tar -zx -C /usr/local/bin`, [], {
-          shell: true,
-        });
+        await fetchBinary(url, 'Hugo', HUGO_VERSION);
       }
 
       if (ZOLA_VERSION && !meta.isDev) {
         console.log('Installing Zola version ' + ZOLA_VERSION);
         const url = `https://github.com/getzola/zola/releases/download/v${ZOLA_VERSION}/zola-v${ZOLA_VERSION}-x86_64-unknown-linux-gnu.tar.gz`;
-        await spawnAsync(`curl -sSL ${url} | tar -zx -C /usr/local/bin`, [], {
-          shell: true,
-        });
+        await fetchBinary(url, 'Zola', ZOLA_VERSION);
       }
 
       if (GUTENBERG_VERSION && !meta.isDev) {
         console.log('Installing Gutenberg version ' + GUTENBERG_VERSION);
         const url = `https://github.com/getzola/zola/releases/download/v${GUTENBERG_VERSION}/gutenberg-v${GUTENBERG_VERSION}-x86_64-unknown-linux-gnu.tar.gz`;
-        await spawnAsync(`curl -sSL ${url} | tar -zx -C /usr/local/bin`, [], {
-          shell: true,
-        });
+        await fetchBinary(url, 'Gutenberg', GUTENBERG_VERSION);
       }
 
       // `public` is the default for zero config

packages/now-static-build/test/fixtures/36-hugo-version-not-found/now.json

@@ -0,0 +1,15 @@
+{
+  "version": 2,
+  "builds": [
+    {
+      "src": "package.json",
+      "use": "@now/static-build",
+      "config": { "zeroConfig": true }
+    }
+  ],
+  "build": {
+    "env": {
+      "HUGO_VERSION": "0.0.0"
+    }
+  }
+}

packages/now-static-build/test/fixtures/36-hugo-version-not-found/package.json

@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "scripts": {
+    "build": "mkdir public && hugo version > public/index.txt"
+  }
+}

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

@@ -32,6 +32,7 @@ const testsThatFailToBuild = new Set([
   '05-empty-dist-dir',
   '06-missing-script',
   '07-nonzero-sh',
+  '36-hugo-version-not-found',
 ]);
 
 // eslint-disable-next-line no-restricted-syntax

utils/run.js

@@ -2,6 +2,14 @@ const { execSync, spawn } = require('child_process');
 const { join, relative } = require('path');
 const { readdirSync } = require('fs');
 
+if (
+  process.env.GITHUB_REPOSITORY &&
+  process.env.GITHUB_REPOSITORY !== 'zeit/now'
+) {
+  console.log('Detected fork, skipping tests');
+  return;
+}
+
 process.chdir(join(__dirname, '..'));
 
 async function main() {

yarn.lock

@@ -1363,6 +1363,14 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
   integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
 
+"@sindresorhus/slugify@0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/slugify/-/slugify-0.10.0.tgz#8878609a6a468a110690abbfb65171769cd9a8d4"
+  integrity sha512-R/3PVAS0rIbrH/qJRb4ma/5pG3oyQKW1Ws4bsc/Fscfb6HWeB0CNWD3bnPAiWi5PYLnl33TcsXCKXNOPwBpyaw==
+  dependencies:
+    escape-string-regexp "^2.0.0"
+    lodash.deburr "^4.1.0"
+
 "@sinonjs/commons@^1", "@sinonjs/commons@^1.3.0":
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.6.0.tgz#ec7670432ae9c8eb710400d112c201a362d83393"
@@ -2042,10 +2050,10 @@
     agentkeepalive "3.4.1"
     debug "3.1.0"
 
-"@zeit/fun@0.11.0":
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/@zeit/fun/-/fun-0.11.0.tgz#e226af0a2b63020a0e233dd37a2ceb2ac2e68fe3"
-  integrity sha512-w9IqoMV6SIKVmQbocKKvllgL27im7YQfTFV/0hjIgASfi8yQgPIj7mo76VFosRS0HQA5MEIzYz+oigdelOTIOQ==
+"@zeit/fun@0.11.2":
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/@zeit/fun/-/fun-0.11.2.tgz#a9ac34c8db09f8de40f7e727bdfde808c1be6505"
+  integrity sha512-1LoKTF2jq7YT3eATD/iTRuaTmvVtX3pWi3SVZPAgDTb70OLklpDkvVA/Z7dqP/WMB3gVGBdQNIhWfPTlBwrHEA==
   dependencies:
     async-listen "1.0.0"
     debug "4.1.1"
@@ -3205,11 +3213,6 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chardet@^0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
-  integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=
-
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -4735,15 +4738,6 @@ extend@~3.0.2:
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
-external-editor@^2.0.4:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
-  integrity sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==
-  dependencies:
-    chardet "^0.4.0"
-    iconv-lite "^0.4.17"
-    tmp "^0.0.33"
-
 external-editor@^3.0.3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
@@ -5756,7 +5750,7 @@ iconv-lite@0.4.19:
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
   integrity sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==
 
-iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -5918,24 +5912,23 @@ init-package-json@^1.10.3:
     validate-npm-package-license "^3.0.1"
     validate-npm-package-name "^3.0.0"
 
-inquirer@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
-  integrity sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==
+inquirer@7.0.4:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.4.tgz#99af5bde47153abca23f5c7fc30db247f39da703"
+  integrity sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ==
   dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
-    cli-cursor "^2.1.0"
+    ansi-escapes "^4.2.1"
+    chalk "^2.4.2"
+    cli-cursor "^3.1.0"
     cli-width "^2.0.0"
-    external-editor "^2.0.4"
-    figures "^2.0.0"
-    lodash "^4.3.0"
-    mute-stream "0.0.7"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.15"
+    mute-stream "0.0.8"
     run-async "^2.2.0"
-    rx-lite "^4.0.8"
-    rx-lite-aggregates "^4.0.8"
-    string-width "^2.1.0"
-    strip-ansi "^4.0.0"
+    rxjs "^6.5.3"
+    string-width "^4.1.0"
+    strip-ansi "^5.1.0"
     through "^2.3.6"
 
 inquirer@^6.2.0:
@@ -7217,6 +7210,11 @@ lodash.clonedeep@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
+lodash.deburr@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.deburr/-/lodash.deburr-4.1.0.tgz#ddb1bbb3ef07458c0177ba07de14422cb033ff9b"
+  integrity sha1-3bG7s+8HRYwBd7oH3hRCLLAz/5s=
+
 lodash.flattendeep@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
@@ -7287,7 +7285,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.2.1, lodash@^4.3.0:
+lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.2.1:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -9542,14 +9540,14 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rx-lite-aggregates@4.0.8, rx-lite-aggregates@^4.0.8:
+rx-lite-aggregates@4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
   integrity sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=
   dependencies:
     rx-lite "*"
 
-rx-lite@*, rx-lite@^4.0.8:
+rx-lite@*:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
   integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=
@@ -9561,6 +9559,13 @@ rxjs@^6.3.3, rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^6.5.3:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c"
+  integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==
+  dependencies:
+    tslib "^1.9.0"
+
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"