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

@@ -0,0 +1,9 @@
+# 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

.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"]
+}

.gitignore

@@ -1,4 +1,6 @@
 node_modules
 tmp
 target/
-.next
+.next
+coverage
+*.tgz

.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

@@ -0,0 +1,38 @@
+# `@now/static-build` Failed to detect a server running
+
+#### Why This Warning Occurred
+
+When running `now dev`, the `@now/static-build` builder proxies relevant HTTP
+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
+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.
+
+#### Possible Ways to Fix It
+
+Please ensure that your `now-dev` script binds the spawned development server on
+the provided `$PORT` that the builder expects the server to bind to.
+
+For example, if you are using Gatsby, your `now-dev` script must use the `-p`
+(port) option to bind to the `$PORT` specified from the builder:
+
+```
+{
+  ...
+  "scripts": {
+    ...
+    "now-dev": "gatsby develop -p $PORT"
+  }
+}
+```
+
+Consult your static builder program's `--help` or documentation to figure out what
+the command line flag to bind to a specific port is (in many cases, it is one of:
+`-p` / `-P` / `--port`).
+
+### Useful Links
+
+- [`@now/static-build` Local Development Documentation](https://zeit.co/docs/v2/deployments/official-builders/static-build-now-static-build#local-development)

jest.config.js

@@ -1,5 +1,39 @@
+const { execSync } = require('child_process');
+const { relative } = require('path');
+
+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 => relative('packages', item).split('/')[0]);
+
+const matches = [];
+
+if (changed.length > 0) {
+  console.log('The following packages have changed:');
+
+  changed.map((item) => {
+    matches.push(item);
+    console.log(item);
+
+    return null;
+  });
+} else {
+  matches.push('now-node');
+  console.log(`No packages changed, defaulting to ${matches[0]}`);
+}
+
+const testMatch = Array.from(new Set(matches)).map(
+  item => `**/${item}/**/?(*.)+(spec|test).[jt]s?(x)`,
+);
+
 module.exports = {
   testEnvironment: 'node',
+  testMatch,
   collectCoverageFrom: [
     'packages/(!test)/**/*.{js,jsx}',
     '!**/node_modules/**',

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.4",
+  "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/download.ts

@@ -4,11 +4,11 @@ import { File, Files, Meta } from '../types';
 import { remove, mkdirp, readlink, symlink } from 'fs-extra';
 
 export interface DownloadedFiles {
-  [filePath: string]: FileFsRef
+  [filePath: string]: FileFsRef;
 }
 
-const S_IFMT = 61440;   /* 0170000 type of file */
-const S_IFLNK = 40960;  /* 0120000 symbolic link */
+const S_IFMT = 61440; /* 0170000 type of file */
+const S_IFLNK = 40960; /* 0120000 symbolic link */
 
 export function isSymbolicLink(mode: number): boolean {
   return (mode & S_IFMT) === S_IFLNK;
@@ -17,9 +17,9 @@ export function isSymbolicLink(mode: number): boolean {
 async function downloadFile(file: File, fsPath: string): Promise<FileFsRef> {
   const { mode } = file;
   if (mode && isSymbolicLink(mode) && file.type === 'FileFsRef') {
-    const [ target ] = await Promise.all([
+    const [target] = await Promise.all([
       readlink((file as FileFsRef).fsPath),
-      mkdirp(path.dirname(fsPath))
+      mkdirp(path.dirname(fsPath)),
     ]);
     await symlink(target, fsPath);
     return FileFsRef.fromFsPath({ mode, fsPath });
@@ -34,12 +34,25 @@ async function removeFile(basePath: string, fileMatched: string) {
   await remove(file);
 }
 
-export default async function download(files: Files, basePath: string, meta?: Meta): Promise<DownloadedFiles> {
+export default async function download(
+  files: Files,
+  basePath: string,
+  meta?: Meta
+): Promise<DownloadedFiles> {
+  const { isDev = false, filesChanged = null, filesRemoved = null } =
+    meta || {};
+
+  if (isDev) {
+    // 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.
+    return files as DownloadedFiles;
+  }
+
   const files2: DownloadedFiles = {};
-  const { filesChanged = null, filesRemoved = null } = meta || {};
 
   await Promise.all(
-    Object.keys(files).map(async (name) => {
+    Object.keys(files).map(async name => {
       // If the file does not exist anymore, remove it.
       if (Array.isArray(filesRemoved) && filesRemoved.includes(name)) {
         await removeFile(basePath, name);
@@ -55,7 +68,7 @@ export default async function download(files: Files, basePath: string, meta?: Me
       const fsPath = path.join(basePath, name);
 
       files2[name] = await downloadFile(file, fsPath);
-    }),
+    })
   );
 
   return files2;

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

@@ -8,12 +8,16 @@ import FileFsRef from '../file-fs-ref';
 type GlobOptions = vanillaGlob_.IOptions;
 
 interface FsFiles {
-  [filePath: string]: FileFsRef
+  [filePath: string]: FileFsRef;
 }
 
 const vanillaGlob = promisify(vanillaGlob_);
 
-export default async function glob(pattern: string, opts: GlobOptions | string, mountpoint?: string): Promise<FsFiles> {
+export default async function glob(
+  pattern: string,
+  opts: GlobOptions | string,
+  mountpoint?: string
+): Promise<FsFiles> {
   let options: GlobOptions;
   if (typeof opts === 'string') {
     options = { cwd: opts };
@@ -23,7 +27,7 @@ export default async function glob(pattern: string, opts: GlobOptions | string,
 
   if (!options.cwd) {
     throw new Error(
-      'Second argument (basePath) must be specified for names of resulting files',
+      'Second argument (basePath) must be specified for names of resulting files'
     );
   }
 
@@ -41,11 +45,11 @@ export default async function glob(pattern: string, opts: GlobOptions | string,
   const files = await vanillaGlob(pattern, options);
 
   for (const relativePath of files) {
-    const fsPath = path.join(options.cwd!, relativePath);
+    const fsPath = path.join(options.cwd!, relativePath).replace(/\\/g, '/');
     let stat: Stats = options.statCache![fsPath] as Stats;
     assert(
       stat,
-      `statCache does not contain value for ${relativePath} (resolved to ${fsPath})`,
+      `statCache does not contain value for ${relativePath} (resolved to ${fsPath})`
     );
     if (stat.isFile()) {
       const isSymlink = options.symlinks![fsPath];

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-cgi/index.js

@@ -9,12 +9,13 @@ const { shouldServe } = require('@now/build-utils'); // eslint-disable-line impo
 
 exports.analyze = ({ files, entrypoint }) => files[entrypoint].digest;
 
-exports.build = async ({ files, entrypoint }) => {
+exports.build = async ({
+  workPath, files, entrypoint, meta,
+}) => {
   console.log('downloading files...');
-  const srcDir = await getWritableDirectory();
   const outDir = await getWritableDirectory();
 
-  await download(files, srcDir);
+  await download(files, workPath, meta);
 
   const handlerPath = path.join(__dirname, 'handler');
   await copyFile(handlerPath, path.join(outDir, 'handler'));
@@ -24,7 +25,7 @@ exports.build = async ({ files, entrypoint }) => {
 
   // For now only the entrypoint file is copied into the lambda
   await copyFile(
-    path.join(srcDir, entrypoint),
+    path.join(workPath, entrypoint),
     path.join(outDir, entrypoint),
   );
 

packages/now-cgi/package.json

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

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;
@@ -125,7 +126,15 @@ export async function downloadGo(
   // If we found GOPATH in ENV, or default `Go` path exists
   // asssume that user have `Go` installed
   if (isUserGo || process.env.GOPATH !== undefined) {
-    return createGo(dir, platform, arch);
+    const { stdout } = await execa('go', ['version']);
+
+    if (parseInt(stdout.split('.')[1]) >= 11) {
+      return createGo(dir, platform, arch);
+    }
+
+    throw new Error(
+      `Your current ${stdout} doesn't support Go Modules. Please update.`
+    );
   } else {
     // Check `Go` bin in builder CWD
     const isGoExist = await pathExists(join(dir, 'bin'));

packages/now-go/index.ts

@@ -1,5 +1,7 @@
-import { join, sep, dirname } from 'path';
+import { join, sep, dirname, basename } from 'path';
 import { readFile, writeFile, pathExists, move } from 'fs-extra';
+import { homedir } from 'os';
+import execa from 'execa';
 
 import {
   glob,
@@ -14,6 +16,7 @@ import {
 import { createGo, getAnalyzedEntrypoint } from './go-helpers';
 
 interface Analyzed {
+  found?: boolean;
   packageName: string;
   functionName: string;
   watch: string[];
@@ -28,6 +31,18 @@ interface BuildParamsType extends BuildOptions {
   meta: BuildParamsMeta;
 }
 
+// Initialize private git repo for Go Modules
+async function initPrivateGit(credentials: string) {
+  await execa('git', [
+    'config',
+    '--global',
+    'credential.helper',
+    `store --file ${join(homedir(), '.git-credentials')}`,
+  ]);
+
+  await writeFile(join(homedir(), '.git-credentials'), credentials);
+}
+
 export const version = 2;
 
 export const config = {
@@ -38,8 +53,14 @@ export async function build({
   files,
   entrypoint,
   config,
+  workPath,
   meta = {} as BuildParamsMeta,
 }: BuildParamsType) {
+  if (process.env.GIT_CREDENTIALS && !meta.isDev) {
+    console.log('Initialize Git credentials...');
+    await initPrivateGit(process.env.GIT_CREDENTIALS);
+  }
+
   console.log('Downloading user files...');
   const entrypointArr = entrypoint.split(sep);
 
@@ -48,17 +69,82 @@ export async function build({
     getWriteableDirectory(),
   ]);
 
+  const srcPath = join(goPath, 'src', 'lambda');
+  let downloadedFiles;
   if (meta.isDev) {
-    const devGoPath = `dev${entrypointArr[entrypointArr.length - 1]}`;
-    const goPathArr = goPath.split(sep);
-    goPathArr.pop();
-    goPathArr.push(devGoPath);
-    goPath = goPathArr.join(sep);
+    downloadedFiles = await download(files, workPath, meta);
+  } else {
+    downloadedFiles = await download(files, srcPath);
   }
 
-  const srcPath = join(goPath, 'src', 'lambda');
-  const downloadedFiles = await download(files, srcPath);
-  const input = dirname(downloadedFiles[entrypoint].fsPath);
+  console.log(`Parsing AST for "${entrypoint}"`);
+  let analyzed: string;
+  try {
+    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;
+  }
+
+  if (!analyzed) {
+    const err = new Error(
+      `Could not find an exported function in "${entrypoint}"
+Learn more: https://zeit.co/docs/v2/deployments/official-builders/go-now-go/#entrypoint
+      `
+    );
+    console.log(err.message);
+    throw err;
+  }
+
+  const parsedAnalyzed = JSON.parse(analyzed) as Analyzed;
+
+  if (meta.isDev) {
+    const base = dirname(downloadedFiles['now.json'].fsPath);
+    const destNow = join(
+      base,
+      '.now',
+      'cache',
+      basename(entrypoint, '.go'),
+      'src',
+      'lambda'
+    );
+    // this will ensure Go rebuilt fast
+    goPath = join(base, '.now', 'cache', basename(entrypoint, '.go'));
+    await download(downloadedFiles, destNow);
+
+    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 = {};
 
   if (config && config.includeFiles) {
@@ -70,37 +156,19 @@ export async function build({
     }
   }
 
-  console.log(`Parsing AST for "${entrypoint}"`);
-  let analyzed: string;
-  try {
-    analyzed = await getAnalyzedEntrypoint(downloadedFiles[entrypoint].fsPath);
-  } catch (err) {
-    console.log(`Failed to parse AST for "${entrypoint}"`);
-    throw err;
-  }
-
-  if (!analyzed) {
-    const err = new Error(
-      `Could not find an exported function in "${entrypoint}"`
-    );
-    console.log(err.message);
-    throw err;
-  }
-
-  const parsedAnalyzed = JSON.parse(analyzed) as Analyzed;
-
   const handlerFunctionName = parsedAnalyzed.functionName;
   console.log(
     `Found exported function "${handlerFunctionName}" in "${entrypoint}"`
   );
 
-  // we need `main.go` in the same dir as the entrypoint,
-  // otherwise `go build` will refuse to build
-  const entrypointDirname = dirname(downloadedFiles[entrypoint].fsPath);
-
   // 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,
@@ -132,10 +200,7 @@ export async function build({
     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}`;
     }
@@ -144,11 +209,16 @@ export async function build({
       .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 {
@@ -169,25 +239,34 @@ export async function build({
         );
       }
 
-      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 }
         );
       }
@@ -204,8 +283,11 @@ export async function build({
 
     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`');
@@ -214,17 +296,20 @@ export async function build({
     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 }
       );
     }
   } else {
+    // legacy mode
+    // we need `main.go` in the same dir as the entrypoint,
+    // otherwise `go build` will refuse to build
     const go = await createGo(
       goPath,
       process.platform,
@@ -286,16 +371,17 @@ export async function build({
   };
 
   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.5",
+  "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/index.go

@@ -0,0 +1,22 @@
+package function
+
+import (
+	"fmt"
+	"net/http"
+)
+
+// Person struct
+type Person struct {
+	name string
+	age  int
+}
+
+// NewPerson struct method
+func NewPerson(name string, age int) *Person {
+	return &Person{name: name, age: age}
+}
+
+// H func
+func H(w http.ResponseWriter, r *http.Request) {
+	fmt.Fprintf(w, "RANDOMNESS_PLACEHOLDER")
+}

packages/now-go/test/fixtures/09-exported-function/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/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"
@@ -10,9 +11,22 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strings"
 )
 
+var ignoredFoldersRegex []*regexp.Regexp
+
+func init() {
+	ignoredFolders := []string{"vendor", "testdata", ".now"}
+
+	// Build the regex that matches if a path contains the respective ignored folder
+	// The pattern will look like: (.*/)?vendor/.*, which matches every path that contains a vendor folder
+	for _, folder := range ignoredFolders {
+		ignoredFoldersRegex = append(ignoredFoldersRegex, regexp.MustCompile("(.*/)?"+folder+"/.*"))
+	}
+}
+
 type analyze struct {
 	PackageName string   `json:"packageName"`
 	FuncName    string   `json:"functionName"`
@@ -40,8 +54,9 @@ func visit(files *[]string) filepath.WalkFunc {
 		}
 
 		// we don't need Dirs, or test files
-		// we only want `.go` files
-		if info.IsDir() || itf || filepath.Ext(path) != ".go" {
+		// we only want `.go` files. Further, we ignore
+		// every file that is in one of the ignored folders.
+		if info.IsDir() || itf || filepath.Ext(path) != ".go" || isInIgnoredFolder(path) {
 			return nil
 		}
 
@@ -50,6 +65,19 @@ func visit(files *[]string) filepath.WalkFunc {
 	}
 }
 
+// isInIgnoredFolder checks if the given path is in one of the ignored folders.
+func isInIgnoredFolder(path string) bool {
+	// Make sure the regex works for Windows paths
+	path = filepath.ToSlash(path)
+
+	for _, pattern := range ignoredFoldersRegex {
+		if pattern.MatchString(path) {
+			return true
+		}
+	}
+	return false
+}
+
 // return unique file
 func unique(files []string) []string {
 	encountered := map[string]bool{}
@@ -65,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)
@@ -95,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)
@@ -127,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)
 					}
@@ -138,24 +184,32 @@ func main() {
 	}
 
 	parsed := parse(fileName)
+	offset := parsed.Pos()
+	reqRep := "*http.Request http.ResponseWriter"
+
 	for _, decl := range parsed.Decls {
 		fn, ok := decl.(*ast.FuncDecl)
 		if !ok {
-			// this declaraction is not a function
+			// this declaration is not a function
 			// so we're not interested
 			continue
 		}
 		if fn.Name.IsExported() == true {
-			// we found the first exported function
-			// we're done!
-			analyzed := analyze{
-				PackageName: parsed.Name.Name,
-				FuncName:    fn.Name.Name,
-				Watch:       unique(relatedFiles),
+			// find a valid `net/http` handler function
+			for _, param := range fn.Type.Params.List {
+				if strings.Contains(reqRep, string(rf[param.Type.Pos()-offset:param.Type.End()-offset])) {
+					// we found the first exported function with `net/http`
+					// we're done!
+					analyzed := analyze{
+						PackageName: parsed.Name.Name,
+						FuncName:    fn.Name.Name,
+						Watch:       unique(relatedFiles),
+					}
+					analyzedJSON, _ := json.Marshal(analyzed)
+					fmt.Print(string(analyzedJSON))
+					os.Exit(0)
+				}
 			}
-			json, _ := json.Marshal(analyzed)
-			fmt.Print(string(json))
-			os.Exit(0)
 		}
 	}
 }

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-mdx-deck/index.js

@@ -8,9 +8,11 @@ const { runNpmInstall } = require('@now/build-utils/fs/run-user-scripts.js'); //
 
 const writeFile = promisify(fs.writeFile);
 
-exports.build = async ({ files, entrypoint, workPath }) => {
+exports.build = async ({
+  files, entrypoint, workPath, meta,
+}) => {
   console.log('downloading user files...');
-  const downloadedFiles = await download(files, workPath);
+  const downloadedFiles = await download(files, workPath, meta);
   console.log('writing package.json...');
   const packageJson = { dependencies: { 'mdx-deck': '1.7.15' } };
   const packageJsonPath = path.join(workPath, 'package.json');

packages/now-mdx-deck/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/mdx-deck",
-  "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.1",
+  "version": "0.4.2",
   "license": "MIT",
   "main": "./dist/index",
   "scripts": {
@@ -14,7 +14,7 @@
     "directory": "packages/now-next"
   },
   "dependencies": {
-    "@now/node-bridge": "^1.1.2",
+    "@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

@@ -32,10 +32,12 @@ import {
   getRoutes,
   includeOnlyEntryDirectory,
   normalizePackageJson,
-  onlyStaticDirectory,
+  filesFromDirectory,
   stringMap,
   syncEnvVars,
   validateEntrypoint,
+  normalizePage,
+  getDynamicRoutes,
 } from './utils';
 
 interface BuildParamsMeta {
@@ -155,17 +157,16 @@ export const build = async ({
   entrypoint,
   meta = {} as BuildParamsMeta,
 }: BuildParamsType): Promise<{
-  routes?: any[];
+  routes?: ({ src?: string; dest?: string } | { handle: string })[];
   output: Files;
   watch?: string[];
   childProcesses: ChildProcess[];
 }> => {
   validateEntrypoint(entrypoint);
 
-  const routes: any[] = [];
   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);
@@ -191,6 +192,10 @@ export const build = async ({
       console.log(`${name} Installing dependencies...`);
       await runNpmInstall(entryPath, ['--prefer-offline']);
 
+      if (!process.env.NODE_ENV) {
+        process.env.NODE_ENV = 'development';
+      }
+
       // The runtime env vars consist of the base `process.env` vars, but with the
       // build env vars removed, and the runtime env vars mixed in afterwards
       const runtimeEnv: EnvConfig = Object.assign({}, process.env);
@@ -210,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.'
     );
@@ -248,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);
   }
 
@@ -285,7 +297,10 @@ export const build = async ({
     await unlinkFile(path.join(entryPath, '.npmrc'));
   }
 
+  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);
@@ -310,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,
@@ -372,15 +389,33 @@ 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'),
       }),
     };
-    const pages = await glob(
-      '**/*.js',
-      path.join(entryPath, '.next', 'serverless', 'pages')
-    );
+    const pagesDir = path.join(entryPath, '.next', 'serverless', 'pages');
+
+    const pages = await glob('**/*.js', pagesDir);
+    const staticPageFiles = await glob('**/*.html', pagesDir);
+
+    Object.keys(staticPageFiles).forEach((page: string) => {
+      const staticRoute = path.join(entryDirectory, page);
+      staticPages[staticRoute] = staticPageFiles[page];
+
+      const pathname = page.replace(/\.html$/, '');
+
+      if (pathname.startsWith('$') || pathname.includes('/$')) {
+        dynamicPages.push(pathname);
+      }
+
+      exportedPageRoutes.push({
+        src: `^${path.join('/', entryDirectory, pathname)}$`,
+        dest: path.join('/', staticRoute),
+      });
+    });
 
     const pageKeys = Object.keys(pages);
 
@@ -413,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: {
@@ -448,14 +487,61 @@ export const build = async ({
     {}
   );
 
-  const staticDirectoryFiles = onlyStaticDirectory(
-    includeOnlyEntryDirectory(files, entryDirectory),
-    entryDirectory
+  const entryDirectoryFiles = includeOnlyEntryDirectory(files, entryDirectory);
+  const staticDirectoryFiles = filesFromDirectory(
+    entryDirectoryFiles,
+    path.join(entryDirectory, 'static')
+  );
+  const publicDirectoryFiles = filesFromDirectory(
+    entryDirectoryFiles,
+    path.join(entryDirectory, 'public')
+  );
+  const publicFiles = Object.keys(publicDirectoryFiles).reduce(
+    (mappedFiles, file) => ({
+      ...mappedFiles,
+      [file.replace(/public[/\\]+/, '')]: publicDirectoryFiles[file],
+    }),
+    {}
   );
 
+  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: { ...lambdas, ...staticFiles, ...staticDirectoryFiles },
-    routes: [],
+    output: {
+      ...publicFiles,
+      ...lambdas,
+      ...staticPages,
+      ...staticFiles,
+      ...staticDirectoryFiles,
+    },
+    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/launcher.ts

@@ -1,12 +1,16 @@
 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 { Server } = require('http');
 const { Bridge } = require('./now__bridge');
 const page = require('./page');
 
-const server = new Server(page.render);
+// page.render is for React rendering
+// page.default is for /api rendering
+// page is for module.exports in /api
+const server = new Server(page.render || page.default || page);
 const bridge = new Bridge(server);
 bridge.listen();
 

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 };
@@ -73,11 +74,11 @@ function excludeLockFiles(files: Files): Files {
 }
 
 /**
- * Include the static directory from files
+ * Include only the files from a selected directory
  */
-function onlyStaticDirectory(files: Files, entryDir: string): Files {
+function filesFromDirectory(files: Files, dir: string): Files {
   function matcher(filePath: string) {
-    return !filePath.startsWith(path.join(entryDir, 'static'));
+    return !filePath.startsWith(dir.replace(/\\/g, '/'));
   }
 
   return excludeFiles(files, matcher);
@@ -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,
@@ -195,8 +207,10 @@ function getRoutes(
       dest: `${url}/static/$1`,
     },
   ];
+  const filePaths = Object.keys(filesInside);
+  const dynamicPages = [];
 
-  for (const file of Object.keys(filesInside)) {
+  for (const file of filePaths) {
     const relativePath = path.relative(entryDirectory, file);
     const isPage = pathIsInside('pages', relativePath);
 
@@ -212,6 +226,10 @@ function getRoutes(
       continue;
     }
 
+    if (pageName.startsWith('$') || pageName.includes('/$')) {
+      dynamicPages.push(normalizePage(pageName));
+    }
+
     routes.push({
       src: `${prefix}${pageName}`,
       dest: `${url}/${pageName}`,
@@ -227,6 +245,82 @@ 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);
+    const isPublic = pathIsInside('public', relativePath);
+
+    if (!isPublic) continue;
+
+    const fileName = path.relative('public', relativePath);
+    const route = {
+      src: `${prefix}${fileName}`,
+      dest: `${url}/${fileName}`,
+    };
+
+    // Only add the route if a page is not already using it
+    if (!routes.some(r => r.src === route.src)) {
+      routes.push(route);
+    }
+  }
+
+  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;
 }
 
@@ -250,10 +344,11 @@ export {
   includeOnlyEntryDirectory,
   excludeLockFiles,
   normalizePackageJson,
-  onlyStaticDirectory,
+  filesFromDirectory,
   getNextConfig,
   getPathsInside,
   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,
 );
@@ -28,6 +30,7 @@ it(
     } = await runBuildLambda(path.join(__dirname, 'monorepo'));
     expect(output['www/index']).toBeDefined();
     expect(output['www/static/test.txt']).toBeDefined();
+    expect(output['www/data.txt']).toBeDefined();
     const filePaths = Object.keys(output);
     const hasUnderScoreAppStaticFile = filePaths.some(filePath => filePath.match(/static.*\/pages\/_app\.js$/));
     const hasUnderScoreErrorStaticFile = filePaths.some(filePath => filePath.match(/static.*\/pages\/_error\.js$/));
@@ -96,3 +99,14 @@ it(
   },
   FOUR_MINUTES,
 );
+
+it(
+  'Should build the public-files test',
+  async () => {
+    const {
+      buildResult: { output },
+    } = await runBuildLambda(path.join(__dirname, 'public-files'));
+    expect(output['robots.txt']).toBeDefined();
+  },
+  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/monorepo/www/public/data.txt

@@ -0,0 +1 @@
+data

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/next.config.js

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

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

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

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

@@ -0,0 +1,10 @@
+{
+  "scripts": {
+    "now-build": "next build"
+  },
+  "dependencies": {
+    "next": "8",
+    "react": "16",
+    "react-dom": "16"
+  }
+}

packages/now-next/test/integration/public-files/pages/index.js

@@ -0,0 +1 @@
+export default () => 'Index page';

packages/now-next/test/integration/public-files/public/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

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/test/unit/build.test.js

@@ -2,7 +2,7 @@
 const path = require('path');
 const os = require('os');
 const { build } = require('@now/next');
-const { FileBlob } = require('@now/build-utils');
+const { download, FileBlob } = require('@now/build-utils');
 
 jest.setTimeout(45000);
 
@@ -22,6 +22,15 @@ describe('build meta dev', () => {
       export default () => 'Index page'
     `,
     }),
+    // This file should be omitted because `pages/index.js` will use the same route
+    'public/index': new FileBlob({
+      mode: 0o777,
+      data: 'text',
+    }),
+    'public/data.txt': new FileBlob({
+      mode: 0o777,
+      data: 'data',
+    }),
     'package.json': new FileBlob({
       mode: 0o777,
       data: `
@@ -46,24 +55,12 @@ describe('build meta dev', () => {
       .slice(3),
   );
   console.log('workPath directory: ', workPath);
-  /*
-  it('should have builder v2 response isDev=false', async () => {
-    const meta = { isDev: false, requestPath: null };
-    const { output, routes, watch } = await build({
-      files,
-      workPath,
-      entrypoint,
-      meta,
-    });
-    //console.log('output: ', Object.keys(output));
-    expect(Object.keys(output).length).toBe(7);
-    expect(output.index.type).toBe('Lambda');
-    expect(routes.length).toBe(0);
-    expect(watch.length).toBe(0);
-  });
-  */
 
   it('should have builder v2 response isDev=true', async () => {
+    // Since `download()` is a no-op when `isDev=true`, the assumption is that the
+    // source files are already present, so manually download them here first.
+    await download(files, workPath);
+
     const meta = { isDev: true, requestPath: null };
     const {
       output, routes, watch, childProcesses,
@@ -83,8 +80,15 @@ describe('build meta dev', () => {
       { src: '/static/(.*)', dest: 'http://localhost:5000/static/$1' },
       { src: '/index', dest: 'http://localhost:5000/index' },
       { src: '/', dest: 'http://localhost:5000/' },
+      { src: '/data.txt', dest: 'http://localhost:5000/data.txt' },
+    ]);
+    expect(watch).toEqual([
+      'next.config.js',
+      'pages/index.js',
+      'public/index',
+      'public/data.txt',
+      'package.json',
     ]);
-    expect(watch).toEqual(['next.config.js', 'pages/index.js', 'package.json']);
     childProcesses.forEach(cp => cp.kill());
   });
 });

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.2",
+  "version": "1.2.0",
   "license": "MIT",
   "main": "./index.js",
   "repository": {

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

@@ -1,10 +1,10 @@
 import { AddressInfo } from 'net';
-import { APIGatewayProxyEvent } from 'aws-lambda';
+import { APIGatewayProxyEvent, Context } from 'aws-lambda';
 import {
   Server,
   IncomingHttpHeaders,
   OutgoingHttpHeaders,
-  request
+  request,
 } from 'http';
 
 interface NowProxyEvent {
@@ -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);
     }
@@ -133,26 +137,27 @@ export class Bridge {
 
     return this.server.listen({
       host: '127.0.0.1',
-      port: 0
+      port: 0,
     });
   }
 
   async launcher(
-    event: NowProxyEvent | APIGatewayProxyEvent
+    event: NowProxyEvent | APIGatewayProxyEvent,
+    context: Context
   ): Promise<NowProxyResponse> {
+    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) => {
@@ -175,7 +180,7 @@ export class Bridge {
             statusCode: response.statusCode || 200,
             headers: response.headers,
             body: bodyBuffer.toString('base64'),
-            encoding: 'base64'
+            encoding: 'base64',
           });
         });
       });
@@ -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

@@ -16,56 +16,108 @@ test('port binding', async () => {
 });
 
 test('`APIGatewayProxyEvent` normalizing', async () => {
-  const server = new Server((req, res) => res.end(
-    JSON.stringify({
-      method: req.method,
-      path: req.url,
-      headers: req.headers,
-    }),
-  ));
+  const server = new Server((req, res) =>
+    res.end(
+      JSON.stringify({
+        method: req.method,
+        path: req.url,
+        headers: req.headers,
+      })
+    )
+  );
   const bridge = new Bridge(server);
   bridge.listen();
-  const result = await bridge.launcher({
-    httpMethod: 'GET',
-    headers: { foo: 'bar' },
-    path: '/apigateway',
-    body: null,
-  });
+  const context = {};
+  const result = await bridge.launcher(
+    {
+      httpMethod: 'GET',
+      headers: { foo: 'bar' },
+      path: '/apigateway',
+      body: null,
+    },
+    context
+  );
   assert.equal(result.encoding, 'base64');
   assert.equal(result.statusCode, 200);
   const body = JSON.parse(Buffer.from(result.body, 'base64').toString());
   assert.equal(body.method, 'GET');
   assert.equal(body.path, '/apigateway');
   assert.equal(body.headers.foo, 'bar');
+  assert.equal(context.callbackWaitsForEmptyEventLoop, false);
 
   server.close();
 });
 
 test('`NowProxyEvent` normalizing', async () => {
-  const server = new Server((req, res) => res.end(
-    JSON.stringify({
-      method: req.method,
-      path: req.url,
-      headers: req.headers,
-    }),
-  ));
+  const server = new Server((req, res) =>
+    res.end(
+      JSON.stringify({
+        method: req.method,
+        path: req.url,
+        headers: req.headers,
+      })
+    )
+  );
   const bridge = new Bridge(server);
   bridge.listen();
-  const result = await bridge.launcher({
-    Action: 'Invoke',
-    body: JSON.stringify({
-      method: 'POST',
-      headers: { foo: 'baz' },
-      path: '/nowproxy',
-      body: 'body=1',
-    }),
-  });
+  const context = { callbackWaitsForEmptyEventLoop: true };
+  const result = await bridge.launcher(
+    {
+      Action: 'Invoke',
+      body: JSON.stringify({
+        method: 'POST',
+        headers: { foo: 'baz' },
+        path: '/nowproxy',
+        body: 'body=1',
+      }),
+    },
+    context
+  );
   assert.equal(result.encoding, 'base64');
   assert.equal(result.statusCode, 200);
   const body = JSON.parse(Buffer.from(result.body, 'base64').toString());
   assert.equal(body.method, 'POST');
   assert.equal(body.path, '/nowproxy');
   assert.equal(body.headers.foo, 'baz');
+  assert.equal(context.callbackWaitsForEmptyEventLoop, false);
+
+  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

@@ -28,11 +28,13 @@ const { shouldServe } = require('@now/build-utils'); // eslint-disable-line impo
  * @param {string[]} [options.npmArguments]
  */
 async function downloadInstallAndBundle(
-  { files, entrypoint, workPath },
+  {
+    files, entrypoint, workPath, meta,
+  },
   { npmArguments = [] } = {},
 ) {
   console.log('downloading user files...');
-  const downloadedFiles = await download(files, workPath);
+  const downloadedFiles = await download(files, workPath, meta);
 
   console.log("installing dependencies for user's code...");
   const entrypointFsDirname = path.join(workPath, path.dirname(entrypoint));
@@ -99,10 +101,15 @@ exports.config = {
  * @returns {Promise<Files>}
  */
 exports.build = async ({
-  files, entrypoint, config, workPath,
+  files, entrypoint, config, workPath, meta,
 }) => {
   const [downloadedFiles, entrypointFsDirname] = await downloadInstallAndBundle(
-    { files, entrypoint, workPath },
+    {
+      files,
+      entrypoint,
+      workPath,
+      meta,
+    },
     { npmArguments: ['--prefer-offline'] },
   );
 

packages/now-node-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/node-server",
-  "version": "0.7.1",
+  "version": "0.7.5",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -8,8 +8,8 @@
     "directory": "packages/now-node-server"
   },
   "dependencies": {
-    "@now/node-bridge": "^1.1.2",
-    "@zeit/ncc": "0.18.2",
+    "@now/node-bridge": "^1.2.0",
+    "@zeit/ncc": "0.18.5",
     "fs-extra": "7.0.1"
   },
   "scripts": {

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