Publish

- @now/next@0.5.4

.eslintignore

@@ -13,3 +13,5 @@
 /packages/now-go/*
 /packages/now-rust/dist/*
 /packages/now-ruby/dist/*
+/packages/now-static-build/dist/*
+/packages/now-static-build/test/fixtures/**

.github/CODEOWNERS

@@ -1,9 +1,11 @@
 # Documentation
 # https://help.github.com/en/articles/about-code-owners
 
-*                       @styfle
-/packages/now-node      @styfle @tootallnate
-/packages/now-next      @timer  @dav-is
-/packages/now-go        @styfle @sophearak
-/packages/now-python    @styfle @sophearak
-/packages/now-rust      @styfle @mike-engel @anmonteiro
+*                         @styfle
+/packages/now-node        @styfle @tootallnate @lucleray
+/packages/now-node-bridge @styfle @tootallnate @lucleray
+/packages/now-next        @timer
+/packages/now-go          @styfle @sophearak
+/packages/now-python      @styfle @sophearak
+/packages/now-rust        @styfle @mike-engel @anmonteiro
+/packages/now-ruby        @styfle @coetry @nathancahill

.github/main.workflow

@@ -18,21 +18,21 @@ action "1. Canary yarn install" {
   uses = "actions/npm@59b64a598378f31e49cb76f27d6f3312b582f680"
   needs = ["0. Canary PR not deleted"]
   runs = "yarn"
-  args = "install"
+  args = "--pure-lockfile install"
 }
 
 action "2. Canary yarn run build" {
   uses = "actions/npm@59b64a598378f31e49cb76f27d6f3312b582f680"
   needs = ["1. Canary yarn install"]
   runs = "yarn"
-  args = "run build"
+  args = "--pure-lockfile run build"
 }
 
 action "3. Canary yarn run publish" {
   uses = "actions/npm@59b64a598378f31e49cb76f27d6f3312b582f680"
   needs = ["2. Canary yarn run build"]
   runs = "yarn"
-  args = "run publish-from-github"
+  args = "--pure-lockfile run publish-from-github"
   secrets = ["NPM_TOKEN"]
 }
 
@@ -57,20 +57,20 @@ action "1. Master yarn install" {
   uses = "actions/npm@59b64a598378f31e49cb76f27d6f3312b582f680"
   needs = ["0. Master PR not deleted"]
   runs = "yarn"
-  args = "install"
+  args = "--pure-lockfile install"
 }
 
 action "2. Master yarn run build" {
   uses = "actions/npm@59b64a598378f31e49cb76f27d6f3312b582f680"
   needs = ["1. Master yarn install"]
   runs = "yarn"
-  args = "run build"
+  args = "--pure-lockfile run build"
 }
 
 action "3. Master yarn run publish" {
   uses = "actions/npm@59b64a598378f31e49cb76f27d6f3312b582f680"
   needs = ["2. Master yarn run build"]
   runs = "yarn"
-  args = "run publish-from-github"
+  args = "--pure-lockfile run publish-from-github"
   secrets = ["NPM_TOKEN"]
 }

CONTRIBUTING.md

@@ -6,7 +6,7 @@ Please read our [code of conduct](CODE_OF_CONDUCT.md) and follow it in all your
 
 ## Local development
 
-This project is configured in a monorepo pattern where one repo contains multiple npm packages. Dependencies are installed and managed with `yarn`, not `npm` CLI. 
+This project is configured in a monorepo pattern where one repo contains multiple npm packages. Dependencies are installed and managed with `yarn`, not `npm` CLI.
 
 To get started, execute the following:
 
@@ -42,7 +42,7 @@ The pull request will be reviewed by the maintainers and the tests will be check
 ## Interpreting test errors
 
 There are 2 kinds of tests in this repository – Unit tests and Integration tests.
- 
+
 Unit tests are run locally with `jest` and execute quickly because they are testing the smallest units of code.
 
 ### Integration tests

README.md

@@ -24,8 +24,9 @@ yarn publish-canary
 ```
 
 For the Stable Channel, you must do the following:
+
 - Cherry pick each commit from canary to master
-- Verify that you are *in-sync* with canary (with the exception of the `version` line in `package.json`)
+- Verify that you are _in-sync_ with canary (with the exception of the `version` line in `package.json`)
 - Deploy the modified Builders
 
 ```

jest.config.js

@@ -1,33 +1,29 @@
 const { execSync } = require('child_process');
 const { relative } = require('path');
 
-const branch = execSync('git branch | grep "*" | cut -d " " -f2').toString();
+const branch = execSync('git branch | grep "*" | cut -d " " -f2')
+  .toString()
+  .trim();
 console.log(`Running tests on branch "${branch}"`);
-const base = branch === 'master' ? 'HEAD~1' : 'origin/canary';
-const diff = execSync(`git diff ${base} --name-only`).toString();
+const gitPath = branch === 'master' ? 'HEAD~1' : 'origin/canary...HEAD';
+const diff = execSync(`git diff ${gitPath} --name-only`).toString();
 
 const changed = diff
   .split('\n')
   .filter(item => Boolean(item) && item.includes('packages/'))
   .map(item => relative('packages', item).split('/')[0]);
 
-const matches = [];
+const matches = Array.from(new Set(changed));
 
-if (changed.length > 0) {
-  console.log('The following packages have changed:');
-
-  changed.map((item) => {
-    matches.push(item);
-    console.log(item);
-
-    return null;
-  });
-} else {
+if (matches.length === 0) {
   matches.push('now-node');
   console.log(`No packages changed, defaulting to ${matches[0]}`);
+} else {
+  console.log('The following packages have changed:');
+  console.log(matches.join('\n'));
 }
 
-const testMatch = Array.from(new Set(matches)).map(
+const testMatch = matches.map(
   item => `**/${item}/**/?(*.)+(spec|test).[jt]s?(x)`,
 );
 

package.json

@@ -12,8 +12,8 @@
   "scripts": {
     "lerna": "lerna",
     "bootstrap": "lerna bootstrap",
-    "publish-stable": "git checkout master && git pull && lerna version",
-    "publish-canary": "git checkout canary && git pull && lerna version prerelease --preid canary",
+    "publish-stable": "git checkout master && git pull && lerna version --exact",
+    "publish-canary": "git checkout canary && git pull && lerna version prerelease --preid canary --exact",
     "publish-from-github": "./.circleci/publish.sh",
     "build": "./.circleci/build.sh",
     "lint": "eslint .",

packages/now-bash/index.js

@@ -10,9 +10,18 @@ const {
 } = require('@now/build-utils'); // eslint-disable-line import/no-extraneous-dependencies
 
 exports.config = {
-  maxLambdaSize: '10mb',
+  maxLambdaSize: '30mb',
 };
 
+// From this list: https://import.pw/importpw/import/docs/config.md
+const allowedConfigImports = new Set([
+  'CACHE',
+  'CURL_OPTS',
+  'DEBUG',
+  'RELOAD',
+  'SERVER',
+]);
+
 exports.analyze = ({ files, entrypoint }) => files[entrypoint].digest;
 
 exports.build = async ({
@@ -24,10 +33,23 @@ exports.build = async ({
   await download(files, srcDir);
 
   const configEnv = Object.keys(config).reduce((o, v) => {
-    o[`IMPORT_${snakeCase(v).toUpperCase()}`] = config[v]; // eslint-disable-line no-param-reassign
+    const name = snakeCase(v).toUpperCase();
+
+    if (allowedConfigImports.has(name)) {
+      o[`IMPORT_${name}`] = config[v]; // eslint-disable-line no-param-reassign
+    }
+
     return o;
   }, {});
 
+  if (config && config.import) {
+    Object.keys(config.import).forEach((key) => {
+      const name = snakeCase(key).toUpperCase();
+      // eslint-disable-next-line no-param-reassign
+      configEnv[`IMPORT_${name}`] = config.import[key];
+    });
+  }
+
   const IMPORT_CACHE = `${workPath}/.import-cache`;
   const env = Object.assign({}, process.env, configEnv, {
     PATH: `${IMPORT_CACHE}/bin:${process.env.PATH}`,

packages/now-bash/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@now/bash",
-  "version": "0.2.3",
+  "version": "1.0.1",
   "description": "Now 2.0 builder for HTTP endpoints written in Bash",
   "main": "index.js",
   "author": "Nathan Rajlich <nate@zeit.co>",
   "license": "MIT",
+  "homepage": "https://zeit.co/docs/v2/deployments/official-builders/bash-now-bash",
   "repository": {
     "type": "git",
     "url": "https://github.com/zeit/now-builders.git",

packages/now-build-utils/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@now/build-utils",
-  "version": "0.7.0",
+  "version": "0.8.3",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
+  "homepage": "https://zeit.co/docs/v2/deployments/builders/developer-guide",
   "repository": {
     "type": "git",
     "url": "https://github.com/zeit/now-builders.git",
@@ -22,6 +23,7 @@
     "fs-extra": "7.0.0",
     "glob": "7.1.3",
     "into-stream": "5.0.0",
+    "minimatch": "3.0.4",
     "multistream": "2.1.1",
     "node-fetch": "2.2.0",
     "semver": "6.1.1",

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

@@ -0,0 +1,95 @@
+import { PackageJson, Builder, Config } from './types';
+import minimatch from 'minimatch';
+
+const src: string = 'package.json';
+const config: Config = { zeroConfig: true };
+
+// Static builders are special cased in `@now/static-build`
+const BUILDERS = new Map<string, Builder>([
+  ['next', { src, use: '@now/next', config }],
+]);
+
+const API_BUILDERS: Builder[] = [
+  { src: 'api/**/*.js', use: '@now/node', config },
+  { src: 'api/**/*.ts', use: '@now/node', config },
+  { src: 'api/**/*.rs', use: '@now/rust', config },
+  { src: 'api/**/*.go', use: '@now/go', config },
+  { src: 'api/**/*.php', use: '@now/php', config },
+  { src: 'api/**/*.py', use: '@now/python', config },
+  { src: 'api/**/*.rb', use: '@now/ruby', config },
+  { src: 'api/**/*.sh', use: '@now/bash', config },
+];
+
+interface Warning {
+  code: string;
+  message: string;
+}
+
+export async function detectBuilder(
+  pkg: PackageJson
+): Promise<{
+  builder: null | Builder;
+  warnings: null | Warning[];
+}> {
+  let warnings: null | Warning[] = null;
+
+  const scripts = pkg.scripts || {};
+
+  if (!scripts.build) {
+    warnings = [
+      {
+        code: 'missing_build_script',
+        message:
+          'Your `package.json` file is missing a `build` property inside the `script` property',
+      },
+    ];
+  }
+
+  for (const [dependency, builder] of BUILDERS) {
+    const deps = Object.assign({}, pkg.dependencies, pkg.devDependencies);
+
+    // Return the builder when a dependency matches
+    if (deps[dependency]) {
+      return { builder, warnings };
+    }
+  }
+
+  // If there is no `build` and `now-build` script
+  // we'll not select `@now/static-build`
+  // since it would fail
+  if (!scripts.build) {
+    return { builder: null, warnings };
+  }
+
+  // By default we'll choose the `static-build` builder
+  const builder = { src, use: '@now/static-build', config };
+  return { builder, warnings };
+}
+
+// Files that match a specific pattern will get ignored
+export function ignoreApiFilter(file: string) {
+  if (file.includes('/.')) {
+    return false;
+  }
+
+  if (file.includes('/_')) {
+    return false;
+  }
+
+  return true;
+}
+
+export async function detectApiBuilders(
+  files: string[]
+): Promise<Builder[] | null> {
+  const builds = files.filter(ignoreApiFilter).map(file => {
+    const result = API_BUILDERS.find(
+      ({ src }): boolean => minimatch(file, src)
+    );
+
+    return result ? { ...result, src: file } : null;
+  });
+
+  const finishedBuilds = builds.filter(Boolean);
+  return finishedBuilds.length > 0 ? (finishedBuilds as Builder[]) : null;
+}

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

@@ -0,0 +1,235 @@
+import { Route } from './types';
+import { parse as parsePath } from 'path';
+import { ignoreApiFilter } from './detect-builder';
+
+function joinPath(...segments: string[]) {
+  const joinedPath = segments.join('/');
+  return joinedPath.replace(/\/{2,}/g, '/');
+}
+
+function concatArrayOfText(texts: string[]): string {
+  if (texts.length <= 2) {
+    return texts.join(' and ');
+  }
+
+  const last = texts.pop();
+  return `${texts.join(', ')}, and ${last}`;
+}
+
+// Takes a filename or foldername, strips the extension
+// gets the part between the "[]" brackets.
+// It will return `null` if there are no brackets
+// and therefore no segment.
+function getSegmentName(segment: string): string | null {
+  const { name } = parsePath(segment);
+
+  if (name.startsWith('[') && name.endsWith(']')) {
+    return name.slice(1, -1);
+  }
+
+  return null;
+}
+
+function createRouteFromPath(filePath: string): Route {
+  const parts = filePath.split('/');
+
+  let counter: number = 1;
+  const query: string[] = [];
+
+  const srcParts = parts.map(
+    (segment, index): string => {
+      const name = getSegmentName(segment);
+      const isLast = index === parts.length - 1;
+
+      if (name !== null) {
+        // We can't use `URLSearchParams` because `$` would get escaped
+        query.push(`${name}=$${counter++}`);
+        return `([^\\/]+)`;
+      } else if (isLast) {
+        const { name: fileName } = parsePath(segment);
+        return fileName;
+      }
+
+      return segment;
+    }
+  );
+
+  const src = `^/${srcParts.join('/')}$`;
+  const dest = `/${filePath}?${query.join('&')}`;
+
+  return { src, dest };
+}
+
+// Check if the path partially matches and has the same
+// name for the path segment at the same position
+function partiallyMatches(pathA: string, pathB: string): boolean {
+  const partsA = pathA.split('/');
+  const partsB = pathB.split('/');
+
+  const long = partsA.length > partsB.length ? partsA : partsB;
+  const short = long === partsA ? partsB : partsA;
+
+  let index = 0;
+
+  for (const segmentShort of short) {
+    const segmentLong = long[index];
+
+    const nameLong = getSegmentName(segmentLong);
+    const nameShort = getSegmentName(segmentShort);
+
+    // If there are no segments or the paths differ we
+    // return as they are not matching
+    if (segmentShort !== segmentLong && (!nameLong || !nameShort)) {
+      return false;
+    }
+
+    if (nameLong !== nameShort) {
+      return true;
+    }
+
+    index += 1;
+  }
+
+  return false;
+}
+
+// Counts how often a path occurres when all placeholders
+// got resolved, so we can check if they have conflicts
+function pathOccurrences(filePath: string, files: string[]): string[] {
+  const getAbsolutePath = (unresolvedPath: string): string => {
+    const { dir, name } = parsePath(unresolvedPath);
+    const parts = joinPath(dir, name).split('/');
+    return parts.map(part => part.replace(/\[.*\]/, '1')).join('/');
+  };
+
+  const currentAbsolutePath = getAbsolutePath(filePath);
+
+  return files.reduce((prev: string[], file: string): string[] => {
+    const absolutePath = getAbsolutePath(file);
+
+    if (absolutePath === currentAbsolutePath) {
+      prev.push(file);
+    } else if (partiallyMatches(filePath, file)) {
+      prev.push(file);
+    }
+
+    return prev;
+  }, []);
+}
+
+// Checks if a placeholder with the same name is used
+// multiple times inside the same path
+function getConflictingSegment(filePath: string): string | null {
+  const segments = new Set<string>();
+
+  for (const segment of filePath.split('/')) {
+    const name = getSegmentName(segment);
+
+    if (name !== null && segments.has(name)) {
+      return name;
+    }
+
+    if (name) {
+      segments.add(name);
+    }
+  }
+
+  return null;
+}
+
+function sortFilesBySegmentCount(fileA: string, fileB: string): number {
+  const lengthA = fileA.split('/').length;
+  const lengthB = fileB.split('/').length;
+
+  if (lengthA > lengthB) {
+    return -1;
+  }
+
+  if (lengthA < lengthB) {
+    return 1;
+  }
+
+  // Paths that have the same segment length but
+  // less placeholders are preferred
+  const countSegments = (prev: number, segment: string) =>
+    getSegmentName(segment) ? prev + 1 : 0;
+  const segmentLengthA = fileA.split('/').reduce(countSegments, 0);
+  const segmentLengthB = fileB.split('/').reduce(countSegments, 0);
+
+  if (segmentLengthA > segmentLengthB) {
+    return 1;
+  }
+
+  if (segmentLengthA < segmentLengthB) {
+    return -1;
+  }
+
+  return 0;
+}
+
+export async function detectApiRoutes(
+  files: string[]
+): Promise<{
+  defaultRoutes: Route[] | null;
+  error: { [key: string]: string } | null;
+}> {
+  if (!files || files.length === 0) {
+    return { defaultRoutes: null, error: null };
+  }
+
+  // The deepest routes need to be
+  // the first ones to get handled
+  const sortedFiles = files
+    .filter(ignoreApiFilter)
+    .sort(sortFilesBySegmentCount);
+
+  const defaultRoutes: Route[] = [];
+
+  for (const file of sortedFiles) {
+    // We only consider every file in the api directory
+    // as we will strip extensions as well as resolving "[segments]"
+    if (!file.startsWith('api/')) {
+      continue;
+    }
+
+    const conflictingSegment = getConflictingSegment(file);
+
+    if (conflictingSegment) {
+      return {
+        defaultRoutes: null,
+        error: {
+          code: 'conflicting_path_segment',
+          message:
+            `The segment "${conflictingSegment}" occurres more than ` +
+            `one time in your path "${file}". Please make sure that ` +
+            `every segment in a path is unique`,
+        },
+      };
+    }
+
+    const occurrences = pathOccurrences(file, sortedFiles).filter(
+      name => name !== file
+    );
+
+    if (occurrences.length > 0) {
+      const messagePaths = concatArrayOfText(
+        occurrences.map(name => `"${name}"`)
+      );
+
+      return {
+        defaultRoutes: null,
+        error: {
+          code: 'conflicting_file_path',
+          message:
+            `Two or more files have conflicting paths or names. ` +
+            `Please make sure path segments and filenames, without their extension, are unique. ` +
+            `The path "${file}" has conflicts with ${messagePaths}`,
+        },
+      };
+    }
+
+    defaultRoutes.push(createRouteFromPath(file));
+  }
+
+  return { defaultRoutes, error: null };
+}

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

@@ -39,10 +39,10 @@ export default async function download(
   basePath: string,
   meta?: Meta
 ): Promise<DownloadedFiles> {
-  const { isDev = false, filesChanged = null, filesRemoved = null } =
+  const { isDev = false, skipDownload = false, filesChanged = null, filesRemoved = null } =
     meta || {};
 
-  if (isDev) {
+  if (isDev || skipDownload) {
     // In `now dev`, the `download()` function is a no-op because
     // the `basePath` matches the `cwd` of the dev server, so the
     // source files are already available.

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

@@ -13,15 +13,18 @@ export const defaultSelection = supportedOptions.find(
 ) as NodeVersion;
 
 export async function getSupportedNodeVersion(
-  engineRange?: string
+  engineRange?: string,
+  silent?: boolean
 ): Promise<NodeVersion> {
   let selection = defaultSelection;
 
   if (!engineRange) {
-    console.log(
-      'missing `engines` in `package.json`, using default range: ' +
-        selection.range
-    );
+    if (!silent) {
+      console.log(
+        'missing `engines` in `package.json`, using default range: ' +
+          selection.range
+      );
+    }
   } else {
     const found = supportedOptions.some(o => {
       // the array is already in order so return the first
@@ -30,15 +33,20 @@ export async function getSupportedNodeVersion(
       return intersects(o.range, engineRange);
     });
     if (found) {
-      console.log(
-        'found `engines` in `package.json`, selecting range: ' + selection.range
-      );
+      if (!silent) {
+        console.log(
+          'Found `engines` in `package.json`, selecting range: ' +
+            selection.range
+        );
+      }
     } else {
-      throw new Error(
-        'found `engines` in `package.json` with an unsupported node range: ' +
-          engineRange +
-          '\nplease use `10.x` or `8.10.x` instead'
-      );
+      if (!silent) {
+        throw new Error(
+          'found `engines` in `package.json` with an unsupported node range: ' +
+            engineRange +
+            '\nplease use `10.x` or `8.10.x` instead'
+        );
+      }
     }
   }
   return selection;

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

@@ -46,11 +46,15 @@ async function chmodPlusX(fsPath: string) {
   await fs.chmod(fsPath, base8);
 }
 
-export async function runShellScript(fsPath: string) {
+export async function runShellScript(
+  fsPath: string,
+  args: string[] = [],
+  spawnOpts?: SpawnOptions
+) {
   assert(path.isAbsolute(fsPath));
   const destPath = path.dirname(fsPath);
   await chmodPlusX(fsPath);
-  await spawnAsync(`./${path.basename(fsPath)}`, [], destPath);
+  await spawnAsync(`./${path.basename(fsPath)}`, args, destPath, spawnOpts);
   return true;
 }
 
@@ -69,10 +73,15 @@ export function getSpawnOptions(
   return opts;
 }
 
-export async function getNodeVersion(destPath: string): Promise<NodeVersion> {
+export async function getNodeVersion(
+  destPath: string,
+  minNodeVersion?: string
+): Promise<NodeVersion> {
   const { packageJson } = await scanParentDirs(destPath, true);
-  const range = packageJson && packageJson.engines && packageJson.engines.node;
-  return getSupportedNodeVersion(range);
+  const range =
+    (packageJson && packageJson.engines && packageJson.engines.node) ||
+    minNodeVersion;
+  return getSupportedNodeVersion(range, typeof minNodeVersion !== 'undefined');
 }
 
 async function scanParentDirs(destPath: string, readPackageJson = false) {
@@ -130,7 +139,13 @@ export async function runNpmInstall(
   } else {
     await spawnAsync(
       'yarn',
-      commandArgs.concat(['--ignore-engines', '--cwd', destPath]),
+      commandArgs.concat([
+        '--ignore-engines',
+        '--mutex',
+        'network',
+        '--cwd',
+        destPath,
+      ]),
       destPath,
       opts
     );

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

@@ -1,15 +1,6 @@
 import FileBlob from './file-blob';
 import FileFsRef from './file-fs-ref';
 import FileRef from './file-ref';
-import {
-  File,
-  Files,
-  AnalyzeOptions,
-  BuildOptions,
-  PrepareCacheOptions,
-  ShouldServeOptions,
-  Meta,
-} from './types';
 import { Lambda, createLambda } from './lambda';
 import download, { DownloadedFiles } from './fs/download';
 import getWriteableDirectory from './fs/get-writable-directory';
@@ -25,14 +16,13 @@ import {
 } from './fs/run-user-scripts';
 import streamToBuffer from './fs/stream-to-buffer';
 import shouldServe from './should-serve';
+import { detectBuilder, detectApiBuilders } from './detect-builder';
+import { detectApiRoutes } from './detect-routes';
 
 export {
   FileBlob,
   FileFsRef,
   FileRef,
-  Files,
-  File,
-  Meta,
   Lambda,
   createLambda,
   download,
@@ -47,9 +37,10 @@ export {
   getNodeVersion,
   getSpawnOptions,
   streamToBuffer,
-  AnalyzeOptions,
-  BuildOptions,
-  PrepareCacheOptions,
-  ShouldServeOptions,
   shouldServe,
+  detectBuilder,
+  detectApiBuilders,
+  detectApiRoutes,
 };
+
+export * from './types';

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

@@ -15,8 +15,24 @@ export interface Files {
   [filePath: string]: File;
 }
 
+export interface Route {
+  src?: string;
+  dest?: string;
+  handle?: string;
+  type?: string;
+  headers?: {
+    [key: string]: string;
+  };
+}
+
 export interface Config {
-  [key: string]: string | string[] | boolean | number | undefined;
+  [key: string]:
+    | string
+    | string[]
+    | boolean
+    | number
+    | { [key: string]: string }
+    | undefined;
   maxLambdaSize?: string;
   includeFiles?: string | string[];
   bundle?: boolean;
@@ -24,10 +40,13 @@ export interface Config {
   helpers?: boolean;
   rust?: string;
   debug?: boolean;
+  zeroConfig?: boolean;
+  import?: { [key: string]: string };
 }
 
 export interface Meta {
   isDev?: boolean;
+  skipDownload?: boolean;
   requestPath?: string;
   filesChanged?: string[];
   filesRemoved?: string[];
@@ -187,3 +206,9 @@ export interface NodeVersion {
   range: string;
   runtime: string;
 }
+
+export interface Builder {
+  use: string;
+  src: string;
+  config?: Config;
+}

packages/now-build-utils/test/fixtures/15-yarn-ignore-engines/now.json

@@ -4,7 +4,7 @@
     {
       "src": "index.js",
       "use": "@now/node",
-      "config": { "maxLambdaSize": "15mb" }
+      "config": { "maxLambdaSize": "18mb" }
     }
   ],
   "probes": [{ "path": "/", "mustContain": "found:RANDOMNESS_PLACEHOLDER" }]

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

@@ -16,6 +16,12 @@ const {
   testDeployment,
 } = require('../../../test/lib/deployment/test-deployment.js');
 
+const {
+  detectBuilder,
+  detectApiBuilders,
+  detectApiRoutes,
+} = require('../dist');
+
 jest.setTimeout(4 * 60 * 1000);
 const builderUrl = '@canary';
 let buildUtilsUrl;
@@ -133,7 +139,7 @@ for (const fixture of fs.readdirSync(fixturesPath)) {
 
 // few foreign tests
 
-const buildersToTestWith = ['now-node-server', 'now-static-build'];
+const buildersToTestWith = ['now-node', 'now-static-build'];
 
 // eslint-disable-next-line no-restricted-syntax
 for (const builder of buildersToTestWith) {
@@ -158,3 +164,108 @@ for (const builder of buildersToTestWith) {
     }
   }
 }
+
+it('Test `detectBuilder`', async () => {
+  {
+    const pkg = { dependencies: { next: '1.0.0' } };
+    const { builder, warnings } = await detectBuilder(pkg);
+    expect(builder.use).toBe('@now/next');
+    expect(warnings.length).toBe(1);
+  }
+
+  {
+    const pkg = { devDependencies: { next: '1.0.0' } };
+    const { builder } = await detectBuilder(pkg);
+    expect(builder.use).toBe('@now/next');
+  }
+
+  {
+    const pkg = {};
+    const { builder } = await detectBuilder(pkg);
+    expect(builder).toBe(null);
+  }
+});
+
+it('Test `detectApiBuilders`', async () => {
+  {
+    const files = ['package.json', 'api/user.js', 'api/team.js'];
+
+    const builders = await detectApiBuilders(files);
+    expect(builders[0].use).toBe('@now/node');
+  }
+
+  {
+    const files = ['package.json', 'api/user.go', 'api/team.js'];
+
+    const builders = await detectApiBuilders(files);
+    expect(builders.some(({ use }) => use === '@now/go')).toBeTruthy();
+    expect(builders.some(({ use }) => use === '@now/node')).toBeTruthy();
+  }
+
+  {
+    const files = ['package.json'];
+
+    const builders = await detectApiBuilders(files);
+    expect(builders).toBe(null);
+  }
+
+  {
+    const files = [
+      'api/users/[id].js',
+      'api/_utils/handler.js',
+      'api/users/.helper.js',
+      'api/teams/_helper.js',
+    ];
+
+    const builders = await detectApiBuilders(files);
+    expect(builders.length).toBe(1);
+  }
+});
+
+it('Test `detectApiRoutes`', async () => {
+  {
+    const files = ['api/user.go', 'api/team.js'];
+
+    const { defaultRoutes } = await detectApiRoutes(files);
+    expect(defaultRoutes.length).toBe(2);
+  }
+
+  {
+    const files = ['api/user.go', 'api/user.js'];
+
+    const { error } = await detectApiRoutes(files);
+    expect(error.code).toBe('conflicting_file_path');
+  }
+
+  {
+    const files = ['api/[user].go', 'api/[team]/[id].js'];
+
+    const { error } = await detectApiRoutes(files);
+    expect(error.code).toBe('conflicting_file_path');
+  }
+
+  {
+    const files = ['api/[team]/[team].js'];
+
+    const { error } = await detectApiRoutes(files);
+    expect(error.code).toBe('conflicting_path_segment');
+  }
+
+  {
+    const files = ['api/[endpoint].js', 'api/[endpoint]/[id].js'];
+
+    const { defaultRoutes } = await detectApiRoutes(files);
+    expect(defaultRoutes.length).toBe(2);
+  }
+
+  {
+    const files = [
+      'api/_utils/handler.js',
+      'api/[endpoint]/.helper.js',
+      'api/[endpoint]/[id].js',
+    ];
+
+    const builders = await detectApiBuilders(files);
+    expect(builders.length).toBe(1);
+  }
+});

packages/now-go/index.ts

@@ -61,6 +61,18 @@ export async function build({
     await initPrivateGit(process.env.GIT_CREDENTIALS);
   }
 
+  if (process.env.GO111MODULE) {
+    console.log(`\nManually assigning 'GO111MODULE' is not recommended.
+
+By default:
+  - 'GO111MODULE=on' If entrypoint package name is not 'main'
+  - 'GO111MODULE=off' If entrypoint package name is 'main'
+
+We highly recommend you leverage Go Modules in your project.
+Learn more: https://github.com/golang/go/wiki/Modules
+`);
+  }
+
   console.log('Downloading user files...');
   const entrypointArr = entrypoint.split(sep);
 
@@ -108,7 +120,14 @@ Learn more: https://zeit.co/docs/v2/deployments/official-builders/go-now-go/#ent
   const parsedAnalyzed = JSON.parse(analyzed) as Analyzed;
 
   if (meta.isDev) {
-    const base = dirname(downloadedFiles['now.json'].fsPath);
+    let base = null;
+
+    if (config && config.zeroConfig) {
+      base = workPath;
+    } else {
+      base = dirname(downloadedFiles['now.json'].fsPath);
+    }
+
     const destNow = join(
       base,
       '.now',
@@ -135,7 +154,7 @@ Learn more: https://zeit.co/docs/v2/deployments/official-builders/go-now-go/#ent
       isGoModExist = true;
       isGoModInRootDir = true;
       goModPath = fileDirname;
-    } else if (file.includes('go.mod')) {
+    } else if (file.endsWith('go.mod') && !file.endsWith('vendor')) {
       if (entrypointDirname === fileDirname) {
         isGoModExist = true;
         goModPath = fileDirname;
@@ -161,6 +180,10 @@ Learn more: https://zeit.co/docs/v2/deployments/official-builders/go-now-go/#ent
     `Found exported function "${handlerFunctionName}" in "${entrypoint}"`
   );
 
+  if (!isGoModExist && 'vendor' in downloadedFiles) {
+    throw new Error('`go.mod` is required to use a `vendor` directory.');
+  }
+
   // check if package name other than main
   // using `go.mod` way building the handler
   const packageName = parsedAnalyzed.packageName;

packages/now-go/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@now/go",
-  "version": "0.5.2",
+  "version": "0.5.5",
   "license": "MIT",
+  "homepage": "https://zeit.co/docs/v2/deployments/official-builders/go-now-go",
   "repository": {
     "type": "git",
     "url": "https://github.com/zeit/now-builders.git",

packages/now-html-minifier/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@now/html-minifier",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "license": "MIT",
+  "homepage": "https://zeit.co/docs/v2/deployments/official-builders/html-minifier-now-html-minifier",
   "repository": {
     "type": "git",
     "url": "https://github.com/zeit/now-builders.git",

packages/now-md/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@now/md",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "license": "MIT",
+  "homepage": "https://zeit.co/docs/v2/deployments/official-builders/markdown-now-md",
   "repository": {
     "type": "git",
     "url": "https://github.com/zeit/now-builders.git",

packages/now-mdx-deck/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@now/mdx-deck",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "license": "MIT",
+  "homepage": "https://zeit.co/docs/v2/deployments/official-builders/mdx-deck-now-mdx-deck",
   "repository": {
     "type": "git",
     "url": "https://github.com/zeit/now-builders.git",

packages/now-next/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@now/next",
-  "version": "0.5.0",
+  "version": "0.5.4",
   "license": "MIT",
   "main": "./dist/index",
+  "homepage": "https://zeit.co/docs/v2/deployments/official-builders/next-js-now-next",
   "scripts": {
     "build": "./getBridgeTypes.sh && tsc",
     "test": "npm run build && jest",
@@ -14,7 +15,7 @@
     "directory": "packages/now-next"
   },
   "dependencies": {
-    "@now/node-bridge": "^1.2.1",
+    "@now/node-bridge": "1.2.2",
     "fs-extra": "^7.0.0",
     "get-port": "^5.0.0",
     "resolve-from": "^5.0.0",

packages/now-next/src/create-serverless-config.ts

@@ -0,0 +1,51 @@
+import path from 'path';
+import fs from 'fs-extra';
+
+function getCustomData(importName: string) {
+  return `
+module.exports = function(...args) {
+  let original = require('./${importName}');
+
+  const finalConfig = {};
+  const target = { target: 'serverless' };
+
+  if (typeof original === 'function' && original.constructor.name === 'AsyncFunction') {
+    // AsyncFunctions will become promises
+    original = original(...args);
+  }
+
+  if (original instanceof Promise) {
+    // Special case for promises, as it's currently not supported
+    // and will just error later on
+    return original
+      .then((orignalConfig) => Object.assign(finalConfig, orignalConfig))
+      .then((config) => Object.assign(config, target));
+  } else if (typeof original === 'function') {
+    Object.assign(finalConfig, original(...args));
+  } else if (typeof original === 'object') {
+    Object.assign(finalConfig, original);
+  }
+
+  Object.assign(finalConfig, target);
+
+  return finalConfig;
+}
+  `.trim();
+}
+
+function getDefaultData() {
+  return `module.exports = { target: 'serverless' };`;
+}
+
+export default async function createServerlessConfig(workPath: string) {
+  const configPath = path.join(workPath, 'next.config.js');
+  const backupConfigName = `next.config.original.${Date.now()}.js`;
+  const backupConfigPath = path.join(workPath, backupConfigName);
+
+  if (fs.existsSync(configPath)) {
+    await fs.rename(configPath, backupConfigPath);
+    await fs.writeFile(configPath, getCustomData(backupConfigName));
+  } else {
+    await fs.writeFile(configPath, getDefaultData());
+  }
+}

packages/now-next/src/index.ts

@@ -40,7 +40,9 @@ import {
   validateEntrypoint,
   normalizePage,
   getDynamicRoutes,
+  isDynamicRoute,
 } from './utils';
+import createServerlessConfig from './create-serverless-config';
 
 interface BuildParamsMeta {
   isDev: boolean | undefined;
@@ -173,23 +175,23 @@ export const build = async ({
   console.log(`${name} Downloading user files...`);
   await download(files, workPath, meta);
 
-  const nodeVersion = await getNodeVersion(entryPath);
-  const spawnOpts = getSpawnOptions(meta, nodeVersion);
-
   const pkg = await readPackageJson(entryPath);
   const nextVersion = getNextVersion(pkg);
 
+  if (!meta.isDev) {
+    await createServerlessConfig(workPath);
+  }
+
+  const nodeVersion = await getNodeVersion(entryPath);
+  const spawnOpts = getSpawnOptions(meta, nodeVersion);
+
   if (!nextVersion) {
     throw new Error(
       'No Next.js version could be detected in "package.json". Make sure `"next"` is installed in "dependencies" or "devDependencies"'
     );
   }
 
-  process.env.__NEXT_BUILDER_EXPERIMENTAL_TARGET = 'serverless';
-
   if (meta.isDev) {
-    // eslint-disable-next-line no-underscore-dangle
-    process.env.__NEXT_BUILDER_EXPERIMENTAL_DEBUG = 'true';
     let childProcess: ChildProcess | undefined;
 
     // If this is the initial build, we want to start the server
@@ -286,10 +288,9 @@ export const build = async ({
 
   console.log('running user script...');
   const memoryToConsume = Math.floor(os.totalmem() / 1024 ** 2) - 128;
-  const buildSpawnOptions = { ...spawnOpts };
-  const env = { ...buildSpawnOptions.env } as any;
+  const env = { ...spawnOpts.env } as any;
   env.NODE_OPTIONS = `--max_old_space_size=${memoryToConsume}`;
-  await runPackageJsonScript(entryPath, 'now-build', buildSpawnOptions);
+  await runPackageJsonScript(entryPath, 'now-build', { ...spawnOpts, env });
 
   if (isLegacy) {
     console.log('running npm install --production...');
@@ -388,7 +389,7 @@ export const build = async ({
             'now__launcher.js': new FileBlob({ data: launcher }),
           },
           handler: 'now__launcher.launcher',
-          runtime: 'nodejs8.10',
+          runtime: nodeVersion.runtime,
         });
         console.log(`Created lambda for page: "${page}"`);
       })
@@ -414,7 +415,7 @@ export const build = async ({
 
       const pathname = page.replace(/\.html$/, '');
 
-      if (pathname.startsWith('$') || pathname.includes('/$')) {
+      if (isDynamicRoute(pathname)) {
         dynamicPages.push(pathname);
       }
 
@@ -461,7 +462,7 @@ export const build = async ({
 
         const pathname = page.replace(/\.js$/, '');
 
-        if (pathname.startsWith('$') || pathname.includes('/$')) {
+        if (isDynamicRoute(pathname)) {
           dynamicPages.push(normalizePage(pathname));
         }
 
@@ -473,7 +474,7 @@ export const build = async ({
             'page.js': pages[page],
           },
           handler: 'now__launcher.launcher',
-          runtime: 'nodejs8.10',
+          runtime: nodeVersion.runtime,
         });
         console.log(`Created lambda for page: "${page}"`);
       })

packages/now-next/src/utils.ts

@@ -9,6 +9,14 @@ export interface EnvConfig {
   [name: string]: string | undefined;
 }
 
+// Identify /[param]/ in route string
+const TEST_DYNAMIC_ROUTE = /\/\[[^\/]+?\](?=\/|$)/;
+
+function isDynamicRoute(route: string): boolean {
+  route = route.startsWith('/') ? route : `/${route}`;
+  return TEST_DYNAMIC_ROUTE.test(route);
+}
+
 /**
  * Validate if the entrypoint is allowed to be used
  */
@@ -226,7 +234,7 @@ function getRoutes(
       continue;
     }
 
-    if (pageName.startsWith('$') || pageName.includes('/$')) {
+    if (isDynamicRoute(pageName)) {
       dynamicPages.push(normalizePage(pageName));
     }
 
@@ -351,4 +359,5 @@ export {
   stringMap,
   syncEnvVars,
   normalizePage,
+  isDynamicRoute,
 };

packages/now-next/test/integration/index.test.js

@@ -1,5 +1,6 @@
 /* global it, expect */
 const path = require('path');
+const fs = require('fs-extra');
 const runBuildLambda = require('../../../../test/lib/run-build-lambda');
 
 const FOUR_MINUTES = 240000;
@@ -10,7 +11,8 @@ it(
     const {
       buildResult: { output },
     } = await runBuildLambda(path.join(__dirname, 'standard'));
-    expect(output.index).toBeDefined();
+    expect(output['index.html']).toBeDefined();
+    expect(output.goodbye).toBeDefined();
     const filePaths = Object.keys(output);
     const serverlessError = filePaths.some(filePath => filePath.match(/_error/));
     const hasUnderScoreAppStaticFile = filePaths.some(filePath => filePath.match(/static.*\/pages\/_app\.js$/));
@@ -110,3 +112,119 @@ it(
   },
   FOUR_MINUTES,
 );
+
+it(
+  'Should build the serverless-config example',
+  async () => {
+    const {
+      workPath,
+      buildResult: { output },
+    } = await runBuildLambda(path.join(__dirname, 'serverless-config'));
+
+    expect(output.index).toBeDefined();
+    expect(output.goodbye).toBeDefined();
+    const filePaths = Object.keys(output);
+    const serverlessError = filePaths.some(filePath => filePath.match(/_error/));
+    const hasUnderScoreAppStaticFile = filePaths.some(filePath => filePath.match(/static.*\/pages\/_app\.js$/));
+    const hasUnderScoreErrorStaticFile = filePaths.some(filePath => filePath.match(/static.*\/pages\/_error\.js$/));
+    expect(hasUnderScoreAppStaticFile).toBeTruthy();
+    expect(hasUnderScoreErrorStaticFile).toBeTruthy();
+    expect(serverlessError).toBeTruthy();
+
+    const contents = await fs.readdir(workPath);
+
+    expect(contents.some(name => name === 'next.config.js')).toBeTruthy();
+    expect(
+      contents.some(name => name.includes('next.config.original.')),
+    ).toBeTruthy();
+  },
+  FOUR_MINUTES,
+);
+
+it(
+  'Should not build the serverless-config-async example',
+  async () => {
+    let error = null;
+
+    try {
+      await runBuildLambda(path.join(__dirname, 'serverless-config-async'));
+    } catch (err) {
+      error = err;
+    }
+
+    expect(error).not.toBe(null);
+  },
+  FOUR_MINUTES,
+);
+
+it(
+  'Should not build the serverless-config-promise example',
+  async () => {
+    let error = null;
+
+    try {
+      await runBuildLambda(path.join(__dirname, 'serverless-config-promise'));
+    } catch (err) {
+      error = err;
+    }
+
+    expect(error).not.toBe(null);
+  },
+  FOUR_MINUTES,
+);
+
+it(
+  'Should build the serverless-config-object example',
+  async () => {
+    const {
+      workPath,
+      buildResult: { output },
+    } = await runBuildLambda(path.join(__dirname, 'serverless-config-object'));
+
+    expect(output['index.html']).toBeDefined();
+    expect(output.goodbye).toBeDefined();
+    const filePaths = Object.keys(output);
+    const serverlessError = filePaths.some(filePath => filePath.match(/_error/));
+    const hasUnderScoreAppStaticFile = filePaths.some(filePath => filePath.match(/static.*\/pages\/_app\.js$/));
+    const hasUnderScoreErrorStaticFile = filePaths.some(filePath => filePath.match(/static.*\/pages\/_error\.js$/));
+    expect(hasUnderScoreAppStaticFile).toBeTruthy();
+    expect(hasUnderScoreErrorStaticFile).toBeTruthy();
+    expect(serverlessError).toBeTruthy();
+
+    const contents = await fs.readdir(workPath);
+
+    expect(contents.some(name => name === 'next.config.js')).toBeTruthy();
+    expect(
+      contents.some(name => name.includes('next.config.original.')),
+    ).toBeTruthy();
+  },
+  FOUR_MINUTES,
+);
+
+it(
+  'Should build the serverless-no-config example',
+  async () => {
+    const {
+      workPath,
+      buildResult: { output },
+    } = await runBuildLambda(path.join(__dirname, 'serverless-no-config'));
+
+    expect(output['index.html']).toBeDefined();
+    expect(output.goodbye).toBeDefined();
+    const filePaths = Object.keys(output);
+    const serverlessError = filePaths.some(filePath => filePath.match(/_error/));
+    const hasUnderScoreAppStaticFile = filePaths.some(filePath => filePath.match(/static.*\/pages\/_app\.js$/));
+    const hasUnderScoreErrorStaticFile = filePaths.some(filePath => filePath.match(/static.*\/pages\/_error\.js$/));
+    expect(hasUnderScoreAppStaticFile).toBeTruthy();
+    expect(hasUnderScoreErrorStaticFile).toBeTruthy();
+    expect(serverlessError).toBeTruthy();
+
+    const contents = await fs.readdir(workPath);
+
+    expect(contents.some(name => name === 'next.config.js')).toBeTruthy();
+    expect(
+      contents.some(name => name.includes('next.config.original.')),
+    ).toBeFalsy();
+  },
+  FOUR_MINUTES,
+);

packages/now-next/test/integration/serverless-config-async/next.config.js

@@ -0,0 +1,3 @@
+module.exports = async function () {
+  return {};
+};

packages/now-next/test/integration/serverless-config-async/now.json

@@ -0,0 +1,4 @@
+{
+  "version": 2,
+  "builds": [{ "src": "package.json", "use": "@now/next" }]
+}

packages/now-next/test/integration/serverless-config-async/package.json

@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+    "next": "latest",
+    "react": "latest",
+    "react-dom": "latest"
+  }
+}

packages/now-next/test/integration/serverless-config-async/pages/goodbye.js

@@ -0,0 +1,3 @@
+const F = () => 'Goodbye World!';
+F.getInitialProps = async () => ({});
+export default F;

packages/now-next/test/integration/serverless-config-async/pages/index.js

@@ -0,0 +1 @@
+export default () => 'Hello World!';

packages/now-next/test/integration/serverless-config-object/next.config.js

@@ -0,0 +1 @@
+module.exports = {};

packages/now-next/test/integration/serverless-config-object/now.json

@@ -0,0 +1,4 @@
+{
+  "version": 2,
+  "builds": [{ "src": "package.json", "use": "@now/next" }]
+}

packages/now-next/test/integration/serverless-config-object/package.json

@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+    "next": "latest",
+    "react": "latest",
+    "react-dom": "latest"
+  }
+}

packages/now-next/test/integration/serverless-config-object/pages/goodbye.js

@@ -0,0 +1,3 @@
+const F = () => 'Goodbye World!';
+F.getInitialProps = async () => ({});
+export default F;

packages/now-next/test/integration/serverless-config-object/pages/index.js

@@ -0,0 +1 @@
+export default () => 'Hello World!';

packages/now-next/test/integration/serverless-config-promise/next.config.js

@@ -0,0 +1 @@
+module.exports = new Promise(res => res({}));

packages/now-next/test/integration/serverless-config-promise/now.json

@@ -0,0 +1,4 @@
+{
+  "version": 2,
+  "builds": [{ "src": "package.json", "use": "@now/next" }]
+}

packages/now-next/test/integration/serverless-config-promise/package.json

@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+    "next": "latest",
+    "react": "latest",
+    "react-dom": "latest"
+  }
+}

packages/now-next/test/integration/serverless-config-promise/pages/goodbye.js

@@ -0,0 +1,3 @@
+const F = () => 'Goodbye World!';
+F.getInitialProps = async () => ({});
+export default F;

packages/now-next/test/integration/serverless-config-promise/pages/index.js

@@ -0,0 +1 @@
+export default () => 'Hello World!';

packages/now-next/test/integration/serverless-config/next.config.js

@@ -0,0 +1 @@
+module.exports = () => ({});

packages/now-next/test/integration/serverless-config/now.json

@@ -0,0 +1,4 @@
+{
+  "version": 2,
+  "builds": [{ "src": "package.json", "use": "@now/next" }]
+}

packages/now-next/test/integration/serverless-config/package.json

@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+    "next": "8.1.0",
+    "react": "latest",
+    "react-dom": "latest"
+  }
+}

packages/now-next/test/integration/serverless-config/pages/goodbye.js

@@ -0,0 +1,3 @@
+const F = () => 'Goodbye World!';
+F.getInitialProps = async () => ({});
+export default F;

packages/now-next/test/integration/serverless-config/pages/index.js

@@ -0,0 +1 @@
+export default () => 'Hello World!';

packages/now-next/test/integration/serverless-no-config/now.json

@@ -0,0 +1,4 @@
+{
+  "version": 2,
+  "builds": [{ "src": "package.json", "use": "@now/next", "config": { "zeroConfig": true } }]
+}

packages/now-next/test/integration/serverless-no-config/package.json

@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+    "next": "latest",
+    "react": "latest",
+    "react-dom": "latest"
+  }
+}

packages/now-next/test/integration/serverless-no-config/pages/goodbye.js

@@ -0,0 +1,3 @@
+const F = () => 'Goodbye World!';
+F.getInitialProps = async () => ({});
+export default F;

packages/now-next/test/integration/serverless-no-config/pages/index.js

@@ -0,0 +1 @@
+export default () => 'Hello World!';

packages/now-next/test/integration/standard/next.config.js

@@ -1,3 +0,0 @@
-module.exports = {
-  target: 'serverless',
-};

packages/now-next/test/integration/standard/now.json

@@ -1,4 +1,4 @@
 {
   "version": 2,
-  "builds": [{ "src": "next.config.js", "use": "@now/next" }]
+  "builds": [{ "src": "package.json", "use": "@now/next" }]
 }

packages/now-next/test/integration/standard/pages/goodbye.js

@@ -0,0 +1,3 @@
+const F = () => 'Goodbye World!';
+F.getInitialProps = () => ({});
+export default F;

packages/now-node-bridge/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/node-bridge",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "license": "MIT",
   "main": "./index.js",
   "repository": {

packages/now-node-bridge/src/bridge.ts

@@ -27,6 +27,16 @@ export interface NowProxyResponse {
   encoding: string;
 }
 
+interface ServerLike {
+  listen: (
+    opts: {
+      host?: string;
+      port?: number;
+    },
+    callback: (this: Server | null) => void
+  ) => Server | void;
+}
+
 /**
  * If the `http.Server` handler function throws an error asynchronously,
  * then it ends up being an unhandled rejection which doesn't kill the node
@@ -92,14 +102,14 @@ function normalizeEvent(
 }
 
 export class Bridge {
-  private server: Server | null;
+  private server: ServerLike | null;
   private listening: Promise<AddressInfo>;
   private resolveListening: (info: AddressInfo) => void;
   private events: { [key: string]: NowProxyRequest } = {};
   private reqIdSeed: number = 1;
   private shouldStoreEvents: boolean = false;
 
-  constructor(server?: Server, shouldStoreEvents: boolean = false) {
+  constructor(server?: ServerLike, shouldStoreEvents: boolean = false) {
     this.server = null;
     this.shouldStoreEvents = shouldStoreEvents;
     if (server) {
@@ -116,18 +126,8 @@ export class Bridge {
     });
   }
 
-  setServer(server: Server) {
+  setServer(server: ServerLike) {
     this.server = server;
-    server.once('listening', () => {
-      const addr = server.address();
-      if (typeof addr === 'string') {
-        throw new Error(`Unexpected string for \`server.address()\`: ${addr}`);
-      } else if (!addr) {
-        throw new Error('`server.address()` returned `null`');
-      } else {
-        this.resolveListening(addr);
-      }
-    });
   }
 
   listen() {
@@ -135,10 +135,35 @@ export class Bridge {
       throw new Error('Server has not been set!');
     }
 
-    return this.server.listen({
-      host: '127.0.0.1',
-      port: 0,
-    });
+    const resolveListening = this.resolveListening;
+
+    return this.server.listen(
+      {
+        host: '127.0.0.1',
+        port: 0,
+      },
+      function listeningCallback() {
+        if (!this || typeof this.address !== 'function') {
+          throw new Error(
+            'Missing server.address() function on `this` in server.listen()'
+          );
+        }
+
+        const addr = this.address();
+
+        if (!addr) {
+          throw new Error('`server.address()` returned `null`');
+        }
+
+        if (typeof addr === 'string') {
+          throw new Error(
+            `Unexpected string for \`server.address()\`: ${addr}`
+          );
+        }
+
+        resolveListening(addr);
+      }
+    );
   }
 
   async launcher(

packages/now-node-server/index.js

@@ -157,10 +157,13 @@ exports.build = async ({
     'bridge.js': new FileFsRef({ fsPath: require('@now/node-bridge') }),
   };
 
+  // Use the system-installed version of `node` when running via `now dev`
+  const runtime = meta.isDev ? 'nodejs' : nodeVersion.runtime;
+
   const lambda = await createLambda({
     files: { ...preparedFiles, ...launcherFiles },
     handler: 'launcher.launcher',
-    runtime: nodeVersion.runtime,
+    runtime,
   });
 
   return { [entrypoint]: lambda };

packages/now-node-server/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@now/node-server",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "license": "MIT",
+  "homepage": "https://zeit.co/docs/v2/deployments/official-builders/node-js-server-now-node-server",
   "repository": {
     "type": "git",
     "url": "https://github.com/zeit/now-builders.git",
     "directory": "packages/now-node-server"
   },
   "dependencies": {
-    "@now/node-bridge": "^1.2.1",
+    "@now/node-bridge": "1.2.2",
     "@zeit/ncc": "0.18.5",
     "fs-extra": "7.0.1"
   },

packages/now-node/bench/.gitignore

@@ -0,0 +1 @@
+lambda

packages/now-node/bench/entrypoint-express.js

@@ -0,0 +1,19 @@
+const express = require('express');
+
+const app = express();
+
+module.exports = app;
+
+app.use(express.json());
+
+app.post('*', (req, res) => {
+  if (req.body == null) {
+    return res.status(400).send({ error: 'no JSON object in the request' });
+  }
+
+  return res.status(200).send(JSON.stringify(req.body, null, 4));
+});
+
+app.all('*', (req, res) => {
+  res.status(405).send({ error: 'only POST requests are accepted' });
+});

packages/now-node/bench/entrypoint-helpers.js

@@ -0,0 +1,7 @@
+module.exports = (req, res) => {
+  if (req.body == null) {
+    return res.status(400).send({ error: 'no JSON object in the request' });
+  }
+
+  return res.status(200).send(JSON.stringify(req.body, null, 4));
+};

packages/now-node/bench/entrypoint-load-helpers.js

@@ -0,0 +1,9 @@
+function doNothing() {}
+
+module.exports = (req, res) => {
+  doNothing(req.query.who);
+  doNothing(req.body);
+  doNothing(req.cookies);
+
+  res.end('hello');
+};

packages/now-node/bench/entrypoint-notload-helpers.js

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

packages/now-node/bench/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "bench",
+  "version": "1.0.0",
+  "main": "index.js",
+  "license": "MIT",
+  "dependencies": {
+    "express": "4.17.1",
+    "fs-extra": "8.0.1"
+  }
+}

packages/now-node/bench/run.js

@@ -0,0 +1,91 @@
+const fs = require('fs-extra');
+const { join } = require('path');
+const { makeLauncher } = require('../dist/launcher');
+
+const setupFiles = async (entrypoint, shouldAddHelpers) => {
+  await fs.remove(join(__dirname, 'lambda'));
+  await fs.ensureDir(join(__dirname, 'lambda'));
+
+  await fs.copyFile(
+    join(__dirname, '../dist/helpers.js'),
+    join(__dirname, 'lambda/helpers.js'),
+  );
+  await fs.copyFile(
+    require.resolve('@now/node-bridge/bridge'),
+    join(__dirname, 'lambda/bridge.js'),
+  );
+  await fs.copyFile(
+    join(process.cwd(), entrypoint),
+    join(__dirname, 'lambda/entrypoint.js'),
+  );
+
+  let launcher = makeLauncher('./entrypoint', shouldAddHelpers);
+  launcher += '\nexports.bridge=bridge';
+
+  await fs.writeFile(join(__dirname, 'lambda/launcher.js'), launcher);
+};
+
+const createBigJSONObj = () => {
+  const obj = {};
+  for (let i = 0; i < 1000; i += 1) {
+    obj[`idx${i}`] = `val${i}`;
+  }
+};
+
+const createEvent = () => ({
+  Action: 'Invoke',
+  body: JSON.stringify({
+    method: 'POST',
+    path: '/',
+    headers: { 'content-type': 'application/json' },
+    encoding: undefined,
+    body: createBigJSONObj(),
+  }),
+});
+
+const runTests = async (entrypoint, shouldAddHelpers = true, nb) => {
+  console.log(
+    `setting up files with entrypoint ${entrypoint} and ${
+      shouldAddHelpers ? 'helpers' : 'no helpers'
+    }`,
+  );
+  await setupFiles(entrypoint, shouldAddHelpers);
+
+  console.log('importing launcher');
+  const launcher = require('./lambda/launcher');
+
+  const event = createEvent();
+  const context = {};
+
+  const start = process.hrtime();
+
+  console.log(`throwing ${nb} events at lambda`);
+  for (let i = 0; i < nb; i += 1) {
+    // eslint-disable-next-line
+    await launcher.launcher(event, context);
+  }
+  const timer = process.hrtime(start);
+  const ms = (timer[0] * 1e9 + timer[1]) / 1e6;
+
+  await launcher.bridge.server.close();
+  delete require.cache[require.resolve('./lambda/launcher')];
+
+  console.log({ nb, sum: ms, avg: ms / nb });
+};
+
+const main = async () => {
+  if (process.argv.length !== 5) {
+    console.log(
+      'usage : node run.js <entrypoint-file> <add-helpers> <nb-of-request>',
+    );
+    return;
+  }
+
+  const [, , entrypoint, helpers, nbRequests] = process.argv;
+  const shouldAddHelpers = helpers !== 'false' && helpers !== 'no';
+  const nb = Number(nbRequests);
+
+  await runTests(entrypoint, shouldAddHelpers, nb);
+};
+
+main();

packages/now-node/bench/yarn.lock

@@ -0,0 +1,378 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+accepts@~1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+  dependencies:
+    mime-types "~2.1.24"
+    negotiator "0.6.2"
+
+array-flatten@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+
+body-parser@1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
+  dependencies:
+    bytes "3.1.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    on-finished "~2.3.0"
+    qs "6.7.0"
+    raw-body "2.4.0"
+    type-is "~1.6.17"
+
+bytes@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
+
+content-disposition@0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+  dependencies:
+    safe-buffer "5.1.2"
+
+content-type@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
+
+cookie-signature@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+
+cookie@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+
+debug@2.6.9:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+
+destroy@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+
+encodeurl@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+
+escape-html@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+
+etag@~1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+
+express@4.17.1:
+  version "4.17.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
+  dependencies:
+    accepts "~1.3.7"
+    array-flatten "1.1.1"
+    body-parser "1.19.0"
+    content-disposition "0.5.3"
+    content-type "~1.0.4"
+    cookie "0.4.0"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "~1.1.2"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.5"
+    qs "6.7.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.1.2"
+    send "0.17.1"
+    serve-static "1.14.1"
+    setprototypeof "1.1.1"
+    statuses "~1.5.0"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
+finalhandler@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
+    unpipe "~1.0.0"
+
+forwarded@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
+
+fresh@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+
+fs-extra@8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.0.1.tgz#90294081f978b1f182f347a440a209154344285b"
+  integrity sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+  version "4.1.15"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
+
+http-errors@1.7.2, http-errors@~1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
+iconv-lite@0.4.24:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
+ipaddr.js@1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
+  integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
+
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+media-typer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+
+merge-descriptors@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+
+methods@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+
+mime-db@1.40.0:
+  version "1.40.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
+  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
+
+mime-types@~2.1.24:
+  version "2.1.24"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
+  integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
+  dependencies:
+    mime-db "1.40.0"
+
+mime@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+ms@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
+negotiator@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+  dependencies:
+    ee-first "1.1.1"
+
+parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+
+proxy-addr@~2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
+  integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==
+  dependencies:
+    forwarded "~0.1.2"
+    ipaddr.js "1.9.0"
+
+qs@6.7.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
+
+range-parser@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
+raw-body@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
+  dependencies:
+    bytes "3.1.0"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
+safe-buffer@5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+"safer-buffer@>= 2.1.2 < 3":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+send@0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.7.2"
+    mime "1.6.0"
+    ms "2.1.1"
+    on-finished "~2.3.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
+
+serve-static@1.14.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.17.1"
+
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+
+"statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+
+type-is@~1.6.17, type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.24"
+
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
+unpipe@1.0.0, unpipe@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+
+vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=

packages/now-node/build.sh

@@ -13,12 +13,17 @@ cp -v "$bridge_defs" src
 # build ts files
 tsc
 
+# todo: improve
+# copy type file for ts test
+cp dist/types.d.ts test/fixtures/15-helpers/ts/types.d.ts
+
+# use types.d.ts as the main types export
+mv dist/types.d.ts dist/types
+rm dist/*.d.ts
+mv dist/types dist/index.d.ts
+
 # bundle helpers.ts with ncc
 rm dist/helpers.js
 ncc build src/helpers.ts -o dist/helpers
 mv dist/helpers/index.js dist/helpers.js
 rm -rf dist/helpers
-
-# todo: improve
-# copy type file for ts test
-cp dist/types.d.ts test/fixtures/15-helpers/ts/types.d.ts

packages/now-node/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@now/node",
-  "version": "0.10.0",
+  "version": "0.11.1",
   "license": "MIT",
   "main": "./dist/index",
+  "homepage": "https://zeit.co/docs/v2/deployments/official-builders/node-js-now-node",
   "repository": {
     "type": "git",
     "url": "https://github.com/zeit/now-builders.git",
     "directory": "packages/now-node"
   },
   "dependencies": {
-    "@now/node-bridge": "^1.2.1",
+    "@now/node-bridge": "1.2.2",
     "@types/node": "*",
     "@zeit/ncc": "0.18.5",
-    "@zeit/ncc-watcher": "1.0.3",
-    "fs-extra": "7.0.1"
+    "@zeit/ncc-watcher": "1.0.3"
   },
   "scripts": {
     "build": "./build.sh",
@@ -26,9 +26,11 @@
   "devDependencies": {
     "@types/content-type": "1.1.3",
     "@types/cookie": "0.3.3",
+    "@types/etag": "1.8.0",
     "@types/test-listen": "1.1.0",
     "content-type": "1.0.4",
     "cookie": "0.4.0",
+    "etag": "1.8.1",
     "node-fetch": "2.6.0",
     "test-listen": "1.1.0",
     "typescript": "3.5.2"

packages/now-node/src/helpers.ts

@@ -5,7 +5,6 @@ import {
   NowRequestQuery,
   NowRequestBody,
 } from './types';
-import { Stream } from 'stream';
 import { Server } from 'http';
 import { Bridge } from './bridge';
 
@@ -73,56 +72,127 @@ function getCookieParser(req: NowRequest) {
   };
 }
 
-function sendStatusCode(res: NowResponse, statusCode: number): NowResponse {
+function status(res: NowResponse, statusCode: number): NowResponse {
   res.statusCode = statusCode;
   return res;
 }
 
-function sendData(res: NowResponse, body: any): NowResponse {
-  if (body === null) {
+function setCharset(type: string, charset: string) {
+  const { parse, format } = require('content-type');
+  const parsed = parse(type);
+  parsed.parameters.charset = charset;
+  return format(parsed);
+}
+
+function createETag(body: any, encoding: string | undefined) {
+  const etag = require('etag');
+  const buf = !Buffer.isBuffer(body) ? Buffer.from(body, encoding) : body;
+  return etag(buf, { weak: true });
+}
+
+function send(req: NowRequest, res: NowResponse, body: any): NowResponse {
+  let chunk: unknown = body;
+  let encoding: string | undefined;
+
+  switch (typeof chunk) {
+    // string defaulting to html
+    case 'string':
+      if (!res.getHeader('content-type')) {
+        res.setHeader('content-type', 'text/html');
+      }
+      break;
+    case 'boolean':
+    case 'number':
+    case 'object':
+      if (chunk === null) {
+        chunk = '';
+      } else if (Buffer.isBuffer(chunk)) {
+        if (!res.getHeader('content-type')) {
+          res.setHeader('content-type', 'application/octet-stream');
+        }
+      } else {
+        return json(req, res, chunk);
+      }
+      break;
+  }
+
+  // write strings in utf-8
+  if (typeof chunk === 'string') {
+    encoding = 'utf8';
+
+    // reflect this in content-type
+    const type = res.getHeader('content-type');
+    if (typeof type === 'string') {
+      res.setHeader('content-type', setCharset(type, 'utf-8'));
+    }
+  }
+
+  // populate Content-Length
+  let len: number | undefined;
+  if (chunk !== undefined) {
+    if (Buffer.isBuffer(chunk)) {
+      // get length of Buffer
+      len = chunk.length;
+    } else if (typeof chunk === 'string') {
+      if (chunk.length < 1000) {
+        // just calculate length small chunk
+        len = Buffer.byteLength(chunk, encoding);
+      } else {
+        // convert chunk to Buffer and calculate
+        const buf = Buffer.from(chunk, encoding);
+        len = buf.length;
+        chunk = buf;
+        encoding = undefined;
+      }
+    } else {
+      throw new Error(
+        '`body` is not a valid string, object, boolean, number, Stream, or Buffer'
+      );
+    }
+
+    if (len !== undefined) {
+      res.setHeader('content-length', len);
+    }
+  }
+
+  // populate ETag
+  let etag: string | undefined;
+  if (
+    !res.getHeader('etag') &&
+    len !== undefined &&
+    (etag = createETag(chunk, encoding))
+  ) {
+    res.setHeader('etag', etag);
+  }
+
+  // strip irrelevant headers
+  if (204 === res.statusCode || 304 === res.statusCode) {
+    res.removeHeader('Content-Type');
+    res.removeHeader('Content-Length');
+    res.removeHeader('Transfer-Encoding');
+    chunk = '';
+  }
+
+  if (req.method === 'HEAD') {
+    // skip body for HEAD
     res.end();
-    return res;
+  } else {
+    // respond
+    res.end(chunk, encoding);
   }
 
-  const contentType = res.getHeader('Content-Type');
-
-  if (Buffer.isBuffer(body)) {
-    if (!contentType) {
-      res.setHeader('Content-Type', 'application/octet-stream');
-    }
-    res.setHeader('Content-Length', body.length);
-    res.end(body);
-    return res;
-  }
-
-  if (body instanceof Stream) {
-    if (!contentType) {
-      res.setHeader('Content-Type', 'application/octet-stream');
-    }
-    body.pipe(res);
-    return res;
-  }
-
-  let str = body;
-
-  // Stringify JSON body
-  if (typeof body === 'object' || typeof body === 'number') {
-    str = JSON.stringify(body);
-    res.setHeader('Content-Type', 'application/json; charset=utf-8');
-  }
-
-  res.setHeader('Content-Length', Buffer.byteLength(str));
-  res.end(str);
-
   return res;
 }
 
-function sendJson(res: NowResponse, jsonBody: any): NowResponse {
-  // Set header to application/json
-  res.setHeader('Content-Type', 'application/json; charset=utf-8');
+function json(req: NowRequest, res: NowResponse, jsonBody: any): NowResponse {
+  const body = JSON.stringify(jsonBody);
 
-  // Use send to handle request
-  return res.send(jsonBody);
+  // content-type
+  if (!res.getHeader('content-type')) {
+    res.setHeader('content-type', 'application/json; charset=utf-8');
+  }
+
+  return send(req, res, body);
 }
 
 export class ApiError extends Error {
@@ -186,9 +256,9 @@ export function createServerWithHelpers(
       setLazyProp<NowRequestQuery>(req, 'query', getQueryParser(req));
       setLazyProp<NowRequestBody>(req, 'body', getBodyParser(req, event.body));
 
-      res.status = statusCode => sendStatusCode(res, statusCode);
-      res.send = data => sendData(res, data);
-      res.json = data => sendJson(res, data);
+      res.status = statusCode => status(res, statusCode);
+      res.send = body => send(req, res, body);
+      res.json = jsonBody => json(req, res, jsonBody);
 
       await listener(req, res);
     } catch (err) {

packages/now-node/src/index.ts

@@ -1,4 +1,3 @@
-import { readFile } from 'fs-extra';
 import { Assets, NccOptions } from '@zeit/ncc';
 import { join, dirname, relative, sep } from 'path';
 import { NccWatcher, WatcherResult } from '@zeit/ncc-watcher';
@@ -19,6 +18,7 @@ import {
   shouldServe,
 } from '@now/build-utils';
 export { NowRequest, NowResponse } from './types';
+import { makeLauncher } from './launcher';
 
 interface CompilerConfig {
   includeFiles?: string | string[];
@@ -33,6 +33,10 @@ interface DownloadOptions {
 
 const watchers: Map<string, NccWatcher> = new Map();
 
+const LAUNCHER_FILENAME = '___now_launcher';
+const BRIDGE_FILENAME = '___now_bridge';
+const HELPERS_FILENAME = '___now_helpers';
+
 function getWatcher(entrypoint: string, options: NccOptions): NccWatcher {
   let watcher = watchers.get(entrypoint);
   if (!watcher) {
@@ -101,7 +105,8 @@ async function compile(
     assets = result.assets;
     watch = [...result.files, ...result.dirs, ...result.missing]
       .filter(f => f.startsWith(workPath))
-      .map(f => relative(workPath, f));
+      .map(f => relative(workPath, f))
+      .concat(Object.keys(assets || {}));
   } else {
     const ncc = require('@zeit/ncc');
     const result = await ncc(input, {
@@ -202,44 +207,37 @@ export async function build({
     config,
     meta
   );
-  const launcherPath = join(__dirname, 'launcher.js');
-  let launcherData = await readFile(launcherPath, 'utf8');
-
-  launcherData = launcherData.replace(
-    '// PLACEHOLDER:shouldStoreProxyRequests',
-    shouldAddHelpers ? 'shouldStoreProxyRequests = true;' : ''
-  );
-
-  launcherData = launcherData.replace(
-    '// PLACEHOLDER:setServer',
-    [
-      `let listener = require("./${entrypoint}");`,
-      'if (listener.default) listener = listener.default;',
-      shouldAddHelpers
-        ? 'const server = require("./helpers").createServerWithHelpers(listener, bridge);'
-        : 'const server = require("http").createServer(listener);',
-      'bridge.setServer(server);',
-    ].join(' ')
-  );
 
   const launcherFiles: Files = {
-    'launcher.js': new FileBlob({ data: launcherData }),
-    'bridge.js': new FileFsRef({ fsPath: require('@now/node-bridge') }),
+    [`${LAUNCHER_FILENAME}.js`]: new FileBlob({
+      data: makeLauncher({
+        entrypointPath: `./${entrypoint}`,
+        bridgePath: `./${BRIDGE_FILENAME}`,
+        helpersPath: `./${HELPERS_FILENAME}`,
+        shouldAddHelpers,
+      }),
+    }),
+    [`${BRIDGE_FILENAME}.js`]: new FileFsRef({
+      fsPath: require('@now/node-bridge'),
+    }),
   };
 
   if (shouldAddHelpers) {
-    launcherFiles['helpers.js'] = new FileFsRef({
+    launcherFiles[`${HELPERS_FILENAME}.js`] = new FileFsRef({
       fsPath: join(__dirname, 'helpers.js'),
     });
   }
 
+  // Use the system-installed version of `node` when running via `now dev`
+  const runtime = meta.isDev ? 'nodejs' : nodeVersion.runtime;
+
   const lambda = await createLambda({
     files: {
       ...preparedFiles,
       ...launcherFiles,
     },
-    handler: 'launcher.launcher',
-    runtime: nodeVersion.runtime,
+    handler: `${LAUNCHER_FILENAME}.launcher`,
+    runtime,
   });
 
   const output = { [entrypoint]: lambda };

packages/now-node/src/launcher.ts

@@ -1,9 +1,29 @@
-import { Bridge } from './bridge';
+type LauncherConfiguration = {
+  entrypointPath: string;
+  bridgePath: string;
+  helpersPath: string;
+  shouldAddHelpers?: boolean;
+};
 
-let shouldStoreProxyRequests: boolean = false;
-// PLACEHOLDER:shouldStoreProxyRequests
+export function makeLauncher({
+  entrypointPath,
+  bridgePath,
+  helpersPath,
+  shouldAddHelpers = false,
+}: LauncherConfiguration): string {
+  return `const { Bridge } = require("${bridgePath}");
+const { Server } = require("http");
 
-const bridge = new Bridge(undefined, shouldStoreProxyRequests);
+let isServerListening = false;
+let bridge = new Bridge();
+const saveListen = Server.prototype.listen;
+Server.prototype.listen = function listen() {
+  isServerListening = true;
+  console.log('Legacy server listening...');
+  bridge.setServer(this);
+  Server.prototype.listen = saveListen;
+  return bridge.listen();
+};
 
 if (!process.env.NODE_ENV) {
   process.env.NODE_ENV =
@@ -11,13 +31,43 @@ if (!process.env.NODE_ENV) {
 }
 
 try {
-  // PLACEHOLDER:setServer
+  let listener = require("${entrypointPath}");
+  if (listener.default) listener = listener.default;
+
+  if (typeof listener.listen === 'function') {
+    Server.prototype.listen = saveListen;
+    const server = listener;
+    bridge.setServer(server);
+    bridge.listen();
+  } else if (typeof listener === 'function') {
+    Server.prototype.listen = saveListen;
+    let server;
+    ${
+      shouldAddHelpers
+        ? [
+            'bridge = new Bridge(undefined, true);',
+            `server = require("${helpersPath}").createServerWithHelpers(listener, bridge);`,
+          ].join('\n')
+        : ['server = require("http").createServer(listener);'].join('\n')
+    }
+    bridge.setServer(server);
+    bridge.listen();
+  } else if (typeof listener === 'object' && Object.keys(listener).length === 0) {
+    setTimeout(() => {
+      if (!isServerListening) {
+        console.error('No exports found in module "${entrypointPath}".');
+        console.error('Did you forget to export a function or a server?');
+        process.exit(1);
+      }
+    }, 5000);
+  } else {
+    console.error('Invalid export found in module "${entrypointPath}".');
+    console.error('The default export must be a function or server.');
+  }
 } catch (err) {
   if (err.code === 'MODULE_NOT_FOUND') {
     console.error(err.message);
-    console.error(
-      'Did you forget to add it to "dependencies" in `package.json`?'
-    );
+    console.error('Did you forget to add it to "dependencies" in \`package.json\`?');
     process.exit(1);
   } else {
     console.error(err);
@@ -25,6 +75,5 @@ try {
   }
 }
 
-bridge.listen();
-
-exports.launcher = bridge.launcher;
+exports.launcher = bridge.launcher;`;
+}

packages/now-node/src/types.ts

@@ -12,6 +12,6 @@ export type NowRequest = IncomingMessage & {
 
 export type NowResponse = ServerResponse & {
   send: (body: any) => NowResponse;
-  json: (body: any) => NowResponse;
+  json: (jsonBody: any) => NowResponse;
   status: (statusCode: number) => NowResponse;
 };

packages/now-node/test/fixtures/02-node-server/hapi-async/index.js

@@ -0,0 +1,25 @@
+const Hapi = require('@hapi/hapi');
+
+const init = async () => {
+  const server = Hapi.server({
+    port: 3000,
+    host: 'localhost',
+  });
+
+  server.route({
+    method: 'GET',
+    path: '/{p*}',
+    handler: () => 'hapi-async:RANDOMNESS_PLACEHOLDER',
+  });
+
+  await server.start();
+  console.log('Hapi server running on %s', server.info.uri);
+};
+
+process.on('unhandledRejection', (err) => {
+  console.log('Hapi failed in an unexpected way');
+  console.log(err);
+  process.exit(1);
+});
+
+init();

packages/now-node/test/fixtures/02-node-server/hapi-async/package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "@hapi/hapi": "18.3.1"
+  }
+}

packages/now-node/test/fixtures/02-node-server/index.js

@@ -0,0 +1,7 @@
+const http = require('http');
+
+const server = http.createServer((req, resp) => {
+  resp.end('root:RANDOMNESS_PLACEHOLDER');
+});
+
+server.listen();

packages/now-node/test/fixtures/02-node-server/now.json

@@ -0,0 +1,15 @@
+{
+  "version": 2,
+  "builds": [{ "src": "**/*.js", "use": "@now/node" }],
+  "probes": [
+    { "path": "/", "mustContain": "root:RANDOMNESS_PLACEHOLDER" },
+    {
+      "path": "/subdirectory/",
+      "mustContain": "subdir:RANDOMNESS_PLACEHOLDER"
+    },
+    {
+      "path": "/hapi-async/",
+      "mustContain": "hapi-async:RANDOMNESS_PLACEHOLDER"
+    }
+  ]
+}

packages/now-node/test/fixtures/02-node-server/subdirectory/index.js

@@ -0,0 +1,7 @@
+const http = require('http');
+
+const server = http.createServer((req, resp) => {
+  resp.end('subdir:RANDOMNESS_PLACEHOLDER');
+});
+
+server.listen();

packages/now-node/test/fixtures/15-helpers/express-compat/index.js

@@ -1,20 +0,0 @@
-/* eslint-disable prefer-destructuring */
-const express = require('express');
-
-const app = express();
-
-module.exports = app;
-
-app.use(express.json());
-
-app.all('*', (req, res) => {
-  res.status(200);
-
-  let who = 'anonymous';
-
-  if (req.body && req.body.who) {
-    who = req.body.who;
-  }
-
-  res.send(`hello ${who}:RANDOMNESS_PLACEHOLDER`);
-});

packages/now-node/test/fixtures/15-helpers/now.json

@@ -3,7 +3,6 @@
   "builds": [
     { "src": "index.js", "use": "@now/node" },
     { "src": "ts/index.ts", "use": "@now/node" },
-    { "src": "express-compat/index.js", "use": "@now/node" },
     { "src": "micro-compat/index.js", "use": "@now/node" },
     {
       "src": "no-helpers/index.js",
@@ -35,12 +34,6 @@
       "path": "/ts",
       "mustContain": "hello:RANDOMNESS_PLACEHOLDER"
     },
-    {
-      "path": "/express-compat",
-      "method": "POST",
-      "body": { "who": "sara" },
-      "mustContain": "hello sara:RANDOMNESS_PLACEHOLDER"
-    },
     {
       "path": "/micro-compat",
       "method": "POST",

packages/now-node/test/fixtures/16-servers/express/index.js

@@ -0,0 +1,9 @@
+const express = require('express');
+
+const app = express();
+
+app.all('*', (req, res) => {
+  res.send('hello from express:RANDOMNESS_PLACEHOLDER');
+});
+
+module.exports = app;

packages/now-node/test/fixtures/16-servers/hapi/index.js

@@ -0,0 +1,17 @@
+const Hapi = require('@hapi/hapi');
+
+const server = Hapi.server({
+  port: 3000,
+  host: 'localhost',
+});
+
+server.route({
+  method: 'GET',
+  path: '/{p*}',
+  handler: () => 'hello from hapi:RANDOMNESS_PLACEHOLDER',
+});
+
+// server.listener is a node's http.Server
+// server does not have the `listen` method so we need to export this instead
+
+module.exports = server.listener;

packages/now-node/test/fixtures/16-servers/hapi/package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "@hapi/hapi": "18.3.1"
+  }
+}

packages/now-node/test/fixtures/16-servers/index.js

@@ -0,0 +1,7 @@
+const http = require('http');
+
+const server = http.createServer((req, res) => {
+  res.end('hello:RANDOMNESS_PLACEHOLDER');
+});
+
+module.exports = server;

packages/now-node/test/fixtures/16-servers/koa/index.js

@@ -0,0 +1,9 @@
+const Koa = require('koa');
+
+const app = new Koa();
+
+app.use(async (ctx) => {
+  ctx.body = 'hello from koa:RANDOMNESS_PLACEHOLDER';
+});
+
+module.exports = app;

packages/now-node/test/fixtures/16-servers/koa/package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "koa": "2.7.0"
+  }
+}

packages/now-node/test/fixtures/16-servers/now.json

@@ -0,0 +1,22 @@
+{
+  "version": 2,
+  "builds": [{ "src": "**/*.js", "use": "@now/node" }],
+  "probes": [
+    {
+      "path": "/",
+      "mustContain": "hello:RANDOMNESS_PLACEHOLDER"
+    },
+    {
+      "path": "/express",
+      "mustContain": "hello from express:RANDOMNESS_PLACEHOLDER"
+    },
+    {
+      "path": "/koa",
+      "mustContain": "hello from koa:RANDOMNESS_PLACEHOLDER"
+    },
+    {
+      "path": "/hapi",
+      "mustContain": "hello from hapi:RANDOMNESS_PLACEHOLDER"
+    }
+  ]
+}

packages/now-node/test/fixtures/17-entrypoint-name-conflict/bridge.js

@@ -0,0 +1,3 @@
+module.exports = (req, res) => {
+  res.end('bridge:RANDOMNESS_PLACEHOLDER');
+};

packages/now-node/test/fixtures/17-entrypoint-name-conflict/helpers.js

@@ -0,0 +1,3 @@
+module.exports = (req, res) => {
+  res.end('helpers:RANDOMNESS_PLACEHOLDER');
+};

packages/now-node/test/fixtures/17-entrypoint-name-conflict/launcher.js

@@ -0,0 +1,3 @@
+module.exports = (req, res) => {
+  res.end('launcher:RANDOMNESS_PLACEHOLDER');
+};

packages/now-node/test/fixtures/17-entrypoint-name-conflict/now.json

@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "builds": [{ "src": "*.js", "use": "@now/node" }],
+  "probes": [
+    {
+      "path": "/helpers.js",
+      "mustContain": "helpers:RANDOMNESS_PLACEHOLDER"
+    },
+    {
+      "path": "/bridge.js",
+      "mustContain": "bridge:RANDOMNESS_PLACEHOLDER"
+    },
+    {
+      "path": "/launcher.js",
+      "mustContain": "launcher:RANDOMNESS_PLACEHOLDER"
+    }
+  ]
+}

packages/now-optipng/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@now/optipng",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "license": "MIT",
   "main": "./dist/index",
+  "homepage": "https://zeit.co/docs/v2/deployments/official-builders/optipng-now-optipng",
   "files": [
     "dist"
   ],

packages/now-php/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@now/php",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "license": "MIT",
+  "homepage": "https://zeit.co/docs/v2/deployments/official-builders/php-now-php",
   "repository": {
     "type": "git",
     "url": "https://github.com/zeit/now-builders.git",

packages/now-python/now_init.py

@@ -2,11 +2,11 @@ from http.server import BaseHTTPRequestHandler
 
 import base64
 import json
+import inspect
 
 import __NOW_HANDLER_FILENAME
 __now_variables = dir(__NOW_HANDLER_FILENAME)
 
-
 if 'handler' in __now_variables or 'Handler' in __now_variables:
     base = __NOW_HANDLER_FILENAME.handler if ('handler' in __now_variables) else  __NOW_HANDLER_FILENAME.Handler
     if not issubclass(base, BaseHTTPRequestHandler):
@@ -47,76 +47,202 @@ if 'handler' in __now_variables or 'Handler' in __now_variables:
             'body': res.text,
         }
 elif 'app' in __now_variables:
-    print('using Web Server Gateway Interface (WSGI)')
-    import sys
-    from urllib.parse import urlparse, unquote
-    from werkzeug._compat import BytesIO
-    from werkzeug._compat import string_types
-    from werkzeug._compat import to_bytes
-    from werkzeug._compat import wsgi_encoding_dance
-    from werkzeug.datastructures import Headers
-    from werkzeug.wrappers import Response
-    def now_handler(event, context):
-        payload = json.loads(event['body'])
+    if not inspect.iscoroutinefunction(__NOW_HANDLER_FILENAME.app.__call__):
+        print('using Web Server Gateway Interface (WSGI)')
+        import sys
+        from urllib.parse import urlparse, unquote
+        from werkzeug._compat import BytesIO
+        from werkzeug._compat import string_types
+        from werkzeug._compat import to_bytes
+        from werkzeug._compat import wsgi_encoding_dance
+        from werkzeug.datastructures import Headers
+        from werkzeug.wrappers import Response
+        def now_handler(event, context):
+            payload = json.loads(event['body'])
 
-        headers = Headers(payload.get('headers', {}))
+            headers = Headers(payload.get('headers', {}))
 
-        body = payload.get('body', '')
-        if body != '':
+            body = payload.get('body', '')
+            if body != '':
+                if payload.get('encoding') == 'base64':
+                    body = base64.b64decode(body)
+            if isinstance(body, string_types):
+                body = to_bytes(body, charset='utf-8')
+
+            url = urlparse(unquote(payload['path']))
+            query = url.query
+            path = url.path
+
+            environ = {
+                'CONTENT_LENGTH': str(len(body)),
+                'CONTENT_TYPE': headers.get('content-type', ''),
+                'PATH_INFO': path,
+                'QUERY_STRING': query,
+                'REMOTE_ADDR': headers.get(
+                    'x-forwarded-for', headers.get(
+                        'x-real-ip', payload.get(
+                            'true-client-ip', ''))),
+                'REQUEST_METHOD': payload['method'],
+                'SERVER_NAME': headers.get('host', 'lambda'),
+                'SERVER_PORT': headers.get('x-forwarded-port', '80'),
+                'SERVER_PROTOCOL': 'HTTP/1.1',
+                'event': event,
+                'context': context,
+                'wsgi.errors': sys.stderr,
+                'wsgi.input': BytesIO(body),
+                'wsgi.multiprocess': False,
+                'wsgi.multithread': False,
+                'wsgi.run_once': False,
+                'wsgi.url_scheme': headers.get('x-forwarded-proto', 'http'),
+                'wsgi.version': (1, 0),
+            }
+
+            for key, value in environ.items():
+                if isinstance(value, string_types) and key != 'QUERY_STRING':
+                    environ[key] = wsgi_encoding_dance(value)
+
+            for key, value in headers.items():
+                key = 'HTTP_' + key.upper().replace('-', '_')
+                if key not in ('HTTP_CONTENT_TYPE', 'HTTP_CONTENT_LENGTH'):
+                    environ[key] = value
+
+            response = Response.from_app(__NOW_HANDLER_FILENAME.app, environ)
+
+            return_dict = {
+                'statusCode': response.status_code,
+                'headers': dict(response.headers)
+            }
+
+            if response.data:
+                return_dict['body'] = base64.b64encode(response.data).decode('utf-8')
+                return_dict['encoding'] = 'base64'
+
+            return return_dict
+    else:
+        print('using Asynchronous Server Gateway Interface (ASGI)')
+        import asyncio
+        import enum
+        from urllib.parse import urlparse, unquote, urlencode
+
+
+        class ASGICycleState(enum.Enum):
+            REQUEST = enum.auto()
+            RESPONSE = enum.auto()
+
+
+        class ASGICycle:
+            def __init__(self, scope):
+                self.scope = scope
+                self.body = b''
+                self.state = ASGICycleState.REQUEST
+                self.app_queue = None
+                self.response = {}
+
+            def __call__(self, app, body):
+                """
+                Receives the application and any body included in the request, then builds the
+                ASGI instance using the connection scope.
+                Runs until the response is completely read from the application.
+                """
+                loop = asyncio.new_event_loop()
+                self.app_queue = asyncio.Queue(loop=loop)
+                self.put_message({'type': 'http.request', 'body': body, 'more_body': False})
+
+                asgi_instance = app(self.scope, self.receive, self.send)
+
+                asgi_task = loop.create_task(asgi_instance)
+                loop.run_until_complete(asgi_task)
+                return self.response
+
+            def put_message(self, message):
+                self.app_queue.put_nowait(message)
+
+            async def receive(self):
+                """
+                Awaited by the application to receive messages in the queue.
+                """
+                message = await self.app_queue.get()
+                return message
+
+            async def send(self, message):
+                """
+                Awaited by the application to send messages to the current cycle instance.
+                """
+                message_type = message['type']
+
+                if self.state is ASGICycleState.REQUEST:
+                    if message_type != 'http.response.start':
+                        raise RuntimeError(
+                            f"Expected 'http.response.start', received: {message_type}"
+                        )
+
+                    status_code = message['status']
+                    headers = {k: v for k, v in message.get('headers', [])}
+
+                    self.on_request(headers, status_code)
+                    self.state = ASGICycleState.RESPONSE
+
+                elif self.state is ASGICycleState.RESPONSE:
+                    if message_type != 'http.response.body':
+                        raise RuntimeError(
+                            f"Expected 'http.response.body', received: {message_type}"
+                        )
+
+                    body = message.get('body', b'')
+                    more_body = message.get('more_body', False)
+
+                    # The body must be completely read before returning the response.
+                    self.body += body
+
+                    if not more_body:
+                        self.on_response()
+                        self.put_message({'type': 'http.disconnect'})
+
+            def on_request(self, headers, status_code):
+                self.response['statusCode'] = status_code
+                self.response['headers'] = {k.decode(): v.decode() for k, v in headers.items()}
+
+            def on_response(self):
+                if self.body:
+                    self.response['body'] = base64.b64encode(self.body).decode('utf-8')
+                    self.response['encoding'] = 'base64'
+
+        def now_handler(event, context):
+            payload = json.loads(event['body'])
+
+            headers = payload.get('headers', {})
+
+            body = payload.get('body', b'')
             if payload.get('encoding') == 'base64':
                 body = base64.b64decode(body)
-        if isinstance(body, string_types):
-            body = to_bytes(body, charset='utf-8')
+            elif not isinstance(body, bytes):
+                body = body.encode()
 
-        url = urlparse(unquote(payload['path']))
-        query = url.query
-        path = url.path
+            url = urlparse(unquote(payload['path']))
+            query = url.query.encode()
+            path = url.path
 
-        environ = {
-            'CONTENT_LENGTH': str(len(body)),
-            'CONTENT_TYPE': headers.get('content-type', ''),
-            'PATH_INFO': path,
-            'QUERY_STRING': query,
-            'REMOTE_ADDR': headers.get(
-                'x-forwarded-for', headers.get(
-                    'x-real-ip', payload.get(
-                        'true-client-ip', ''))),
-            'REQUEST_METHOD': payload['method'],
-            'SERVER_NAME': headers.get('host', 'lambda'),
-            'SERVER_PORT': headers.get('x-forwarded-port', '80'),
-            'SERVER_PROTOCOL': 'HTTP/1.1',
-            'event': event,
-            'context': context,
-            'wsgi.errors': sys.stderr,
-            'wsgi.input': BytesIO(body),
-            'wsgi.multiprocess': False,
-            'wsgi.multithread': False,
-            'wsgi.run_once': False,
-            'wsgi.url_scheme': headers.get('x-forwarded-proto', 'http'),
-            'wsgi.version': (1, 0),
-        }
+            scope = {
+                'server': (headers.get('host', 'lambda'), headers.get('x-forwarded-port', 80)),
+                'client': (headers.get(
+                    'x-forwarded-for', headers.get(
+                        'x-real-ip', payload.get(
+                            'true-client-ip', ''))), 0),
+                'scheme': headers.get('x-forwarded-proto', 'http'),
+                'root_path': '',
+                'query_string': query,
+                'headers': [[k.lower().encode(), v.encode()] for k, v in headers.items()],
+                'type': 'http',
+                'http_version': '1.1',
+                'method': payload['method'],
+                'path': path,
+                'raw_path': path.encode(),
+            }
 
-        for key, value in environ.items():
-            if isinstance(value, string_types) and key != 'QUERY_STRING':
-                environ[key] = wsgi_encoding_dance(value)
+            asgi_cycle = ASGICycle(scope)
+            response = asgi_cycle(__NOW_HANDLER_FILENAME.app, body)
+            return response
 
-        for key, value in headers.items():
-            key = 'HTTP_' + key.upper().replace('-', '_')
-            if key not in ('HTTP_CONTENT_TYPE', 'HTTP_CONTENT_LENGTH'):
-                environ[key] = value
-
-        response = Response.from_app(__NOW_HANDLER_FILENAME.app, environ)
-
-        return_dict = {
-            'statusCode': response.status_code,
-            'headers': dict(response.headers)
-        }
-
-        if response.data:
-            return_dict['body'] = base64.b64encode(response.data).decode('utf-8')
-            return_dict['encoding'] = 'base64'
-
-        return return_dict
 else:
     print('Missing variable `handler` or `app` in file __NOW_HANDLER_FILENAME.py')
     print('See the docs https://zeit.co/docs/v2/deployments/official-builders/python-now-python')

packages/now-python/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@now/python",
-  "version": "0.2.8",
+  "version": "0.2.11",
   "main": "./dist/index.js",
   "license": "MIT",
+  "homepage": "https://zeit.co/docs/v2/deployments/official-builders/python-now-python",
   "files": [
     "dist",
     "now_init.py"

packages/now-python/src/index.ts

@@ -92,12 +92,20 @@ export const build = async ({
   files: originalFiles,
   entrypoint,
   meta = {},
+  config,
 }: BuildOptions) => {
   console.log('downloading files...');
   let downloadedFiles = await download(originalFiles, workPath, meta);
 
   if (meta.isDev) {
-    const base = dirname(downloadedFiles['now.json'].fsPath);
+    let base = null;
+
+    if (config && config.zeroConfig) {
+      base = workPath;
+    } else {
+      base = dirname(downloadedFiles['now.json'].fsPath);
+    }
+
     const destNow = join(base, '.now', 'cache', basename(entrypoint, '.py'));
     await download(downloadedFiles, destNow);
     downloadedFiles = await glob('**', destNow);

packages/now-python/test/fixtures/11-asgi/Pipfile

@@ -0,0 +1,12 @@
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[dev-packages]
+
+[packages]
+sanic = "*"
+
+[requires]
+python_version = "3.6"