Publish

- @now/build-utils@0.5.8
 - @now/md@0.5.4
 - @now/next@0.4.2
 - @now/node-bridge@1.2.0
 - @now/node-server@0.7.5
 - @now/node@0.9.0
 - @now/python@0.2.7
 - @now/static-build@0.5.9

.circleci/config.yml

@@ -29,14 +29,8 @@ jobs:
       - run:
           name: Tests and Coverage
           command: yarn test-coverage
-      - run:
-          name: Potentially save npm token
-          command: "([[ ! -z $NPM_TOKEN ]] && echo \"//registry.npmjs.org/:_authToken=$NPM_TOKEN\" >> ~/.npmrc) || echo \"Did not write npm token\""
-      - run:
-          name: Potentially publish releases to npm
-          command: ./.circleci/publish.sh
 workflows:
   version: 2
-  build-and-deploy:
+  build-and-test:
     jobs:
       - build

.circleci/publish.sh

@@ -1,6 +1,13 @@
 #!/bin/bash
 set -euo pipefail
 
+if [ -z "$NPM_TOKEN" ]; then
+  echo "NPM_TOKEN not found. Did you forget to assign the GitHub Action secret?"
+  exit 1
+fi
+
+echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
+
 if [ ! -e ~/.npmrc ]; then
   echo "~/.npmrc file does not exist, skipping publish"
   exit 0

.editorconfig

@@ -0,0 +1,43 @@
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[{*.json,*.json.example,*.gyp,*.yml,*.yaml,*.workflow}]
+indent_style = space
+indent_size = 2
+
+[{*.py,*.asm}]
+indent_style = space
+
+[*.py]
+indent_size = 4
+
+[*.asm]
+indent_size = 8
+
+[*.md]
+trim_trailing_whitespace = false
+indent_style = space
+indent_size = 2
+
+# Ideal settings - some plugins might support these
+[*.js,*.jsx,*.ts,*.tsx]
+quote_type = single
+indent_style = space
+indent_size = 2
+
+[{*.c,*.cc,*.h,*.hh,*.cpp,*.hpp,*.m,*.mm,*.mpp,*.java,*.go,*.rs,*.php,*.ng,*.d,*.cs,*.swift}]
+indent_style = tab
+indent_size = 4
+tab_width = 4
+
+[{*.c,*.cc,*.h,*.hh,*.cpp,*.hpp,*.m,*.mm,*.mpp,*.js,*.java,*.go,*.rs,*.php,*.ng,*.jsx,*.ts,*.tsx,*.d,*.cs,*.swift}]
+curly_bracket_next_line = false
+spaces_around_operators = true
+spaces_around_brackets = outside
+# close enough to 1TB
+indent_brace_style = K&R

.eslintignore

@@ -3,9 +3,12 @@
 /**/node_modules/*
 /packages/now-go/go/*
 /packages/now-build-utils/dist/*
+/packages/now-build-utils/src/*.js
+/packages/now-build-utils/src/fs/*.js
 /packages/now-node/dist/*
 /packages/now-next/dist/*
 /packages/now-node-bridge/*
-/packages/now-python/*
+/packages/now-python/dist/*
 /packages/now-optipng/dist/*
 /packages/now-go/*
+/packages/now-rust/dist/*

.github/CODEOWNERS

@@ -3,5 +3,7 @@
 
 *                       @styfle
 /packages/now-node      @styfle @tootallnate
-/packages/now-next      @styfle @dav-is
+/packages/now-next      @timer  @dav-is
 /packages/now-go        @styfle @sophearak
+/packages/now-python    @styfle @sophearak
+/packages/now-rust      @styfle @mike-engel @anmonteiro

.github/main.workflow

@@ -0,0 +1,76 @@
+workflow "Canary publish" {
+  on = "push"
+  resolves = ["3. Canary yarn run publish"]
+}
+
+action "0. Canary filter" {
+  uses = "actions/bin/filter@3c0b4f0e63ea54ea5df2914b4fabf383368cd0da"
+  args = "branch canary"
+}
+
+action "0. Canary PR not deleted" {
+  uses = "actions/bin/filter@3c0b4f0e63ea54ea5df2914b4fabf383368cd0da"
+  needs = ["0. Canary filter"]
+  args = "not deleted"
+}
+
+action "1. Canary yarn install" {
+  uses = "actions/npm@59b64a598378f31e49cb76f27d6f3312b582f680"
+  needs = ["0. Canary PR not deleted"]
+  runs = "yarn"
+  args = "install"
+}
+
+action "2. Canary yarn run build" {
+  uses = "actions/npm@59b64a598378f31e49cb76f27d6f3312b582f680"
+  needs = ["1. Canary yarn install"]
+  runs = "yarn"
+  args = "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"
+  secrets = ["NPM_TOKEN"]
+}
+
+
+workflow "Master publish" {
+  on = "push"
+  resolves = ["3. Master yarn run publish"]
+}
+
+action "0. Master filter" {
+  uses = "actions/bin/filter@3c0b4f0e63ea54ea5df2914b4fabf383368cd0da"
+  args = "branch master"
+}
+
+action "0. Master PR not deleted" {
+  uses = "actions/bin/filter@3c0b4f0e63ea54ea5df2914b4fabf383368cd0da"
+  needs = ["0. Master filter"]
+  args = "not deleted"
+}
+
+action "1. Master yarn install" {
+  uses = "actions/npm@59b64a598378f31e49cb76f27d6f3312b582f680"
+  needs = ["0. Master PR not deleted"]
+  runs = "yarn"
+  args = "install"
+}
+
+action "2. Master yarn run build" {
+  uses = "actions/npm@59b64a598378f31e49cb76f27d6f3312b582f680"
+  needs = ["1. Master yarn install"]
+  runs = "yarn"
+  args = "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"
+  secrets = ["NPM_TOKEN"]
+}

.prettierrc.json

@@ -1,4 +0,0 @@
-{
-  "singleQuote": true,
-  "trailingComma": "es5"
-}

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-  "eslint.enable": false
-}

.yarnrc

@@ -0,0 +1 @@
+save-prefix ""

README.md

@@ -1,27 +1,43 @@
 # now-builders
 
-This is the full list of official Builders provided by the ZEIT team.
+This is a monorepo containing the [Official Builders](https://zeit.co/docs/v2/deployments/builders/overview) provided by the ZEIT team.
 
-More details here: https://zeit.co/docs/v2/deployments/builders/overview/
+## Channels
+
+There are two Channels:
+
+| Channel | Git Branch | npm dist-tag | use example        |
+| ------- | ---------- | ------------ | ------------------ |
+| Canary  | `canary`   | `@canary`    | `@now/node@canary` |
+| Stable  | `master`   | `@latest`    | `@now/node@latest` |
+
+All PRs should be submitted to the `canary` branch.
+
+Once a PR is merged into the `canary` branch, it should be published to npm immediately using the Canary Channel.
 
 ### Publishing to npm
 
-Run the following command to publish modified builders to npm:
-
-For the stable channel use:
-
-```
-yarn publish-stable
-```
-
-For the canary channel use:
+For the Canary Channel, publish the modified Builders to npm with the following:
 
 ```
 yarn publish-canary
 ```
 
-CircleCI will take care of publishing the updated packages to npm from there.
+For the Stable Channel, you must cherry pick each commit from canary to master and then deploy the modified Builders:
 
-If for some reason CircleCI fails to publish the npm package, you may do so
+```
+git checkout master
+git pull      # make sure you're up to date
+git cherry-pick <PR501_COMMIT_SHA>
+git cherry-pick <PR502_COMMIT_SHA>
+git cherry-pick <PR503_COMMIT_SHA>
+git cherry-pick <PR504_COMMIT_SHA>
+# ... etc ...
+yarn publish-stable
+```
+
+After running this publish step, GitHub Actions will take care of publishing the modified Builder packages to npm.
+
+If for some reason GitHub Actions fails to publish the npm package, you may do so
 manually by running `npm publish` from the package directory. Make sure to
-include the `--tag canary` parameter if you are publishing a canary release!
+use `npm publish --tag canary` if you are publishing a canary release!

errors/now-next-legacy-mode.md

@@ -29,12 +29,11 @@ Serverless:
 - No runtime dependencies, meaning smaller lambda functions
 - Optimized for fast [cold start](https://zeit.co/blog/serverless-ssr#cold-start)
 
-
 #### Possible Ways to Fix It
 
 In order to create the smallest possible lambdas Next.js has to be configured to build for the `serverless` target.
 
-1. Serverless Next.js requires Next.js 8 or later, to upgrade you can install the `latest` version: 
+1. Serverless Next.js requires Next.js 8 or later, to upgrade you can install the `latest` version:
 
 ```
 npm install next --save
@@ -46,7 +45,7 @@ npm install next --save
 {
   "scripts": {
     "now-build": "next build"
-  },
+  }
 }
 ```
 
@@ -54,9 +53,9 @@ npm install next --save
 
 ```js
 module.exports = {
-  target: 'serverless'
+  target: 'serverless',
   // Other options are still valid
-}
+};
 ```
 
 4. Optionally make sure the `"src"` in `"builds"` points to your application `package.json`
@@ -70,4 +69,4 @@ module.exports = {
 
 ### Useful Links
 
-- [Serverless target implementation](https://github.com/zeit/now-builders/pull/150) 
+- [Serverless target implementation](https://github.com/zeit/now-builders/pull/150)

errors/now-next-no-serverless-pages-built.md

@@ -20,7 +20,7 @@ npm install next --save
 {
   "scripts": {
     "now-build": "next build"
-  },
+  }
 }
 ```
 
@@ -28,9 +28,9 @@ npm install next --save
 
 ```js
 module.exports = {
-  target: 'serverless'
+  target: 'serverless',
   // Other options
-}
+};
 ```
 
 4. Remove `distDir` from `next.config.js` as `@now/next` can't parse this file and expects your build output at `/.next`

errors/now-static-build-failed-to-detect-a-server.md

@@ -7,7 +7,7 @@ requests to the server that is created by the `now-dev` script in the
 `package.json` file.
 
 In order for `now dev` to know which port the server is running on, the builder
-is provided a `$PORT` environment variable that the server *must* bind to. The
+is provided a `$PORT` environment variable that the server _must_ bind to. The
 error "Failed to detect a server running on port" is printed if the builder fails
 to detect a server listening on that specific port within five minutes.
 

jest.config.js

@@ -1,13 +1,15 @@
-const childProcess = require('child_process');
-const path = require('path');
+const { execSync } = require('child_process');
+const { relative } = require('path');
 
-const command = 'git diff HEAD~1 --name-only';
-const diff = childProcess.execSync(command).toString();
+const branch = execSync('git branch | grep "*" | cut -d " " -f2').toString();
+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 changed = diff
   .split('\n')
   .filter(item => Boolean(item) && item.includes('packages/'))
-  .map(item => path.relative('packages', item).split('/')[0]);
+  .map(item => relative('packages', item).split('/')[0]);
 
 const matches = [];
 

lerna.json

@@ -1,9 +1,7 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "packages": [
-    "packages/*"
-  ],
+  "packages": ["packages/*"],
   "command": {
     "publish": {
       "npmClient": "npm",

package.json

@@ -12,8 +12,9 @@
   "scripts": {
     "lerna": "lerna",
     "bootstrap": "lerna bootstrap",
-    "publish-stable": "lerna version",
-    "publish-canary": "lerna version prerelease --preid canary",
+    "publish-stable": "git checkout master && git pull && lerna version",
+    "publish-canary": "git checkout canary && git pull && lerna version prerelease --preid canary",
+    "publish-from-github": "./.circleci/publish.sh",
     "build": "./.circleci/build.sh",
     "lint": "eslint .",
     "codecov": "codecov",
@@ -31,6 +32,14 @@
     "*.ts": [
       "prettier --write",
       "git add"
+    ],
+    "*.json": [
+      "prettier --write",
+      "git add"
+    ],
+    "*.md": [
+      "prettier --write",
+      "git add"
     ]
   },
   "devDependencies": {
@@ -51,6 +60,10 @@
     "lint-staged": "^8.0.4",
     "node-fetch": "^2.3.0",
     "pre-commit": "^1.2.2",
-    "prettier": "^1.15.2"
+    "prettier": "1.17.1"
+  },
+  "prettier": {
+    "singleQuote": true,
+    "trailingComma": "es5"
   }
 }

packages/now-build-utils/package.json

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

packages/now-build-utils/src/file-fs-ref.ts

@@ -31,7 +31,10 @@ class FileFsRef implements File {
     this.fsPath = fsPath;
   }
 
-  static async fromFsPath({ mode, fsPath }: FileFsRefOptions): Promise<FileFsRef> {
+  static async fromFsPath({
+    mode,
+    fsPath,
+  }: FileFsRefOptions): Promise<FileFsRef> {
     let m = mode;
     if (!m) {
       const stat = await fs.lstat(fsPath);
@@ -40,7 +43,11 @@ class FileFsRef implements File {
     return new FileFsRef({ mode: m, fsPath });
   }
 
-  static async fromStream({ mode = 0o100644, stream, fsPath }: FromStreamOptions): Promise<FileFsRef> {
+  static async fromStream({
+    mode = 0o100644,
+    stream,
+    fsPath,
+  }: FromStreamOptions): Promise<FileFsRef> {
     assert(typeof mode === 'number');
     assert(typeof stream.pipe === 'function'); // is-stream
     assert(typeof fsPath === 'string');
@@ -48,7 +55,7 @@ class FileFsRef implements File {
 
     await new Promise<void>((resolve, reject) => {
       const dest = fs.createWriteStream(fsPath, {
-        mode: mode & 0o777
+        mode: mode & 0o777,
       });
       stream.pipe(dest);
       stream.on('error', reject);
@@ -72,15 +79,15 @@ class FileFsRef implements File {
     let flag = false;
 
     // eslint-disable-next-line consistent-return
-    return multiStream((cb) => {
+    return multiStream(cb => {
       if (flag) return cb(null, null);
       flag = true;
 
       this.toStreamAsync()
-        .then((stream) => {
+        .then(stream => {
           cb(null, stream);
         })
-        .catch((error) => {
+        .catch(error => {
           cb(error, null);
         });
     });

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

@@ -7,6 +7,6 @@ export default function rename(files: Files, delegate: Delegate): Files {
       ...newFiles,
       [delegate(name)]: files[name],
     }),
-    {},
+    {}
   );
 }

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

@@ -3,6 +3,7 @@ import fs from 'fs-extra';
 import path from 'path';
 import spawn from 'cross-spawn';
 import { SpawnOptions } from 'child_process';
+import { deprecate } from 'util';
 
 function spawnAsync(
   command: string,
@@ -64,12 +65,14 @@ async function scanParentDirs(destPath: string, scriptName?: string) {
     // eslint-disable-next-line no-await-in-loop
     if (await fs.pathExists(packageJsonPath)) {
       // eslint-disable-next-line no-await-in-loop
-      const packageJson = JSON.parse(
-        await fs.readFile(packageJsonPath, 'utf8')
-      );
-      hasScript = Boolean(
-        packageJson.scripts && scriptName && packageJson.scripts[scriptName]
-      );
+      if (scriptName) {
+        const packageJson = JSON.parse(
+          await fs.readFile(packageJsonPath, 'utf8')
+        );
+        hasScript = Boolean(
+          packageJson.scripts && scriptName && packageJson.scripts[scriptName]
+        );
+      }
       // eslint-disable-next-line no-await-in-loop
       hasPackageLockJson = await fs.pathExists(
         path.join(currentDestPath, 'package-lock.json')
@@ -85,9 +88,10 @@ async function scanParentDirs(destPath: string, scriptName?: string) {
   return { hasScript, hasPackageLockJson };
 }
 
-export async function installDependencies(
+export async function runNpmInstall(
   destPath: string,
-  args: string[] = []
+  args: string[] = [],
+  cmd?: string
 ) {
   assert(path.isAbsolute(destPath));
 
@@ -95,30 +99,26 @@ export async function installDependencies(
   console.log(`installing to ${destPath}`);
   const { hasPackageLockJson } = await scanParentDirs(destPath);
 
-  const opts = {
+  const opts: SpawnOptions = {
     env: {
       ...process.env,
-      // This is a little hack to force `node-gyp` to build for the
-      // Node.js version that `@now/node` and `@now/node-server` use
-      npm_config_target: '8.10.0',
     },
-    stdio: 'pipe',
   };
 
   if (hasPackageLockJson) {
     commandArgs = args.filter(a => a !== '--prefer-offline');
     await spawnAsync(
-      'npm',
-      ['install'].concat(commandArgs),
+      cmd || 'npm',
+      commandArgs.concat(['install', '--unsafe-perm']),
       destPath,
-      opts as SpawnOptions
+      opts
     );
   } else {
     await spawnAsync(
-      'yarn',
-      ['--ignore-engines', '--cwd', destPath].concat(commandArgs),
+      cmd || 'yarn',
+      commandArgs.concat(['--ignore-engines', '--cwd', destPath]),
       destPath,
-      opts as SpawnOptions
+      opts
     );
   }
 }
@@ -151,4 +151,11 @@ export async function runPackageJsonScript(
   return true;
 }
 
-export const runNpmInstall = installDependencies;
+/**
+ * installDependencies() is deprecated.
+ * Please use runNpmInstall() instead.
+ */
+export const installDependencies = deprecate(
+  runNpmInstall,
+  'installDependencies() is deprecated. Please use runNpmInstall() instead.'
+);

packages/now-build-utils/src/fs/stream-to-buffer.ts

@@ -1,26 +1,28 @@
 import eos from 'end-of-stream';
 
-export default function streamToBuffer(stream: NodeJS.ReadableStream): Promise<Buffer> {
+export default function streamToBuffer(
+  stream: NodeJS.ReadableStream
+): Promise<Buffer> {
   return new Promise<Buffer>((resolve, reject) => {
     const buffers: Buffer[] = [];
 
-    stream.on('data', buffers.push.bind(buffers))
+    stream.on('data', buffers.push.bind(buffers));
 
-    eos(stream, (err) => {
-        if (err) {
-          reject(err);
-          return;
-        }
-        switch (buffers.length) {
-          case 0:
-            resolve(Buffer.allocUnsafe(0));
-            break;
-          case 1:
-            resolve(buffers[0]);
-            break;
-          default:
-            resolve(Buffer.concat(buffers));
-        }
+    eos(stream, err => {
+      if (err) {
+        reject(err);
+        return;
+      }
+      switch (buffers.length) {
+        case 0:
+          resolve(Buffer.allocUnsafe(0));
+          break;
+        case 1:
+          resolve(buffers[0]);
+          break;
+        default:
+          resolve(Buffer.concat(buffers));
+      }
     });
   });
-}
+}

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

@@ -1,34 +1,51 @@
 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 {
+  File,
+  Files,
+  AnalyzeOptions,
+  BuildOptions,
+  PrepareCacheOptions,
+  ShouldServeOptions,
+  Meta,
+} from './types';
 import { Lambda, createLambda } from './lambda';
-import download from './fs/download';
-import getWriteableDirectory from './fs/get-writable-directory'
+import download, { DownloadedFiles } from './fs/download';
+import getWriteableDirectory from './fs/get-writable-directory';
 import glob from './fs/glob';
 import rename from './fs/rename';
-import { installDependencies, runPackageJsonScript, runNpmInstall, runShellScript } from './fs/run-user-scripts';
+import {
+  installDependencies,
+  runPackageJsonScript,
+  runNpmInstall,
+  runShellScript,
+} from './fs/run-user-scripts';
 import streamToBuffer from './fs/stream-to-buffer';
 import shouldServe from './should-serve';
 
 export {
-    FileBlob,
-    FileFsRef,
-    FileRef,
-    Files,
-    File,
-    Meta,
-    Lambda,
-    createLambda,
-    download,
-    getWriteableDirectory,
-    glob,
-    rename,
-    installDependencies, runPackageJsonScript, runNpmInstall, runShellScript,
-    streamToBuffer,
-    AnalyzeOptions,
-    BuildOptions,
-    PrepareCacheOptions,
-    ShouldServeOptions,
-    shouldServe,
+  FileBlob,
+  FileFsRef,
+  FileRef,
+  Files,
+  File,
+  Meta,
+  Lambda,
+  createLambda,
+  download,
+  DownloadedFiles,
+  getWriteableDirectory,
+  glob,
+  rename,
+  installDependencies,
+  runPackageJsonScript,
+  runNpmInstall,
+  runShellScript,
+  streamToBuffer,
+  AnalyzeOptions,
+  BuildOptions,
+  PrepareCacheOptions,
+  ShouldServeOptions,
+  shouldServe,
 };

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

@@ -32,9 +32,7 @@ export class Lambda {
   public runtime: string;
   public environment: Environment;
 
-  constructor({
-    zipBuffer, handler, runtime, environment,
-  }: LambdaOptions) {
+  constructor({ zipBuffer, handler, runtime, environment }: LambdaOptions) {
     this.type = 'Lambda';
     this.zipBuffer = zipBuffer;
     this.handler = handler;
@@ -47,7 +45,10 @@ const sema = new Sema(10);
 const mtime = new Date(1540000000000);
 
 export async function createLambda({
-  files, handler, runtime, environment = {},
+  files,
+  handler,
+  runtime,
+  environment = {},
 }: CreateLambdaOptions): Promise<Lambda> {
   assert(typeof files === 'object', '"files" must be an object');
   assert(typeof handler === 'string', '"handler" is not a string');
@@ -97,7 +98,9 @@ export async function createZip(files: Files): Promise<Buffer> {
     }
 
     zipFile.end();
-    streamToBuffer(zipFile.outputStream).then(resolve).catch(reject);
+    streamToBuffer(zipFile.outputStream)
+      .then(resolve)
+      .catch(reject);
   });
 
   return zipBuffer;

packages/now-build-utils/src/should-serve.ts

@@ -5,7 +5,7 @@ import FileFsRef from './file-fs-ref';
 export default function shouldServe({
   entrypoint,
   files,
-  requestPath
+  requestPath,
 }: ShouldServeOptions): boolean {
   requestPath = requestPath.replace(/\/$/, ''); // sanitize trailing '/'
   entrypoint = entrypoint.replace(/\\/, '/'); // windows compatibility
@@ -23,5 +23,5 @@ export default function shouldServe({
 }
 
 function hasProp(obj: { [path: string]: FileFsRef }, key: string): boolean {
-  return Object.hasOwnProperty.call(obj, key)
+  return Object.hasOwnProperty.call(obj, key);
 }

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

@@ -16,7 +16,14 @@ export interface Files {
 }
 
 export interface Config {
-  [key: string]: string;
+  [key: string]: string | string[] | boolean | number | undefined;
+  maxLambdaSize?: string;
+  includeFiles?: string | string[];
+  bundle?: boolean;
+  ldsflags?: string;
+  helpers?: boolean;
+  rust?: string;
+  debug?: boolean;
 }
 
 export interface Meta {

packages/now-build-utils/test/fixtures/07-cross-install/now.json

@@ -1,9 +1,10 @@
 {
   "version": 2,
-  "builds": [
-    { "src": "api/index.js", "use": "@now/node" }
-  ],
+  "builds": [{ "src": "api/index.js", "use": "@now/node" }],
   "probes": [
-    { "path": "/api/index.js", "mustContain": "cross-cow:RANDOMNESS_PLACEHOLDER" }
+    {
+      "path": "/api/index.js",
+      "mustContain": "cross-cow:RANDOMNESS_PLACEHOLDER"
+    }
   ]
 }

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

@@ -1,10 +1,11 @@
 {
-    "version": 2,
-    "builds": [
-      { "src": "index.js", "use": "@now/node", "config": { "maxLambdaSize": "15mb" } }
-    ],
-    "probes": [
-      { "path": "/", "mustContain": "found:RANDOMNESS_PLACEHOLDER" }
-    ]
-  }
-  
+  "version": 2,
+  "builds": [
+    {
+      "src": "index.js",
+      "use": "@now/node",
+      "config": { "maxLambdaSize": "15mb" }
+    }
+  ],
+  "probes": [{ "path": "/", "mustContain": "found:RANDOMNESS_PLACEHOLDER" }]
+}

packages/now-build-utils/tsconfig.json

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

packages/now-go/go-helpers.ts

@@ -23,7 +23,7 @@ const getGoUrl = (version: string, platform: string, arch: string) => {
   return `https://dl.google.com/go/go${version}.${goPlatform}-${goArch}.${ext}`;
 };
 
-export async function getAnalyzedEntrypoint(filePath: string) {
+export async function getAnalyzedEntrypoint(filePath: string, modulePath = '') {
   debug('Analyzing entrypoint %o', filePath);
   const bin = join(__dirname, 'analyze');
 
@@ -35,7 +35,8 @@ export async function getAnalyzedEntrypoint(filePath: string) {
     await go.build(src, dest);
   }
 
-  const args = [filePath];
+  const args = [`-modpath=${modulePath}`, filePath];
+
   const analyzed = await execa.stdout(bin, args);
   debug('Analyzed entrypoint %o', analyzed);
   return analyzed;

packages/now-go/index.ts

@@ -1,5 +1,5 @@
 import { join, sep, dirname, basename } from 'path';
-import { readFile, writeFile, pathExists, move, copy } from 'fs-extra';
+import { readFile, writeFile, pathExists, move } from 'fs-extra';
 import { homedir } from 'os';
 import execa from 'execa';
 
@@ -80,7 +80,16 @@ export async function build({
   console.log(`Parsing AST for "${entrypoint}"`);
   let analyzed: string;
   try {
-    analyzed = await getAnalyzedEntrypoint(downloadedFiles[entrypoint].fsPath);
+    let goModAbsPathDir = '';
+    for (const file of Object.keys(downloadedFiles)) {
+      if (file === 'go.mod') {
+        goModAbsPathDir = dirname(downloadedFiles[file].fsPath);
+      }
+    }
+    analyzed = await getAnalyzedEntrypoint(
+      downloadedFiles[entrypoint].fsPath,
+      goModAbsPathDir
+    );
   } catch (err) {
     console.log(`Failed to parse AST for "${entrypoint}"`);
     throw err;
@@ -96,7 +105,6 @@ Learn more: https://zeit.co/docs/v2/deployments/official-builders/go-now-go/#ent
     throw err;
   }
 
-  const entrypointDirnameDev = dirname(downloadedFiles[entrypoint].fsPath);
   const parsedAnalyzed = JSON.parse(analyzed) as Analyzed;
 
   if (meta.isDev) {
@@ -109,39 +117,33 @@ Learn more: https://zeit.co/docs/v2/deployments/official-builders/go-now-go/#ent
       'src',
       'lambda'
     );
-    const goMod = await pathExists(join(entrypointDirnameDev, 'go.mod'));
-
     // this will ensure Go rebuilt fast
     goPath = join(base, '.now', 'cache', basename(entrypoint, '.go'));
+    await download(downloadedFiles, destNow);
 
-    for (const file of parsedAnalyzed.watch) {
-      if (entrypointArr.length > 0) {
-        await copy(
-          join(base, dirname(entrypoint), file),
-          join(destNow, dirname(entrypoint), file)
-        );
-
-        if (goMod) {
-          await copy(
-            join(entrypointDirnameDev, 'go.mod'),
-            join(destNow, dirname(entrypoint), 'go.mod')
-          );
-        }
-      } else {
-        await copy(join(base, file), join(destNow, file));
-
-        if (goMod) {
-          await copy(
-            join(entrypointDirnameDev, 'go.mod'),
-            join(destNow, 'go.mod')
-          );
-        }
-      }
-    }
     downloadedFiles = await glob('**', destNow);
   }
 
+  // find `go.mod` in downloadedFiles
   const entrypointDirname = dirname(downloadedFiles[entrypoint].fsPath);
+  let isGoModExist = false;
+  let goModPath = '';
+  let goModPathArr: string[] = [];
+  for (const file of Object.keys(downloadedFiles)) {
+    const fileDirname = dirname(downloadedFiles[file].fsPath);
+    if (file === 'go.mod') {
+      isGoModExist = true;
+      goModPath = fileDirname;
+      goModPathArr = goModPath.split(sep);
+    } else if (file.includes('go.mod')) {
+      isGoModExist = true;
+      if (entrypointDirname === fileDirname) {
+        goModPath = fileDirname;
+        goModPathArr = goModPath.split(sep);
+      }
+    }
+  }
+
   const input = entrypointDirname;
   var includedFiles: Files = {};
 
@@ -162,7 +164,11 @@ Learn more: https://zeit.co/docs/v2/deployments/official-builders/go-now-go/#ent
   // check if package name other than main
   // using `go.mod` way building the handler
   const packageName = parsedAnalyzed.packageName;
-  const isGoModExist = await pathExists(join(entrypointDirname, 'go.mod'));
+
+  if (isGoModExist && packageName === 'main') {
+    throw new Error('Please change `package main` to `package handler`');
+  }
+
   if (packageName !== 'main') {
     const go = await createGo(
       goPath,
@@ -194,10 +200,7 @@ Learn more: https://zeit.co/docs/v2/deployments/official-builders/go-now-go/#ent
     const goFuncName = `${packageName}.${handlerFunctionName}`;
 
     if (isGoModExist) {
-      const goModContents = await readFile(
-        join(entrypointDirname, 'go.mod'),
-        'utf8'
-      );
+      const goModContents = await readFile(join(goModPath, 'go.mod'), 'utf8');
       const usrModName = goModContents.split('\n')[0].split(' ')[1];
       goPackageName = `${usrModName}/${packageName}`;
     }
@@ -206,11 +209,16 @@ Learn more: https://zeit.co/docs/v2/deployments/official-builders/go-now-go/#ent
       .replace('__NOW_HANDLER_PACKAGE_NAME', goPackageName)
       .replace('__NOW_HANDLER_FUNC_NAME', goFuncName);
 
-    // write main__mod__.go
-    await writeFile(
-      join(entrypointDirname, mainModGoFileName),
-      mainModGoContents
-    );
+    if (goModPathArr.length > 1) {
+      // using `go.mod` path to write main__mod__.go
+      await writeFile(join(goModPath, mainModGoFileName), mainModGoContents);
+    } else {
+      // using `entrypointDirname` to write main__mod__.go
+      await writeFile(
+        join(entrypointDirname, mainModGoFileName),
+        mainModGoContents
+      );
+    }
 
     // move user go file to folder
     try {
@@ -231,25 +239,34 @@ Learn more: https://zeit.co/docs/v2/deployments/official-builders/go-now-go/#ent
         );
       }
 
-      await move(downloadedFiles[entrypoint].fsPath, finalDestination, {
-        overwrite: forceMove,
-      });
+      if (
+        dirname(downloadedFiles[entrypoint].fsPath) === goModPath ||
+        !isGoModExist
+      ) {
+        await move(downloadedFiles[entrypoint].fsPath, finalDestination, {
+          overwrite: forceMove,
+        });
+      }
     } catch (err) {
       console.log('failed to move entry to package folder');
       throw err;
     }
 
     if (meta.isDev) {
-      const isGoModBk = await pathExists(join(entrypointDirname, 'go.mod.bk'));
+      let entrypointDir = entrypointDirname;
+      if (goModPathArr.length > 1) {
+        entrypointDir = goModPath;
+      }
+      const isGoModBk = await pathExists(join(entrypointDir, 'go.mod.bk'));
       if (isGoModBk) {
         await move(
-          join(entrypointDirname, 'go.mod.bk'),
-          join(entrypointDirname, 'go.mod'),
+          join(entrypointDir, 'go.mod.bk'),
+          join(entrypointDir, 'go.mod'),
           { overwrite: true }
         );
         await move(
-          join(entrypointDirname, 'go.sum.bk'),
-          join(entrypointDirname, 'go.sum'),
+          join(entrypointDir, 'go.sum.bk'),
+          join(entrypointDir, 'go.sum'),
           { overwrite: true }
         );
       }
@@ -266,8 +283,11 @@ Learn more: https://zeit.co/docs/v2/deployments/official-builders/go-now-go/#ent
 
     console.log('Running `go build`...');
     const destPath = join(outDir, 'handler');
+    const isGoModInRootDir = goModPathArr.length === 1;
+    const baseGoModPath = isGoModInRootDir ? entrypointDirname : goModPath;
     try {
-      const src = [join(entrypointDirname, mainModGoFileName)];
+      let src = [join(baseGoModPath, mainModGoFileName)];
+
       await go.build(src, destPath, config.ldsflags);
     } catch (err) {
       console.log('failed to `go build`');
@@ -276,13 +296,13 @@ Learn more: https://zeit.co/docs/v2/deployments/official-builders/go-now-go/#ent
     if (meta.isDev) {
       // caching for `now dev`
       await move(
-        join(entrypointDirname, 'go.mod'),
-        join(entrypointDirname, 'go.mod.bk'),
+        join(baseGoModPath, 'go.mod'),
+        join(baseGoModPath, 'go.mod.bk'),
         { overwrite: true }
       );
       await move(
-        join(entrypointDirname, 'go.sum'),
-        join(entrypointDirname, 'go.sum.bk'),
+        join(baseGoModPath, 'go.sum'),
+        join(baseGoModPath, 'go.sum.bk'),
         { overwrite: true }
       );
     }
@@ -351,16 +371,17 @@ Learn more: https://zeit.co/docs/v2/deployments/official-builders/go-now-go/#ent
   };
 
   let watch = parsedAnalyzed.watch;
+  let watchSub: string[] = [];
   // if `entrypoint` located in subdirectory
   // we will need to concat it with return watch array
   if (entrypointArr.length > 1) {
     entrypointArr.pop();
-    watch = parsedAnalyzed.watch.map(file => join(...entrypointArr, file));
+    watchSub = parsedAnalyzed.watch.map(file => join(...entrypointArr, file));
   }
 
   return {
     output,
-    watch,
+    watch: watch.concat(watchSub),
   };
 }
 

packages/now-go/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/go",
-  "version": "0.4.8-canary.1",
+  "version": "0.5.1",
   "license": "MIT",
   "repository": {
     "type": "git",

packages/now-go/test/fixtures/01-cowsay/now.json

@@ -8,4 +8,4 @@
     { "path": "/", "mustContain": "cow:RANDOMNESS_PLACEHOLDER" },
     { "path": "/subdirectory", "mustContain": "subcow:RANDOMNESS_PLACEHOLDER" }
   ]
-}
+}

packages/now-go/test/fixtures/03-env-vars/now.json

@@ -15,4 +15,4 @@
       "mustContain": "RANDOMNESS_PLACEHOLDER"
     }
   ]
-}
+}

packages/now-go/test/fixtures/06-content-type/now.json

@@ -1,6 +1,4 @@
 {
   "version": 2,
-  "builds": [
-    { "src": "index.go", "use": "@now/go" }
-  ]
-}
+  "builds": [{ "src": "index.go", "use": "@now/go" }]
+}

packages/now-go/test/fixtures/07-content-length/now.json

@@ -1,9 +1,7 @@
 {
   "version": 2,
-  "builds": [
-    { "src": "*.go", "use": "@now/go" }
-  ],
+  "builds": [{ "src": "*.go", "use": "@now/go" }],
   "env": {
     "RANDOMNESS_ENV_VAR": "RANDOMNESS_PLACEHOLDER"
   }
-}
+}

packages/now-go/test/fixtures/08-include-files/now.json

@@ -5,9 +5,7 @@
       "src": "index.go",
       "use": "@now/go",
       "config": {
-        "includeFiles": [
-          "templates/**"
-        ]
+        "includeFiles": ["templates/**"]
       }
     }
   ],

packages/now-go/test/fixtures/09-exported-function/now.json

@@ -1,9 +1,5 @@
 {
   "version": 2,
-  "builds": [
-    { "src": "index.go", "use": "@now/go" }
-  ],
-  "probes": [
-    { "path": "/", "mustContain": "RANDOMNESS_PLACEHOLDER" }
-  ]
+  "builds": [{ "src": "index.go", "use": "@now/go" }],
+  "probes": [{ "path": "/", "mustContain": "RANDOMNESS_PLACEHOLDER" }]
 }

packages/now-go/test/fixtures/10-go-mod/go.mod

@@ -0,0 +1,3 @@
+module go-mod
+
+go 1.12

packages/now-go/test/fixtures/10-go-mod/index.go

@@ -0,0 +1,11 @@
+package handler
+
+import (
+	"fmt"
+	"net/http"
+)
+
+// Handler func
+func Handler(w http.ResponseWriter, r *http.Request) {
+	fmt.Fprintf(w, "RANDOMNESS_PLACEHOLDER")
+}

packages/now-go/test/fixtures/10-go-mod/now.json

@@ -0,0 +1,5 @@
+{
+  "version": 2,
+  "builds": [{ "src": "index.go", "use": "@now/go" }],
+  "probes": [{ "path": "/", "mustContain": "RANDOMNESS_PLACEHOLDER" }]
+}

packages/now-go/test/fixtures/11-go-mod-shared/api/index.go

@@ -0,0 +1,12 @@
+package api
+
+import (
+	"fmt"
+	"net/http"
+	"with-shared/shared"
+)
+
+// Handler func
+func Handler(w http.ResponseWriter, r *http.Request) {
+	fmt.Fprintf(w, shared.Say("RANDOMNESS_PLACEHOLDER"))
+}

packages/now-go/test/fixtures/11-go-mod-shared/go.mod

@@ -0,0 +1,3 @@
+module with-shared
+
+go 1.12

packages/now-go/test/fixtures/11-go-mod-shared/now.json

@@ -0,0 +1,5 @@
+{
+  "version": 2,
+  "builds": [{ "src": "api/*.go", "use": "@now/go" }],
+  "probes": [{ "path": "/api", "mustContain": "RANDOMNESS_PLACEHOLDER" }]
+}

packages/now-go/test/fixtures/11-go-mod-shared/shared/shared.go

@@ -0,0 +1,6 @@
+package shared
+
+// Say func
+func Say(text string) string {
+	return text
+}

packages/now-go/test/fixtures/12-go-mod-subs/now.json

@@ -0,0 +1,8 @@
+{
+  "version": 2,
+  "builds": [{ "src": "**/*.go", "use": "@now/go" }],
+  "probes": [
+    { "path": "/sub-1", "mustContain": "RANDOMNESS_PLACEHOLDER" },
+    { "path": "/sub-2", "mustContain": "RANDOMNESS_PLACEHOLDER" }
+  ]
+}

packages/now-go/test/fixtures/12-go-mod-subs/sub-1/go.mod

@@ -0,0 +1,3 @@
+module sub-1
+
+go 1.12

packages/now-go/test/fixtures/12-go-mod-subs/sub-1/index.go

@@ -0,0 +1,11 @@
+package sub1
+
+import (
+	"fmt"
+	"net/http"
+)
+
+// Handler func
+func Handler(w http.ResponseWriter, r *http.Request) {
+	fmt.Fprintf(w, "RANDOMNESS_PLACEHOLDER")
+}

packages/now-go/test/fixtures/12-go-mod-subs/sub-2/go.mod

@@ -0,0 +1,3 @@
+module sub-2
+
+go 1.12

packages/now-go/test/fixtures/12-go-mod-subs/sub-2/index.go

@@ -0,0 +1,11 @@
+package sub2
+
+import (
+	"fmt"
+	"net/http"
+)
+
+// Handler func
+func Handler(w http.ResponseWriter, r *http.Request) {
+	fmt.Fprintf(w, "RANDOMNESS_PLACEHOLDER")
+}

packages/now-go/test/test.js

@@ -26,8 +26,8 @@ for (const fixture of fs.readdirSync(fixturesPath)) {
     await expect(
       testDeployment(
         { builderUrl, buildUtilsUrl },
-        path.join(fixturesPath, fixture),
-      ),
+        path.join(fixturesPath, fixture)
+      )
     ).resolves.toBeDefined();
   });
 }

packages/now-go/util/analyze.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"encoding/json"
+	"flag"
 	"fmt"
 	"go/ast"
 	"go/parser"
@@ -92,13 +93,13 @@ func unique(files []string) []string {
 }
 
 func main() {
-	if len(os.Args) != 2 {
+	if len(os.Args) != 3 {
 		// Args should have the program name on `0`
 		// and the file name on `1`
-		fmt.Println("Wrong number of args; Usage is:\n  ./go-analyze file_name.go")
+		fmt.Println("Wrong number of args; Usage is:\n  ./go-analyze -modpath=module-path file_name.go")
 		os.Exit(1)
 	}
-	fileName := os.Args[1]
+	fileName := os.Args[2]
 	rf, err := ioutil.ReadFile(fileName)
 	if err != nil {
 		log.Fatal(err)
@@ -122,6 +123,17 @@ func main() {
 		log.Fatal(err)
 	}
 
+	// looking related packages
+	var modPath string
+	flag.StringVar(&modPath, "modpath", "", "module path")
+	flag.Parse()
+	if len(modPath) > 1 {
+		err = filepath.Walk(modPath, visit(&files))
+		if err != nil {
+			log.Fatal(err)
+		}
+	}
+
 	for _, file := range files {
 		absFileName, _ := filepath.Abs(fileName)
 		absFile, _ := filepath.Abs(file)
@@ -154,7 +166,14 @@ func main() {
 			for _, ed := range exportedDecl {
 				if strings.Contains(se, ed) {
 					// find relative path of related file
-					rel, err := filepath.Rel(filepath.Dir(fileName), file)
+					var basePath string
+					if modPath == "" {
+						basePath = filepath.Dir(fileName)
+					} else {
+						basePath = modPath
+					}
+
+					rel, err := filepath.Rel(basePath, file)
 					if err != nil {
 						log.Fatal(err)
 					}

packages/now-lambda/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/lambda",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "license": "MIT",
   "repository": {
     "type": "git",

packages/now-lambda/test/fixtures/01-cowsay/now.json

@@ -1,11 +1,22 @@
 {
   "version": 2,
   "builds": [
-    { "src": "index.zip", "use": "@now/lambda", "config": { "handler": "index.handler", "runtime": "nodejs8.10" } },
-    { "src": "subdirectory/index.zip", "use": "@now/lambda", "config": { "handler": "index.handler", "runtime": "nodejs8.10" } }
+    {
+      "src": "index.zip",
+      "use": "@now/lambda",
+      "config": { "handler": "index.handler", "runtime": "nodejs8.10" }
+    },
+    {
+      "src": "subdirectory/index.zip",
+      "use": "@now/lambda",
+      "config": { "handler": "index.handler", "runtime": "nodejs8.10" }
+    }
   ],
   "probes": [
     { "path": "/", "mustContain": "cow:NO_REPLACE_TO_AVOID_CRC_MISMATCH" },
-    { "path": "/subdirectory/", "mustContain": "yoda:NO_REPLACE_TO_AVOID_CRC_MISMATCH" }
+    {
+      "path": "/subdirectory/",
+      "mustContain": "yoda:NO_REPLACE_TO_AVOID_CRC_MISMATCH"
+    }
   ]
 }

packages/now-md/index.js

@@ -39,4 +39,7 @@ exports.build = async ({ files, entrypoint, config }) => {
   return { [replacedEntrypoint]: result };
 };
 
-exports.shouldServe = shouldServe;
+exports.shouldServe = (options) => {
+  const requestPath = options.requestPath.replace(/\.html$/, '.md');
+  return shouldServe({ ...options, requestPath });
+};

packages/now-md/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/md",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "license": "MIT",
   "repository": {
     "type": "git",

packages/now-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/next",
-  "version": "0.3.4-canary.3",
+  "version": "0.4.2",
   "license": "MIT",
   "main": "./dist/index",
   "scripts": {
@@ -14,7 +14,7 @@
     "directory": "packages/now-next"
   },
   "dependencies": {
-    "@now/node-bridge": "^1.1.3-canary.0",
+    "@now/node-bridge": "^1.2.0",
     "fs-extra": "^7.0.0",
     "get-port": "^5.0.0",
     "resolve-from": "^5.0.0",

packages/now-next/src/index.ts

@@ -36,6 +36,8 @@ import {
   stringMap,
   syncEnvVars,
   validateEntrypoint,
+  normalizePage,
+  getDynamicRoutes,
 } from './utils';
 
 interface BuildParamsMeta {
@@ -155,7 +157,7 @@ export const build = async ({
   entrypoint,
   meta = {} as BuildParamsMeta,
 }: BuildParamsType): Promise<{
-  routes?: { src: string; dest: string }[];
+  routes?: ({ src?: string; dest?: string } | { handle: string })[];
   output: Files;
   watch?: string[];
   childProcesses: ChildProcess[];
@@ -164,7 +166,7 @@ export const build = async ({
 
   const entryDirectory = path.dirname(entrypoint);
   const entryPath = path.join(workPath, entryDirectory);
-  const dotNext = path.join(entryPath, '.next');
+  const dotNextStatic = path.join(entryPath, '.next/static');
 
   console.log(`${name} Downloading user files...`);
   await download(files, workPath, meta);
@@ -213,13 +215,19 @@ export const build = async ({
 
     return {
       output: {},
-      routes: getRoutes(entryDirectory, pathsInside, files, urls[entrypoint]),
+      routes: getRoutes(
+        entryPath,
+        entryDirectory,
+        pathsInside,
+        files,
+        urls[entrypoint]
+      ),
       watch: pathsInside,
       childProcesses: childProcess ? [childProcess] : [],
     };
   }
 
-  if (await pathExists(dotNext)) {
+  if (await pathExists(dotNextStatic)) {
     console.warn(
       'WARNING: You should not upload the `.next` directory. See https://zeit.co/docs/v2/deployments/official-builders/next-js-now-next/ for more details.'
     );
@@ -251,14 +259,15 @@ export const build = async ({
     console.log('normalized package.json result: ', packageJson);
     await writePackageJson(entryPath, packageJson);
   } else if (!pkg.scripts || !pkg.scripts['now-build']) {
-    console.warn(
-      'WARNING: "now-build" script not found. Adding \'"now-build": "next build"\' to "package.json" automatically'
+    console.log(
+      'Your application is being built using `next build`. ' +
+        'If you need to define a different build step, please create a `now-build` script in your `package.json` ' +
+        '(e.g. `{ "scripts": { "now-build": "npm run prepare && next build" } }`).'
     );
     pkg.scripts = {
       'now-build': 'next build',
       ...(pkg.scripts || {}),
     };
-    console.log('normalized package.json result: ', pkg);
     await writePackageJson(entryPath, pkg);
   }
 
@@ -288,9 +297,10 @@ export const build = async ({
     await unlinkFile(path.join(entryPath, '.npmrc'));
   }
 
-  const routes: { src: string; dest: string }[] = [];
+  const exportedPageRoutes: { src: string; dest: string }[] = [];
   const lambdas: { [key: string]: Lambda } = {};
   const staticPages: { [key: string]: FileFsRef } = {};
+  const dynamicPages: string[] = [];
 
   if (isLegacy) {
     const filesAfterBuild = await glob('**', entryPath);
@@ -315,7 +325,9 @@ export const build = async ({
       file => file.startsWith('node_modules/.cache')
     );
     const launcherFiles = {
-      'now__bridge.js': new FileFsRef({ fsPath: require('@now/node-bridge') }),
+      'now__bridge.js': new FileFsRef({
+        fsPath: require('@now/node-bridge'),
+      }),
     };
     const nextFiles: { [key: string]: FileFsRef } = {
       ...nodeModules,
@@ -377,7 +389,9 @@ export const build = async ({
   } else {
     console.log('preparing lambda files...');
     const launcherFiles = {
-      'now__bridge.js': new FileFsRef({ fsPath: require('@now/node-bridge') }),
+      'now__bridge.js': new FileFsRef({
+        fsPath: require('@now/node-bridge'),
+      }),
       'now__launcher.js': new FileFsRef({
         fsPath: path.join(__dirname, 'launcher.js'),
       }),
@@ -392,9 +406,14 @@ export const build = async ({
       staticPages[staticRoute] = staticPageFiles[page];
 
       const pathname = page.replace(/\.html$/, '');
-      routes.push({
-        src: path.join(entryDirectory, pathname),
-        dest: staticRoute,
+
+      if (pathname.startsWith('$') || pathname.includes('/$')) {
+        dynamicPages.push(pathname);
+      }
+
+      exportedPageRoutes.push({
+        src: `^${path.join('/', entryDirectory, pathname)}$`,
+        dest: path.join('/', staticRoute),
       });
     });
 
@@ -429,12 +448,16 @@ export const build = async ({
     await Promise.all(
       pageKeys.map(async page => {
         // These default pages don't have to be handled as they'd always 404
-        if (['_app.js', '_error.js', '_document.js'].includes(page)) {
+        if (['_app.js', '_document.js'].includes(page)) {
           return;
         }
 
         const pathname = page.replace(/\.js$/, '');
 
+        if (pathname.startsWith('$') || pathname.includes('/$')) {
+          dynamicPages.push(normalizePage(pathname));
+        }
+
         console.log(`Creating lambda for page: "${page}"...`);
         lambdas[path.join(entryDirectory, pathname)] = await createLambda({
           files: {
@@ -481,6 +504,19 @@ export const build = async ({
     {}
   );
 
+  let dynamicRoutes = getDynamicRoutes(
+    entryPath,
+    entryDirectory,
+    dynamicPages
+  ).map(route => {
+    // make sure .html is added to dest for now until
+    // outputting static files to clean routes is available
+    if (staticPages[`${route.dest}.html`.substr(1)]) {
+      route.dest = `${route.dest}.html`;
+    }
+    return route;
+  });
+
   return {
     output: {
       ...publicFiles,
@@ -489,7 +525,23 @@ export const build = async ({
       ...staticFiles,
       ...staticDirectoryFiles,
     },
-    routes,
+    routes: [
+      // Static exported pages (.html rewrites)
+      ...exportedPageRoutes,
+      // Next.js page lambdas, `static/` folder, reserved assets, and `public/`
+      // folder
+      { handle: 'filesystem' },
+      // Dynamic routes
+      ...dynamicRoutes,
+      ...(isLegacy
+        ? []
+        : [
+            {
+              src: path.join('/', entryDirectory, '.*'),
+              dest: path.join('/', entryDirectory, '_error'),
+            },
+          ]),
+    ],
     watch: [],
     childProcesses: [],
   };

packages/now-next/src/legacy-launcher.ts

@@ -4,7 +4,8 @@ import url from 'url';
 import { Bridge } from './now__bridge';
 
 if (!process.env.NODE_ENV) {
-  process.env.NODE_ENV = process.env.NOW_REGION === 'dev1' ? 'development' : 'production';
+  process.env.NODE_ENV =
+    process.env.NOW_REGION === 'dev1' ? 'development' : 'production';
 }
 
 const app = next({});

packages/now-next/src/utils.ts

@@ -1,5 +1,6 @@
 import fs from 'fs-extra';
 import path from 'path';
+import resolveFrom from 'resolve-from';
 import { Files } from '@now/build-utils';
 
 type stringMap = { [key: string]: string };
@@ -168,7 +169,18 @@ function getPathsInside(entryDirectory: string, files: Files) {
   return watch;
 }
 
+function normalizePage(page: string): string {
+  // remove '/index' from the end
+  page = page.replace(/\/index$/, '/');
+  // Resolve on anything that doesn't start with `/`
+  if (!page.startsWith('/')) {
+    page = `/${page}`;
+  }
+  return page;
+}
+
 function getRoutes(
+  entryPath: string,
   entryDirectory: string,
   pathsInside: string[],
   files: Files,
@@ -196,6 +208,7 @@ function getRoutes(
     },
   ];
   const filePaths = Object.keys(filesInside);
+  const dynamicPages = [];
 
   for (const file of filePaths) {
     const relativePath = path.relative(entryDirectory, file);
@@ -213,6 +226,10 @@ function getRoutes(
       continue;
     }
 
+    if (pageName.startsWith('$') || pageName.includes('/$')) {
+      dynamicPages.push(normalizePage(pageName));
+    }
+
     routes.push({
       src: `${prefix}${pageName}`,
       dest: `${url}/${pageName}`,
@@ -228,6 +245,17 @@ function getRoutes(
     }
   }
 
+  routes.push(
+    ...getDynamicRoutes(entryPath, entryDirectory, dynamicPages).map(
+      (route: { src: string; dest: string }) => {
+        // convert to make entire RegExp match as one group
+        route.src = route.src.replace('^', '^(').replace('$', ')$');
+        route.dest = `${url}/$1`;
+        return route;
+      }
+    )
+  );
+
   // Add public folder routes
   for (const file of filePaths) {
     const relativePath = path.relative(entryDirectory, file);
@@ -250,6 +278,52 @@ function getRoutes(
   return routes;
 }
 
+export function getDynamicRoutes(
+  entryPath: string,
+  entryDirectory: string,
+  dynamicPages: string[]
+): { src: string; dest: string }[] {
+  if (!dynamicPages.length) {
+    return [];
+  }
+
+  let getRouteRegex:
+    | ((pageName: string) => { re: RegExp })
+    | undefined = undefined;
+
+  let getSortedRoutes: ((normalizedPages: string[]) => string[]) | undefined;
+
+  try {
+    ({ getRouteRegex, getSortedRoutes } = require(resolveFrom(
+      entryPath,
+      'next-server/dist/lib/router/utils'
+    )));
+    if (typeof getRouteRegex !== 'function') {
+      getRouteRegex = undefined;
+    }
+  } catch (_) {}
+
+  if (!getRouteRegex || !getSortedRoutes) {
+    throw new Error(
+      'Found usage of dynamic routes but not on a new enough version of Next.js.'
+    );
+  }
+
+  const pageMatchers = getSortedRoutes(dynamicPages).map(pageName => ({
+    pageName,
+    matcher: getRouteRegex!(pageName).re,
+  }));
+
+  const routes: { src: string; dest: string }[] = [];
+  pageMatchers.forEach(pageMatcher => {
+    routes.push({
+      src: pageMatcher.matcher.source,
+      dest: path.join('/', entryDirectory, pageMatcher.pageName),
+    });
+  });
+  return routes;
+}
+
 function syncEnvVars(base: EnvConfig, removeEnv: EnvConfig, addEnv: EnvConfig) {
   // Remove any env vars from `removeEnv`
   // that are not present in the `addEnv`
@@ -276,4 +350,5 @@ export {
   getRoutes,
   stringMap,
   syncEnvVars,
+  normalizePage,
 };

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

@@ -12,10 +12,12 @@ it(
     } = await runBuildLambda(path.join(__dirname, 'standard'));
     expect(output.index).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();
   },
   FOUR_MINUTES,
 );

packages/now-next/test/integration/legacy-custom-dependency/now.json

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

packages/now-next/test/integration/legacy-custom-dependency/package.json

@@ -3,4 +3,4 @@
     "isomorphic-unfetch": "latest",
     "next": "7.0.0"
   }
-}
+}

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

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

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

@@ -2,4 +2,4 @@
   "dependencies": {
     "next": "^7.0.2"
   }
-}
+}

packages/now-next/test/integration/legacy-static-files/now.json

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

packages/now-next/test/integration/legacy-static-files/package.json

@@ -2,4 +2,4 @@
   "dependencies": {
     "next": "7.0.2"
   }
-}
+}

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

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

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

@@ -1,6 +1,4 @@
 {
   "version": 2,
-  "builds": [
-    {"src": "pages/index.js", "use": "@now/next"}
-  ]
+  "builds": [{ "src": "pages/index.js", "use": "@now/next" }]
 }

packages/now-next/test/integration/public-files/now.json

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

packages/now-next/test/integration/public-files/package.json

@@ -7,4 +7,4 @@
     "react": "16",
     "react-dom": "16"
   }
-}
+}

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

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

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

@@ -4,4 +4,4 @@
     "react": "latest",
     "react-dom": "latest"
   }
-}
+}

packages/now-next/test/integration/static-files/now.json

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

packages/now-next/test/integration/static-files/package.json

@@ -7,4 +7,4 @@
     "react": "16",
     "react-dom": "16"
   }
-}
+}

packages/now-next/tsconfig.json

@@ -9,10 +9,6 @@
     "sourceMap": false,
     "declaration": false
   },
-  "include": [
-    "src/**/*"
-  ],
-  "exclude": [
-    "node_modules"
-  ]
+  "include": ["src/**/*"],
+  "exclude": ["node_modules"]
 }

packages/now-node-bridge/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/node-bridge",
-  "version": "1.1.3-canary.0",
+  "version": "1.2.0",
   "license": "MIT",
   "main": "./index.js",
   "repository": {

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

@@ -95,9 +95,13 @@ export class Bridge {
   private server: Server | 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) {
+  constructor(server?: Server, shouldStoreEvents: boolean = false) {
     this.server = null;
+    this.shouldStoreEvents = shouldStoreEvents;
     if (server) {
       this.setServer(server);
     }
@@ -144,15 +148,16 @@ export class Bridge {
     context.callbackWaitsForEmptyEventLoop = false;
     const { port } = await this.listening;
 
-    const { isApiGateway, method, path, headers, body } = normalizeEvent(event);
+    const normalizedEvent = normalizeEvent(event);
+    const { isApiGateway, method, path, headers, body } = normalizedEvent;
 
-    const opts = {
-      hostname: '127.0.0.1',
-      port,
-      path,
-      method,
-      headers,
-    };
+    if (this.shouldStoreEvents) {
+      const reqId = `${this.reqIdSeed++}`;
+      this.events[reqId] = normalizedEvent;
+      headers['x-now-bridge-request-id'] = reqId;
+    }
+
+    const opts = { hostname: '127.0.0.1', port, path, method, headers };
 
     // eslint-disable-next-line consistent-return
     return new Promise((resolve, reject) => {
@@ -192,4 +197,10 @@ export class Bridge {
       req.end();
     });
   }
+
+  consumeEvent(reqId: string) {
+    const event = this.events[reqId];
+    delete this.events[reqId];
+    return event;
+  }
 }

packages/now-node-bridge/test/bridge.test.js

@@ -83,3 +83,41 @@ test('`NowProxyEvent` normalizing', async () => {
 
   server.close();
 });
+
+test('consumeEvent', async () => {
+  const mockListener = jest.fn((req, res) => {
+    res.end('hello');
+  });
+
+  const server = new Server(mockListener);
+  const bridge = new Bridge(server, true);
+  bridge.listen();
+
+  const context = { callbackWaitsForEmptyEventLoop: true };
+  await bridge.launcher(
+    {
+      Action: 'Invoke',
+      body: JSON.stringify({
+        method: 'POST',
+        headers: { foo: 'baz' },
+        path: '/nowproxy',
+        body: 'body=1',
+      }),
+    },
+    context
+  );
+
+  const headers = mockListener.mock.calls[0][0].headers;
+  const reqId = headers['x-now-bridge-request-id'];
+
+  expect(reqId).toBeTruthy();
+
+  const event = bridge.consumeEvent(reqId);
+  expect(event.body.toString()).toBe('body=1');
+
+  // an event can't be consumed multiple times
+  // to avoid memory leaks
+  expect(bridge.consumeEvent(reqId)).toBeUndefined();
+
+  server.close();
+});

packages/now-node-bridge/tsconfig.json

@@ -9,10 +9,6 @@
     "sourceMap": true,
     "declaration": true
   },
-  "include": [
-    "src/**/*"
-  ],
-  "exclude": [
-    "node_modules"
-  ]
+  "include": ["src/**/*"],
+  "exclude": ["node_modules"]
 }

packages/now-node-server/index.js

@@ -105,7 +105,10 @@ exports.build = async ({
 }) => {
   const [downloadedFiles, entrypointFsDirname] = await downloadInstallAndBundle(
     {
-      files, entrypoint, workPath, meta,
+      files,
+      entrypoint,
+      workPath,
+      meta,
     },
     { npmArguments: ['--prefer-offline'] },
   );

packages/now-node-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/node-server",
-  "version": "0.7.3-canary.0",
+  "version": "0.7.5",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -8,7 +8,7 @@
     "directory": "packages/now-node-server"
   },
   "dependencies": {
-    "@now/node-bridge": "^1.1.3-canary.0",
+    "@now/node-bridge": "^1.2.0",
     "@zeit/ncc": "0.18.5",
     "fs-extra": "7.0.1"
   },

packages/now-node-server/test/fixtures/06-content-type/now.json

@@ -1,6 +1,4 @@
 {
   "version": 2,
-  "builds": [
-    { "src": "index.js", "use": "@now/node-server" }
-  ]
+  "builds": [{ "src": "index.js", "use": "@now/node-server" }]
 }

packages/now-node-server/test/fixtures/08-assets/now.json

@@ -1,9 +1,10 @@
 {
   "version": 2,
-  "builds": [
-    { "src": "index.js", "use": "@now/node-server" }
-  ],
+  "builds": [{ "src": "index.js", "use": "@now/node-server" }],
   "probes": [
-    { "path": "/", "mustContain": "asset1:RANDOMNESS_PLACEHOLDER,asset2:RANDOMNESS_PLACEHOLDER" }
+    {
+      "path": "/",
+      "mustContain": "asset1:RANDOMNESS_PLACEHOLDER,asset2:RANDOMNESS_PLACEHOLDER"
+    }
   ]
 }

packages/now-node-server/test/fixtures/09-no-bundle/now.json

@@ -2,10 +2,20 @@
   "version": 2,
   "builds": [
     { "src": "with-bundle/index.js", "use": "@now/node-server" },
-    { "src": "without-bundle/index.js", "use": "@now/node-server", "config": { "bundle": false } }
+    {
+      "src": "without-bundle/index.js",
+      "use": "@now/node-server",
+      "config": { "bundle": false }
+    }
   ],
   "probes": [
-    { "path": "/with-bundle", "mustContain": "RANDOMNESS_PLACEHOLDER:with-bundle" },
-    { "path": "/without-bundle", "mustContain": "RANDOMNESS_PLACEHOLDER:without-bundle" }
+    {
+      "path": "/with-bundle",
+      "mustContain": "RANDOMNESS_PLACEHOLDER:with-bundle"
+    },
+    {
+      "path": "/without-bundle",
+      "mustContain": "RANDOMNESS_PLACEHOLDER:without-bundle"
+    }
   ]
 }

packages/now-node-server/test/fixtures/09-no-bundle/with-bundle/index.js

@@ -2,7 +2,11 @@ const http = require('http');
 const isBundled = require('./is-bundled.js');
 
 const server = http.createServer((req, resp) => {
-  resp.end(isBundled() ? 'RANDOMNESS_PLACEHOLDER:with-bundle' : 'WITHOUT-BUNDLE-THAT-IS-WRONG');
+  resp.end(
+    isBundled()
+      ? 'RANDOMNESS_PLACEHOLDER:with-bundle'
+      : 'WITHOUT-BUNDLE-THAT-IS-WRONG',
+  );
 });
 
 server.listen();

packages/now-node-server/test/fixtures/09-no-bundle/without-bundle/index.js

@@ -2,7 +2,11 @@ const http = require('http');
 const isBundled = require('./is-bundled.js');
 
 const server = http.createServer((req, resp) => {
-  resp.end(isBundled() ? 'WITH-BUNDLE-THAT-IS-WRONG' : 'RANDOMNESS_PLACEHOLDER:without-bundle');
+  resp.end(
+    isBundled()
+      ? 'WITH-BUNDLE-THAT-IS-WRONG'
+      : 'RANDOMNESS_PLACEHOLDER:without-bundle',
+  );
 });
 
 server.listen();

packages/now-node-server/test/fixtures/10-others/now.json

@@ -1,12 +1,13 @@
 {
   "version": 2,
-  "builds": [
-    { "src": "apollo/index.js", "use": "@now/node-server" }
-  ],
-  "routes": [
-    { "src": "/.*", "dest": "apollo/index.js" }
-  ],
+  "builds": [{ "src": "apollo/index.js", "use": "@now/node-server" }],
+  "routes": [{ "src": "/.*", "dest": "apollo/index.js" }],
   "probes": [
-    { "path": "/graphql", "method": "POST", "body": { "query": "{hello}" }, "mustContain": "apollo:RANDOMNESS_PLACEHOLDER" }
+    {
+      "path": "/graphql",
+      "method": "POST",
+      "body": { "query": "{hello}" },
+      "mustContain": "apollo:RANDOMNESS_PLACEHOLDER"
+    }
   ]
 }

packages/now-node-server/test/fixtures/11-include-files/now.json

@@ -5,9 +5,7 @@
       "src": "index.js",
       "use": "@now/node-server",
       "config": {
-        "includeFiles": [
-          "templates/**"
-        ]
+        "includeFiles": ["templates/**"]
       }
     },
     {
@@ -24,4 +22,4 @@
       "mustContain": "Hello Now!"
     }
   ]
-}
+}

packages/now-node/.gitignore

@@ -1,2 +1,3 @@
 /dist
 /src/bridge.d.ts
+/test/fixtures/**/types.d.ts

packages/now-node/@types/zeit__ncc/index.d.ts

@@ -0,0 +1,45 @@
+declare function ncc(
+  entrypoint: string,
+  options?: ncc.NccOptions
+): ncc.NccResult;
+
+declare namespace ncc {
+  export interface NccOptions {
+    watch?: any;
+    sourceMap?: boolean;
+    sourceMapRegister?: boolean;
+  }
+
+  export interface Asset {
+    source: Buffer;
+    permissions: number;
+  }
+
+  export interface Assets {
+    [name: string]: Asset;
+  }
+
+  export interface BuildResult {
+    err: Error | null | undefined;
+    code: string;
+    map: string | undefined;
+    assets: Assets | undefined;
+    permissions: number | undefined;
+  }
+
+  export type HandlerFn = (params: BuildResult) => void;
+  export type HandlerCallback = (fn: HandlerFn) => void;
+  export type RebuildFn = () => void;
+  export type RebuildCallback = (fn: RebuildFn) => void;
+  export type CloseCallback = () => void;
+
+  export interface NccResult {
+    handler: HandlerCallback;
+    rebuild: RebuildCallback;
+    close: CloseCallback;
+  }
+}
+
+declare module '@zeit/ncc' {
+  export = ncc;
+}

packages/now-node/build.sh

@@ -9,4 +9,16 @@ if [ ! -e "$bridge_defs" ]; then
 fi
 
 cp -v "$bridge_defs" src
+
+# build ts files
 tsc
+
+# 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,6 +1,6 @@
 {
   "name": "@now/node",
-  "version": "0.7.3-canary.0",
+  "version": "0.9.0",
   "license": "MIT",
   "main": "./dist/index",
   "repository": {
@@ -9,8 +9,10 @@
     "directory": "packages/now-node"
   },
   "dependencies": {
-    "@now/node-bridge": "^1.1.3-canary.0",
+    "@now/node-bridge": "^1.2.0",
+    "@types/node": "*",
     "@zeit/ncc": "0.18.5",
+    "@zeit/ncc-watcher": "1.0.3",
     "fs-extra": "7.0.1"
   },
   "scripts": {
@@ -22,8 +24,13 @@
     "dist"
   ],
   "devDependencies": {
-    "@types/node": "11.9.4",
-    "jest": "24.1.0",
+    "@types/content-type": "1.1.3",
+    "@types/cookie": "0.3.3",
+    "@types/test-listen": "1.1.0",
+    "content-type": "1.0.4",
+    "cookie": "0.4.0",
+    "node-fetch": "2.6.0",
+    "test-listen": "1.1.0",
     "typescript": "3.3.3"
   }
 }

packages/now-node/src/example-import.ts

@@ -0,0 +1,3 @@
+// we intentionally import these types here
+// to test that they are exported from index
+import { NowRequest, NowResponse } from './index';

packages/now-node/src/helpers.ts

@@ -0,0 +1,204 @@
+import {
+  NowRequest,
+  NowResponse,
+  NowRequestCookies,
+  NowRequestQuery,
+  NowRequestBody,
+} from './types';
+import { Stream } from 'stream';
+import { Server } from 'http';
+import { Bridge } from './bridge';
+
+function getBodyParser(req: NowRequest, body: Buffer) {
+  return function parseBody(): NowRequestBody {
+    if (!req.headers['content-type']) {
+      return undefined;
+    }
+
+    const { parse: parseCT } = require('content-type');
+    const { type } = parseCT(req.headers['content-type']);
+
+    if (type === 'application/json') {
+      try {
+        return JSON.parse(body.toString());
+      } catch (error) {
+        throw new ApiError(400, 'Invalid JSON');
+      }
+    }
+
+    if (type === 'application/octet-stream') {
+      return body;
+    }
+
+    if (type === 'application/x-www-form-urlencoded') {
+      const { parse: parseQS } = require('querystring');
+      // remark : querystring.parse does not produce an iterable object
+      // https://nodejs.org/api/querystring.html#querystring_querystring_parse_str_sep_eq_options
+      return parseQS(body.toString());
+    }
+
+    if (type === 'text/plain') {
+      return body.toString();
+    }
+
+    return undefined;
+  };
+}
+
+function getQueryParser({ url = '/' }: NowRequest) {
+  return function parseQuery(): NowRequestQuery {
+    const { URL } = require('url');
+    // we provide a placeholder base url because we only want searchParams
+    const params = new URL(url, 'https://n').searchParams;
+
+    const query: { [key: string]: string | string[] } = {};
+    for (const [key, value] of params) {
+      query[key] = value;
+    }
+
+    return query;
+  };
+}
+
+function getCookieParser(req: NowRequest) {
+  return function parseCookie(): NowRequestCookies {
+    const header: undefined | string | string[] = req.headers.cookie;
+
+    if (!header) {
+      return {};
+    }
+
+    const { parse } = require('cookie');
+    return parse(Array.isArray(header) ? header.join(';') : header);
+  };
+}
+
+function sendStatusCode(res: NowResponse, statusCode: number): NowResponse {
+  res.statusCode = statusCode;
+  return res;
+}
+
+function sendData(res: NowResponse, body: any): NowResponse {
+  if (body === null) {
+    res.end();
+    return res;
+  }
+
+  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');
+
+  // Use send to handle request
+  return res.send(jsonBody);
+}
+
+export class ApiError extends Error {
+  readonly statusCode: number;
+
+  constructor(statusCode: number, message: string) {
+    super(message);
+    this.statusCode = statusCode;
+  }
+}
+
+export function sendError(
+  res: NowResponse,
+  statusCode: number,
+  message: string
+) {
+  res.statusCode = statusCode;
+  res.statusMessage = message;
+  res.end();
+}
+
+function setLazyProp<T>(req: NowRequest, prop: string, getter: () => T) {
+  const opts = { configurable: true, enumerable: true };
+  const optsReset = { ...opts, writable: true };
+
+  Object.defineProperty(req, prop, {
+    ...opts,
+    get: () => {
+      const value = getter();
+      // we set the property on the object to avoid recalculating it
+      Object.defineProperty(req, prop, { ...optsReset, value });
+      return value;
+    },
+    set: value => {
+      Object.defineProperty(req, prop, { ...optsReset, value });
+    },
+  });
+}
+
+export function createServerWithHelpers(
+  listener: (req: NowRequest, res: NowResponse) => void | Promise<void>,
+  bridge: Bridge
+) {
+  const server = new Server(async (_req, _res) => {
+    const req = _req as NowRequest;
+    const res = _res as NowResponse;
+
+    try {
+      const reqId = req.headers['x-now-bridge-request-id'];
+
+      // don't expose this header to the client
+      delete req.headers['x-now-bridge-request-id'];
+
+      if (typeof reqId !== 'string') {
+        throw new ApiError(500, 'Internal Server Error');
+      }
+
+      const event = bridge.consumeEvent(reqId);
+
+      setLazyProp<NowRequestCookies>(req, 'cookies', getCookieParser(req));
+      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);
+
+      await listener(req, res);
+    } catch (err) {
+      if (err instanceof ApiError) {
+        sendError(res, err.statusCode, err.message);
+      } else {
+        throw err;
+      }
+    }
+  });
+
+  return server;
+}

packages/now-node/src/index.ts

@@ -1,5 +1,7 @@
-import { join, dirname, sep } from 'path';
 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';
 import {
   glob,
   download,
@@ -14,6 +16,7 @@ import {
   BuildOptions,
   shouldServe,
 } from '@now/build-utils';
+export { NowRequest, NowResponse } from './types';
 
 interface CompilerConfig {
   includeFiles?: string | string[];
@@ -23,8 +26,25 @@ interface DownloadOptions {
   files: Files;
   entrypoint: string;
   workPath: string;
-  meta?: Meta;
-  npmArguments?: string[];
+  meta: Meta;
+}
+
+const watchers: Map<string, NccWatcher> = new Map();
+
+function getWatcher(entrypoint: string, options: NccOptions): NccWatcher {
+  let watcher = watchers.get(entrypoint);
+  if (!watcher) {
+    watcher = new NccWatcher(entrypoint, options);
+    watchers.set(entrypoint, watcher);
+  }
+  return watcher;
+}
+
+function toBuffer(data: string | Buffer): Buffer {
+  if (typeof data === 'string') {
+    return Buffer.from(data, 'utf8');
+  }
+  return data;
 }
 
 async function downloadInstallAndBundle({
@@ -32,32 +52,64 @@ async function downloadInstallAndBundle({
   entrypoint,
   workPath,
   meta,
-  npmArguments = [],
 }: DownloadOptions) {
   console.log('downloading user files...');
   const downloadedFiles = await download(files, workPath, meta);
 
   console.log("installing dependencies for user's code...");
   const entrypointFsDirname = join(workPath, dirname(entrypoint));
-  await runNpmInstall(entrypointFsDirname, npmArguments);
+  await runNpmInstall(entrypointFsDirname, ['--prefer-offline']);
 
   const entrypointPath = downloadedFiles[entrypoint].fsPath;
   return { entrypointPath, entrypointFsDirname };
 }
 
 async function compile(
+  workPath: string,
   entrypointPath: string,
   entrypoint: string,
-  config: CompilerConfig
-): Promise<Files> {
+  config: CompilerConfig,
+  { isDev, filesChanged, filesRemoved }: Meta
+): Promise<{ preparedFiles: Files; watch: string[] }> {
   const input = entrypointPath;
   const inputDir = dirname(input);
   const rootIncludeFiles = inputDir.split(sep).pop() || '';
-  const ncc = require('@zeit/ncc');
-  const { code, map, assets } = await ncc(input, {
+  const options: NccOptions = {
     sourceMap: true,
     sourceMapRegister: true,
-  });
+  };
+  let code: string;
+  let map: string | undefined;
+  let assets: Assets | undefined;
+  let watch: string[] = [];
+  if (isDev) {
+    const watcher = getWatcher(entrypointPath, options);
+    const result = await watcher.build(
+      Array.isArray(filesChanged)
+        ? filesChanged.map(f => join(workPath, f))
+        : undefined,
+      Array.isArray(filesRemoved)
+        ? filesRemoved.map(f => join(workPath, f))
+        : undefined
+    );
+    code = result.code;
+    map = result.map;
+    assets = result.assets;
+    watch = [...result.files, ...result.dirs, ...result.missing]
+      .filter(f => f.startsWith(workPath))
+      .map(f => relative(workPath, f));
+  } else {
+    const ncc = require('@zeit/ncc');
+    const result = await ncc(input, {
+      sourceMap: true,
+      sourceMapRegister: true,
+    });
+    code = result.code;
+    map = result.map;
+    assets = result.assets;
+  }
+
+  if (!assets) assets = {};
 
   if (config && config.includeFiles) {
     const includeFiles =
@@ -81,7 +133,7 @@ async function compile(
         }
 
         assets[fullPath] = {
-          source: data,
+          source: toBuffer(data),
           permissions: mode,
         };
       }
@@ -89,11 +141,15 @@ async function compile(
   }
 
   const preparedFiles: Files = {};
-  // move all user code to 'user' subdirectory
   preparedFiles[entrypoint] = new FileBlob({ data: code });
-  preparedFiles[`${entrypoint.replace('.ts', '.js')}.map`] = new FileBlob({
-    data: map,
-  });
+
+  if (map) {
+    preparedFiles[`${entrypoint.replace('.ts', '.js')}.map`] = new FileBlob({
+      data: toBuffer(map),
+    });
+  }
+
+  // move all user code to 'user' subdirectory
   // eslint-disable-next-line no-restricted-syntax
   for (const assetName of Object.keys(assets)) {
     const { source: data, permissions: mode } = assets[assetName];
@@ -101,9 +157,11 @@ async function compile(
     preparedFiles[join(dirname(entrypoint), assetName)] = blob2;
   }
 
-  return preparedFiles;
+  return { preparedFiles, watch };
 }
 
+export const version = 2;
+
 export const config = {
   maxLambdaSize: '5mb',
 };
@@ -113,8 +171,10 @@ export async function build({
   entrypoint,
   workPath,
   config,
-  meta,
+  meta = {},
 }: BuildOptions) {
+  const shouldAddHelpers = !(config && config.helpers === false);
+
   const {
     entrypointPath,
     entrypointFsDirname,
@@ -123,37 +183,62 @@ export async function build({
     entrypoint,
     workPath,
     meta,
-    npmArguments: ['--prefer-offline'],
   });
 
   console.log('running user script...');
   await runPackageJsonScript(entrypointFsDirname, 'now-build');
 
   console.log('compiling entrypoint with ncc...');
-  const preparedFiles = await compile(entrypointPath, entrypoint, config);
+  const { preparedFiles, watch } = await compile(
+    workPath,
+    entrypointPath,
+    entrypoint,
+    config,
+    meta
+  );
   const launcherPath = join(__dirname, 'launcher.js');
   let launcherData = await readFile(launcherPath, 'utf8');
 
   launcherData = launcherData.replace(
-    '// PLACEHOLDER',
+    '// PLACEHOLDER:shouldStoreProxyRequests',
+    shouldAddHelpers ? 'shouldStoreProxyRequests = true;' : ''
+  );
+
+  launcherData = launcherData.replace(
+    '// PLACEHOLDER:setServer',
     [
-      `listener = require("./${entrypoint}");`,
+      `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 = {
+  const launcherFiles: Files = {
     'launcher.js': new FileBlob({ data: launcherData }),
     'bridge.js': new FileFsRef({ fsPath: require('@now/node-bridge') }),
   };
 
+  if (shouldAddHelpers) {
+    launcherFiles['helpers.js'] = new FileFsRef({
+      fsPath: join(__dirname, 'helpers.js'),
+    });
+  }
+
   const lambda = await createLambda({
-    files: { ...preparedFiles, ...launcherFiles },
+    files: {
+      ...preparedFiles,
+      ...launcherFiles,
+    },
     handler: 'launcher.launcher',
     runtime: 'nodejs8.10',
   });
 
-  return { [entrypoint]: lambda };
+  const output = { [entrypoint]: lambda };
+  const result = { output, watch };
+  return result;
 }
 
 export async function prepareCache({ workPath }: PrepareCacheOptions) {

packages/now-node/src/launcher.ts

@@ -1,18 +1,23 @@
-import { Server } from 'http';
 import { Bridge } from './bridge';
 
-let listener;
+let shouldStoreProxyRequests: boolean = false;
+// PLACEHOLDER:shouldStoreProxyRequests
+
+const bridge = new Bridge(undefined, shouldStoreProxyRequests);
 
 if (!process.env.NODE_ENV) {
-  process.env.NODE_ENV = process.env.NOW_REGION === 'dev1' ? 'development' : 'production';
+  process.env.NODE_ENV =
+    process.env.NOW_REGION === 'dev1' ? 'development' : 'production';
 }
 
 try {
-// PLACEHOLDER
+  // PLACEHOLDER:setServer
 } 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);
@@ -20,8 +25,6 @@ try {
   }
 }
 
-const server = new Server(listener);
-const bridge = new Bridge(server);
 bridge.listen();
 
 exports.launcher = bridge.launcher;

packages/now-node/src/types.ts

@@ -0,0 +1,17 @@
+import { ServerResponse, IncomingMessage } from 'http';
+
+export type NowRequestCookies = { [key: string]: string };
+export type NowRequestQuery = { [key: string]: string | string[] };
+export type NowRequestBody = any;
+
+export type NowRequest = IncomingMessage & {
+  query: NowRequestQuery;
+  cookies: NowRequestCookies;
+  body: NowRequestBody;
+};
+
+export type NowResponse = ServerResponse & {
+  send: (body: any) => NowResponse;
+  json: (body: any) => NowResponse;
+  status: (statusCode: number) => NowResponse;
+};

packages/now-node/test/fixtures/08-assets/now.json

@@ -1,9 +1,10 @@
 {
   "version": 2,
-  "builds": [
-    { "src": "index.js", "use": "@now/node" }
-  ],
+  "builds": [{ "src": "index.js", "use": "@now/node" }],
   "probes": [
-    { "path": "/", "mustContain": "asset1:RANDOMNESS_PLACEHOLDER,asset2:RANDOMNESS_PLACEHOLDER" }
+    {
+      "path": "/",
+      "mustContain": "asset1:RANDOMNESS_PLACEHOLDER,asset2:RANDOMNESS_PLACEHOLDER"
+    }
   ]
 }

packages/now-node/test/fixtures/09-include-files/now.json

@@ -5,18 +5,14 @@
       "src": "index.js",
       "use": "@now/node",
       "config": {
-        "includeFiles": [
-          "templates/**"
-        ]
+        "includeFiles": ["templates/**"]
       }
     },
     {
       "src": "root.js",
       "use": "@now/node",
       "config": {
-        "includeFiles": [
-          "root.edge"
-        ]
+        "includeFiles": ["root.edge"]
       }
     },
     {
@@ -41,4 +37,4 @@
       "mustContain": "hello Root!"
     }
   ]
-}
+}

packages/now-node/test/fixtures/09-include-files/package.json

@@ -2,4 +2,4 @@
   "dependencies": {
     "edge.js": "^1.1.4"
   }
-}
+}