Publish

- @now/build-utils@0.4.41-canary.3
 - @now/next@0.1.3-canary.14
 - @now/node-bridge@1.0.2-canary.2
 - @now/node-server@0.5.4-canary.3
 - @now/node@0.5.4-canary.3
 - @now/php@0.4.17-canary.1
 - @now/python@0.1.0-canary.2

.circleci/build.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -euo pipefail
+
+circleci_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+needs_build="$(grep -rn '"build"' packages/*/package.json | cut -d: -f1)"
+
+for pkg in $needs_build; do
+  dir="$(dirname "$pkg")"
+  cd "$circleci_dir/../$dir"
+  echo "Building \`$dir\`"
+  yarn build
+done

.circleci/config.yml

@@ -20,21 +20,21 @@ jobs:
       - run:
           name: Bootstrapping
           command: yarn bootstrap
+      - run:
+          name: Building
+          command: ./.circleci/build.sh
       - run:
           name: Linting
           command: yarn lint
       - run:
-          name: Tests
-          command: yarn test
+          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 canary release
-          command: "if ls ~/.npmrc >/dev/null 2>&1 && [[ $(git describe --exact-match 2> /dev/null || :) =~ -canary ]]; then yarn run lerna publish from-git --npm-tag canary --yes; else  echo \"Did not publish\"; fi"
-      - run:
-          name: Potentially publish stable release
-          command: "if ls ~/.npmrc >/dev/null 2>&1 && [[ ! $(git describe --exact-match 2> /dev/null || :) =~ -canary ]]; then yarn run lerna publish from-git --yes; else  echo \"Did not publish\"; fi"
+          name: Potentially publish releases to npm
+          command: ./.circleci/publish.sh
 workflows:
   version: 2
   build-and-deploy:

.circleci/publish.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+set -euo pipefail
+
+if [ ! -e ~/.npmrc ]; then
+  echo "~/.npmrc file does not exist, skipping publish"
+  exit 0
+fi
+
+npm_tag=""
+tag="$(git describe --tags --exact-match 2> /dev/null || :)"
+
+if [ -z "$tag" ]; then
+  echo "Not a tagged commit, skipping publish"
+  exit 0
+fi
+
+if [[ "$tag" =~ -canary ]]; then
+  echo "Publishing canary release"
+  npm_tag="--npm-tag canary"
+else
+  echo "Publishing stable release"
+fi
+
+yarn run lerna publish from-git $npm_tag --yes

.eslintignore

@@ -1,3 +1,8 @@
 /tmp/*
 /node_modules/*
 /**/node_modules/*
+/packages/now-go/go/*
+/packages/now-build-utils/dist/*
+/packages/now-node/dist/*
+/packages/now-node-bridge/*
+/packages/now-python/*

.gitignore

@@ -1,2 +1,4 @@
 node_modules
 tmp
+target/
+.next

.prettierrc.json

@@ -0,0 +1,3 @@
+{
+  "singleQuote": true
+}

.vscode/settings.json

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

README.md

@@ -2,7 +2,7 @@
 
 This is the full list of official Builders provided by the ZEIT team.
 
-More details here: http://zeit.co/docs
+More details here: https://zeit.co/docs/v2/deployments/builders/overview/
 
 ### Publishing to npm
 

errors/now-next-legacy-mode.md

@@ -0,0 +1,73 @@
+# `@now/next` Legacy Mode
+
+#### Why This Warning Occurred
+
+`@now/next` has two modes: `legacy` and `serverless`. You will always want to use the `serverless` mode. `legacy` is to provide backwards compatibility with previous `@now/next` versions.
+
+The differences:
+
+Legacy:
+
+- Minimal lambda size of `2.2Mb` (approximately)
+- Forces `next@v7.0.2-canary.49` and `next-server@v7.0.2-canary.49`
+- Forces all `dependencies` to be `devDependencies`
+- Loads `next.config.js` on bootup, breaking sometimes when users didn't use `phases` to load files
+- Used `next-server` which is the full Next.js server with routing etc.
+- Runs `npm install`
+- Runs `npm run now-build`
+- Runs `npm install --production` after build
+
+Serverless:
+
+- Minimal lambda size of `49Kb` (approximately)
+- Uses Next.js build targets (`target: 'serverless'`) in `next.config.js`. [documentation](https://github.com/zeit/next.js#summary)
+- Does not make changes to your application dependencies
+- Does not load `next.config.js` ([as per the serverless target documentation](https://github.com/zeit/next.js#summary))
+- Runs `npm install`
+- Runs `npm run now-build`
+- Does not run `npm install --production` as the output from the build is all that's needed to bundle lambdas.
+- 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: 
+
+```
+npm install next --save
+```
+
+2. Add the `now-build` script to your `package.json`
+
+```json
+{
+  "scripts": {
+    "now-build": "next build"
+  },
+}
+```
+
+3. Add `target: 'serverless'` to `next.config.js`
+
+```js
+module.exports = {
+  target: 'serverless'
+  // Other options are still valid
+}
+```
+
+4. Optionally make sure the `"src"` in `"builds"` points to your application `package.json`
+
+```js
+{
+  "version": 2,
+  "builds": [{ "src": "package.json", "use": "@now/next" }]
+}
+```
+
+### Useful Links
+
+- [Serverless target implementation](https://github.com/zeit/now-builders/pull/150) 

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

@@ -0,0 +1,45 @@
+# `@now/next` No Serverless Pages Built
+
+#### Why This Error Occurred
+
+This error occurs when you have your application is not configured for Serverless Next.js build output.
+
+#### 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:
+
+```
+npm install next --save
+```
+
+2. Add the `now-build` script to your `package.json`
+
+```json
+{
+  "scripts": {
+    "now-build": "next build"
+  },
+}
+```
+
+3. Add `target: 'serverless'` to `next.config.js`
+
+```js
+module.exports = {
+  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`
+
+5. Optionally make sure the `"src"` in `"builds"` points to your application `package.json`
+
+```js
+{
+  "version": 2,
+  "builds": [{ "src": "package.json", "use": "@now/next" }]
+}
+```

package.json

@@ -14,14 +14,17 @@
     "bootstrap": "lerna bootstrap",
     "publish-stable": "lerna version",
     "publish-canary": "lerna version prerelease --preid canary",
-    "lint": "tsc && eslint .",
-    "test": "jest --runInBand",
+    "build": "./.circleci/build.sh",
+    "lint": "eslint .",
+    "codecov": "codecov",
+    "test": "jest --runInBand --verbose",
+    "test-coverage": "jest --runInBand --verbose --coverage --globals \"{\\\"coverage\\\":true}\" && codecov",
     "lint-staged": "lint-staged"
   },
   "pre-commit": "lint-staged",
   "lint-staged": {
     "*.js": [
-      "prettier --write --single-quote",
+      "prettier --write",
       "eslint --fix",
       "git add"
     ]
@@ -31,7 +34,9 @@
     "@types/glob": "^7.1.1",
     "@types/multistream": "^2.1.1",
     "@types/node": "^10.12.8",
+    "async-retry": "1.2.3",
     "buffer-replace": "^1.0.0",
+    "codecov": "^3.2.0",
     "eslint": "^5.9.0",
     "eslint-config-airbnb-base": "^13.1.0",
     "eslint-config-prettier": "^3.1.0",
@@ -42,7 +47,6 @@
     "lint-staged": "^8.0.4",
     "node-fetch": "^2.3.0",
     "pre-commit": "^1.2.2",
-    "prettier": "^1.15.2",
-    "typescript": "^3.1.6"
+    "prettier": "^1.15.2"
   }
 }

packages/now-bash/.editorconfig

@@ -0,0 +1,32 @@
+root = true
+
+[*]
+indent_style = tab
+indent_size = 4
+tab_width = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[{*.json,*.json.example,*.gyp,*.yml}]
+indent_style = space
+indent_size = 2
+
+[*.py]
+indent_style = space
+indent_size = 4
+
+[*.md]
+trim_trailing_whitespace = false
+
+# Ideal settings - some plugins might support these.
+[*.js]
+quote_type = single
+
+[{*.c,*.cc,*.h,*.hh,*.cpp,*.hpp,*.m,*.mm,*.mpp,*.js,*.java,*.go,*.rs,*.php,*.ng,*.jsx,*.ts,*.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

packages/now-bash/bootstrap

@@ -7,7 +7,9 @@ export IMPORT_CACHE="$LAMBDA_TASK_ROOT/.import-cache"
 export PATH="$IMPORT_CACHE/bin:$PATH"
 
 # Load `import` and runtime
+# shellcheck disable=SC1090
 . "$(which import)"
+# shellcheck disable=SC1090
 . "$IMPORT_CACHE/runtime.sh"
 
 # Load user code and process events in a loop forever

packages/now-bash/builder.sh

@@ -33,17 +33,8 @@ if declare -f build > /dev/null; then
 	build "$@"
 fi
 
-# Ensure the entrypoint defined a `serve` function
-if ! declare -f serve > /dev/null; then
-	echo "ERROR: A \`serve\` function must be defined in \"$ENTRYPOINT\"!" >&2
+# Ensure the entrypoint defined a `handler` function
+if ! declare -f handler > /dev/null; then
+	echo "ERROR: A \`handler\` function must be defined in \"$ENTRYPOINT\"!" >&2
 	exit 1
 fi
-
-# Show a tree of the final lambda build
-show_tree() {
-	import "static-binaries@0.0.6"
-	static_binaries tree
-	echo "Final lambda file tree:"
-	tree -a .
-}
-IMPORT_DEBUG= IMPORT_CACHE="$(mktemp -d)" show_tree

packages/now-bash/index.js

@@ -1,10 +1,10 @@
 const execa = require('execa');
 const { join } = require('path');
 const snakeCase = require('snake-case');
-const glob = require('@now/build-utils/fs/glob');
-const download = require('@now/build-utils/fs/download');
-const { createLambda } = require('@now/build-utils/lambda');
-const getWritableDirectory = require('@now/build-utils/fs/get-writable-directory');
+const glob = require('@now/build-utils/fs/glob'); // eslint-disable-line import/no-extraneous-dependencies
+const download = require('@now/build-utils/fs/download'); // eslint-disable-line import/no-extraneous-dependencies
+const { createLambda } = require('@now/build-utils/lambda'); // eslint-disable-line import/no-extraneous-dependencies
+const getWritableDirectory = require('@now/build-utils/fs/get-writable-directory'); // eslint-disable-line import/no-extraneous-dependencies
 
 exports.config = {
   maxLambdaSize: '10mb',
@@ -12,9 +12,10 @@ exports.config = {
 
 exports.analyze = ({ files, entrypoint }) => files[entrypoint].digest;
 
-exports.build = async ({ files, entrypoint, config }) => {
+exports.build = async ({
+  workPath, files, entrypoint, config,
+}) => {
   const srcDir = await getWritableDirectory();
-  const workDir = await getWritableDirectory();
 
   console.log('downloading files...');
   await download(files, srcDir);
@@ -24,7 +25,7 @@ exports.build = async ({ files, entrypoint, config }) => {
     return o;
   }, {});
 
-  const IMPORT_CACHE = `${workDir}/.import-cache`;
+  const IMPORT_CACHE = `${workPath}/.import-cache`;
   const env = Object.assign({}, process.env, configEnv, {
     PATH: `${IMPORT_CACHE}/bin:${process.env.PATH}`,
     IMPORT_CACHE,
@@ -37,11 +38,12 @@ exports.build = async ({ files, entrypoint, config }) => {
 
   await execa(builderPath, [entrypoint], {
     env,
-    cwd: workDir,
+    cwd: workPath,
+    stdio: 'inherit',
   });
 
   const lambda = await createLambda({
-    files: await glob('**', workDir),
+    files: await glob('**', workPath),
     handler: entrypoint, // not actually used in `bootstrap`
     runtime: 'provided',
     environment: Object.assign({}, configEnv, {

packages/now-bash/package.json

@@ -1,10 +1,15 @@
 {
   "name": "@now/bash",
-  "version": "0.0.3-canary.0",
+  "version": "0.1.5-canary.1",
   "description": "Now 2.0 builder for HTTP endpoints written in Bash",
   "main": "index.js",
   "author": "Nathan Rajlich <nate@zeit.co>",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zeit/now-builders.git",
+    "directory": "packages/now-bash"
+  },
   "files": [
     "builder.sh",
     "runtime.sh",
@@ -15,8 +20,5 @@
   "dependencies": {
     "execa": "^1.0.0",
     "snake-case": "^2.1.0"
-  },
-  "peerDependencies": {
-    "@now/build-utils": ">=0.0.1"
   }
 }

packages/now-bash/runtime.sh

@@ -1,4 +1,5 @@
-import "static-binaries@0.0.6"
+#!/bin/bash
+import "static-binaries@1.0.0"
 static_binaries jq
 
 # These get reset upon each request
@@ -13,12 +14,14 @@ _lambda_runtime_api() {
 
 _lambda_runtime_init() {
 	# Initialize user code
+	# shellcheck disable=SC1090
 	. "$SCRIPT_FILENAME" || {
 		local exit_code="$?"
-		local error
-		error='{"exitCode":'"$exit_code"'}'
+		local error_message="Initialization failed for '$SCRIPT_FILENAME' (exit code $exit_code)"
+		echo "$error_message" >&2
+		local error='{"errorMessage":"'"$error_message"'"}'
 		_lambda_runtime_api "init/error" -X POST -d "$error"
-		exit "$EXIT_CODE"
+		exit "$exit_code"
 	}
 
 	# Process events
@@ -35,55 +38,53 @@ _lambda_runtime_next() {
 	# Get an event
 	local event
 	event="$(mktemp)"
-	_lambda_runtime_api invocation/next -D "$headers" | jq -r '.body' > "$event"
+	_lambda_runtime_api invocation/next -D "$headers" | jq --raw-output --monochrome-output '.body' > "$event"
 
 	local request_id
 	request_id="$(grep -Fi Lambda-Runtime-Aws-Request-Id "$headers" | tr -d '[:space:]' | cut -d: -f2)"
-	echo "Request-Id: $request_id" >&2
 	rm -f "$headers"
 
 	# Execute the handler function from the script
 	local body
 	body="$(mktemp)"
 
-	local exit_code=0
-	REQUEST="$event"
-
-	# Stdin of the `serve` function is the HTTP request body.
+	# Stdin of the `handler` function is the HTTP request body.
 	# Need to use a fifo here instead of bash <() because Lambda
 	# errors with "/dev/fd/63 not found" for some reason :/
 	local stdin
-	stdin="$(mktemp --dry-run)"
+	stdin="$(mktemp -u)"
 	mkfifo "$stdin"
-	_lambda_runtime_body "$event" > "$stdin" &
+	_lambda_runtime_body < "$event" > "$stdin" &
+
+	local exit_code=0
+	handler "$event" < "$stdin" > "$body" || exit_code="$?"
 
-	serve "$event" < "$stdin" > "$body" || exit_code="$?"
 	rm -f "$event" "$stdin"
 
 	if [ "$exit_code" -eq 0 ]; then
 		# Send the response
-		local response
-		response="$(jq -cnMr \
+		jq --raw-input --raw-output --compact-output --slurp --monochrome-output \
 			--arg statusCode "$(cat "$_STATUS_CODE")" \
 			--argjson headers "$(cat "$_HEADERS")" \
-			--arg body "$(base64 --wrap=0 < "$body")" \
-			'{statusCode:$statusCode|tonumber, headers:$headers, encoding:"base64", body:$body}')"
+			'{statusCode:$statusCode|tonumber, headers:$headers, encoding:"base64", body:.|@base64}' < "$body" \
+			| _lambda_runtime_api "invocation/$request_id/response" -X POST -d @- > /dev/null
 		rm -f "$body" "$_HEADERS"
-		_lambda_runtime_api "invocation/$request_id/response" -X POST -d "$response"
 	else
-		local error
-		error='{"exitCode":'"$exit_code"'}'
-		_lambda_runtime_api "invocation/$request_id/error" -X POST -d "$error"
+		local error_message="Invocation failed for 'handler' function in '$SCRIPT_FILENAME' (exit code $exit_code)"
+		echo "$error_message" >&2
+		_lambda_runtime_api "invocation/$request_id/error" -X POST -d '{"errorMessage":"'"$error_message"'"}' > /dev/null
 	fi
 }
 
 _lambda_runtime_body() {
-	if [ "$(jq -r '.body | type' < "$1")" = "string" ]; then
-		if [ "$(jq -r '.encoding' < "$1")" = "base64" ]; then
-			jq -r '.body' < "$1" | base64 -d
+	local event
+	event="$(cat)"
+	if [ "$(jq --raw-output '.body | type' <<< "$event")" = "string" ]; then
+		if [ "$(jq --raw-output '.encoding' <<< "$event")" = "base64" ]; then
+			jq --raw-output '.body' <<< "$event" | base64 --decode
 		else
 			# assume plain-text body
-			jq -r '.body' < "$1"
+			jq --raw-output '.body' <<< "$event"
 		fi
 	fi
 }
@@ -101,7 +102,10 @@ http_response_header() {
 	local value="$2"
 	local tmp
 	tmp="$(mktemp)"
-	jq --arg name "$name" --arg value "$value" '.[$name] = $value' < "$_HEADERS" > "$tmp"
+	jq \
+		--arg name "$name" \
+		--arg value "$value" \
+		'.[$name] = $value' < "$_HEADERS" > "$tmp"
 	mv -f "$tmp" "$_HEADERS"
 }
 

packages/now-build-utils/.gitignore

@@ -0,0 +1,2 @@
+dist
+test/symlinks-out

packages/now-build-utils/.npmignore

@@ -1 +1,3 @@
+/src
 /test
+tmp

packages/now-build-utils/file-blob.js

@@ -1,33 +1 @@
-const assert = require('assert');
-const intoStream = require('into-stream');
-
-class FileBlob {
-  constructor({ mode = 0o100644, data }) {
-    assert(typeof mode === 'number');
-    assert(typeof data === 'string' || Buffer.isBuffer(data));
-    this.type = 'FileBlob';
-    this.mode = mode;
-    this.data = data;
-  }
-
-  static async fromStream({ mode = 0o100644, stream }) {
-    assert(typeof mode === 'number');
-    assert(typeof stream.pipe === 'function'); // is-stream
-    const chunks = [];
-
-    await new Promise((resolve, reject) => {
-      stream.on('data', chunk => chunks.push(Buffer.from(chunk)));
-      stream.on('error', error => reject(error));
-      stream.on('end', () => resolve());
-    });
-
-    const data = Buffer.concat(chunks);
-    return new FileBlob({ mode, data });
-  }
-
-  toStream() {
-    return intoStream(this.data);
-  }
-}
-
-module.exports = FileBlob;
+module.exports = require('./dist/index').FileBlob;

packages/now-build-utils/file-fs-ref.js

@@ -1,88 +1 @@
-const assert = require('assert');
-const fs = require('fs-extra');
-const multiStream = require('multistream');
-const path = require('path');
-const Sema = require('async-sema');
-
-/** @typedef {{[filePath: string]: FileFsRef}} FsFiles */
-
-const semaToPreventEMFILE = new Sema(30);
-
-/**
- * @constructor
- * @argument {Object} options
- * @argument {number} [options.mode=0o100644]
- * @argument {string} options.fsPath
- */
-class FileFsRef {
-  constructor({ mode = 0o100644, fsPath }) {
-    assert(typeof mode === 'number');
-    assert(typeof fsPath === 'string');
-    /** @type {string} */
-    this.type = 'FileFsRef';
-    /** @type {number} */
-    this.mode = mode;
-    /** @type {string} */
-    this.fsPath = fsPath;
-  }
-
-  /**
-   * @argument {Object} options
-   * @argument {number} [options.mode=0o100644]
-   * @argument {NodeJS.ReadableStream} options.stream
-   * @argument {string} options.fsPath
-   * @returns {Promise<FileFsRef>}
-   */
-  static async fromStream({ mode = 0o100644, stream, fsPath }) {
-    assert(typeof mode === 'number');
-    assert(typeof stream.pipe === 'function'); // is-stream
-    assert(typeof fsPath === 'string');
-    await fs.mkdirp(path.dirname(fsPath));
-
-    await new Promise((resolve, reject) => {
-      const dest = fs.createWriteStream(fsPath);
-      stream.pipe(dest);
-      stream.on('error', reject);
-      dest.on('finish', resolve);
-      dest.on('error', reject);
-    });
-
-    await fs.chmod(fsPath, mode.toString(8).slice(-3));
-    return new FileFsRef({ mode, fsPath });
-  }
-
-  /**
-   * @returns {Promise<NodeJS.ReadableStream>}
-   */
-  async toStreamAsync() {
-    await semaToPreventEMFILE.acquire();
-    const release = () => semaToPreventEMFILE.release();
-    const stream = fs.createReadStream(this.fsPath);
-    stream.on('close', release);
-    stream.on('error', release);
-    return stream;
-  }
-
-  /**
-   * @returns {NodeJS.ReadableStream}
-   */
-  toStream() {
-    let flag;
-
-    // eslint-disable-next-line consistent-return
-    return multiStream((cb) => {
-      if (flag) return cb(null, null);
-      flag = true;
-
-      this.toStreamAsync()
-        .then((stream) => {
-          cb(null, stream);
-        })
-        .catch((error) => {
-          cb(error, null);
-        });
-    });
-  }
-}
-
-module.exports = FileFsRef;
+module.exports = require('./dist/index').FileFsRef;

packages/now-build-utils/file-ref.js

@@ -1,96 +1 @@
-const assert = require('assert');
-const fetch = require('node-fetch');
-const multiStream = require('multistream');
-const retry = require('async-retry');
-const Sema = require('async-sema');
-
-/** @typedef {{[filePath: string]: FileRef}} Files */
-
-const semaToDownloadFromS3 = new Sema(10);
-
-class BailableError extends Error {
-  constructor(...args) {
-    super(...args);
-    /** @type {boolean} */
-    this.bail = false;
-  }
-}
-
-/**
- * @constructor
- * @argument {Object} options
- * @argument {number} [options.mode=0o100644]
- * @argument {string} options.digest
- */
-class FileRef {
-  constructor({ mode = 0o100644, digest }) {
-    assert(typeof mode === 'number');
-    assert(typeof digest === 'string');
-    /** @type {string} */
-    this.type = 'FileRef';
-    /** @type {number} */
-    this.mode = mode;
-    /** @type {string} */
-    this.digest = digest;
-  }
-
-  /**
-   * @returns {Promise<NodeJS.ReadableStream>}
-   */
-  async toStreamAsync() {
-    let url;
-    // sha:24be087eef9fac01d61b30a725c1a10d7b45a256
-    const digestParts = this.digest.split(':');
-    if (digestParts[0] === 'sha') {
-      // url = `https://s3.amazonaws.com/now-files/${digestParts[1]}`;
-      url = `https://dmmcy0pwk6bqi.cloudfront.net/${digestParts[1]}`;
-    }
-
-    assert(url);
-
-    await semaToDownloadFromS3.acquire();
-    console.time(`downloading ${url}`);
-    try {
-      return await retry(
-        async () => {
-          const resp = await fetch(url);
-          if (!resp.ok) {
-            const error = new BailableError(
-              `${resp.status} ${resp.statusText}`,
-            );
-            if (resp.status === 403) error.bail = true;
-            throw error;
-          }
-          return resp.body;
-        },
-        { factor: 1, retries: 3 },
-      );
-    } finally {
-      console.timeEnd(`downloading ${url}`);
-      semaToDownloadFromS3.release();
-    }
-  }
-
-  /**
-   * @returns {NodeJS.ReadableStream}
-   */
-  toStream() {
-    let flag;
-
-    // eslint-disable-next-line consistent-return
-    return multiStream((cb) => {
-      if (flag) return cb(null, null);
-      flag = true;
-
-      this.toStreamAsync()
-        .then((stream) => {
-          cb(null, stream);
-        })
-        .catch((error) => {
-          cb(error, null);
-        });
-    });
-  }
-}
-
-module.exports = FileRef;
+module.exports = require('./dist/index').FileRef;

packages/now-build-utils/fs/bootstrap-yarn.js

@@ -1,83 +0,0 @@
-const MemoryFileSystem = require('memory-fs');
-const fs = require('fs');
-const path = require('path');
-const { spawnSync } = require('child_process');
-
-const yarnPath = spawnSync('which', ['yarn'])
-  .stdout.toString()
-  .trim();
-
-const cachePath = spawnSync(yarnPath, ['cache', 'dir'])
-  .stdout.toString()
-  .trim();
-
-spawnSync(yarnPath, ['cache', 'clean']);
-const vfs = new MemoryFileSystem();
-
-function isOutsideCachePath(filename) {
-  const relative = path.relative(cachePath, filename);
-  return relative.startsWith('..');
-}
-
-const saveCreateWriteStream = fs.createWriteStream;
-fs.createWriteStream = (...args) => {
-  const filename = args[0];
-  if (isOutsideCachePath(filename)) {
-    return saveCreateWriteStream.call(fs, ...args);
-  }
-
-  vfs.mkdirpSync(path.dirname(filename));
-  fs.writeFileSync(filename, Buffer.alloc(0));
-  const stream = vfs.createWriteStream(...args);
-
-  stream.on('finish', () => {
-    setTimeout(() => {
-      stream.emit('close');
-    });
-  });
-
-  return stream;
-};
-
-const saveReadFile = fs.readFile;
-fs.readFile = (...args) => {
-  const filename = args[0];
-  if (isOutsideCachePath(filename)) {
-    return saveReadFile.call(fs, ...args);
-  }
-
-  const callback = args[args.length - 1];
-  return vfs.readFile(...args.slice(0, -1), (error, result) => {
-    if (error) {
-      saveReadFile.call(fs, ...args);
-      return;
-    }
-
-    callback(error, result);
-  });
-};
-
-const saveCopyFile = fs.copyFile;
-fs.copyFile = (...args) => {
-  const src = args[0];
-  if (isOutsideCachePath(src)) {
-    return saveCopyFile.call(fs, ...args);
-  }
-
-  const dest = args[1];
-  const callback = args[args.length - 1];
-  const buffer = vfs.readFileSync(src);
-  return fs.writeFile(dest, buffer, callback);
-};
-
-const saveWriteFile = fs.writeFile;
-fs.writeFile = (...args) => {
-  const filename = args[0];
-  if (isOutsideCachePath(filename)) {
-    return saveWriteFile.call(fs, ...args);
-  }
-
-  return vfs.writeFile(...args);
-};
-
-require(yarnPath);

packages/now-build-utils/fs/download.js

@@ -1,38 +1 @@
-const path = require('path');
-const FileFsRef = require('../file-fs-ref.js');
-
-/** @typedef {import('../file-ref')} FileRef */
-/** @typedef {import('../file-fs-ref')} FileFsRef */
-/** @typedef {{[filePath: string]: FileRef|FileFsRef}} Files */
-/** @typedef {{[filePath: string]: FileFsRef}|{}} DownloadedFiles */
-
-/**
- * @param {FileRef|FileFsRef} file
- * @param {string} fsPath
- * @returns {Promise<FileFsRef>}
- */
-async function downloadFile(file, fsPath) {
-  const { mode } = file;
-  const stream = file.toStream();
-  return FileFsRef.fromStream({ mode, stream, fsPath });
-}
-
-/**
- * Download files to disk
- * @argument {Files} files
- * @argument {string} basePath
- * @returns {Promise<DownloadedFiles>}
- */
-module.exports = async function download(files, basePath) {
-  const files2 = {};
-
-  await Promise.all(
-    Object.keys(files).map(async (name) => {
-      const file = files[name];
-      const fsPath = path.join(basePath, name);
-      files2[name] = await downloadFile(file, fsPath);
-    }),
-  );
-
-  return files2;
-};
+module.exports = require('../dist/fs/download').default;

packages/now-build-utils/fs/get-writable-directory.js

@@ -1,12 +1 @@
-const path = require('path');
-const fs = require('fs-extra');
-
-const dev = !process.env.AWS_EXECUTION_ENV;
-const TMP_PATH = dev ? path.join(process.cwd(), 'tmp') : '/tmp';
-
-module.exports = async function getWritableDirectory() {
-  const name = Math.floor(Math.random() * 0x7fffffff).toString(16);
-  const directory = path.join(TMP_PATH, name);
-  await fs.mkdirp(directory);
-  return directory;
-};
+module.exports = require('../dist/fs/get-writable-directory').default;

packages/now-build-utils/fs/glob.js

@@ -1,67 +1 @@
-const assert = require('assert');
-const path = require('path');
-const vanillaGlob = require('glob');
-const FileFsRef = require('../file-fs-ref.js');
-
-/** @typedef {import('fs').Stats} Stats */
-/** @typedef {import('glob').IOptions} GlobOptions */
-/** @typedef {import('../file-fs-ref').FsFiles|{}} GlobFiles */
-
-/**
- * @argument {string} pattern
- * @argument {GlobOptions|string} opts
- * @argument {string} [mountpoint]
- * @returns {Promise<GlobFiles>}
- */
-module.exports = function glob(pattern, opts = {}, mountpoint) {
-  return new Promise((resolve, reject) => {
-    /** @type {GlobOptions} */
-    let options;
-    if (typeof opts === 'string') {
-      options = { cwd: opts };
-    } else {
-      options = opts;
-    }
-
-    if (!options.cwd) {
-      throw new Error(
-        'Second argument (basePath) must be specified for names of resulting files',
-      );
-    }
-
-    if (!path.isAbsolute(options.cwd)) {
-      throw new Error(`basePath/cwd must be an absolute path (${options.cwd})`);
-    }
-
-    options.statCache = {};
-    options.stat = true;
-    options.dot = true;
-
-    // eslint-disable-next-line consistent-return
-    vanillaGlob(pattern, options, (error, files) => {
-      if (error) return reject(error);
-
-      resolve(
-        files.reduce((files2, relativePath) => {
-          const fsPath = path.join(options.cwd, relativePath);
-          /** @type {Stats|any} */
-          const stat = options.statCache[fsPath];
-          assert(
-            stat,
-            `statCache does not contain value for ${relativePath} (resolved to ${fsPath})`,
-          );
-          if (stat && stat.isFile()) {
-            let finalPath = relativePath;
-            if (mountpoint) finalPath = path.join(mountpoint, finalPath);
-            return {
-              ...files2,
-              [finalPath]: new FileFsRef({ mode: stat.mode, fsPath }),
-            };
-          }
-
-          return files2;
-        }, {}),
-      );
-    });
-  });
-};
+module.exports = require('../dist/fs/glob').default;

packages/now-build-utils/fs/rename.js

@@ -1,25 +1 @@
-/** @typedef { import('@now/build-utils/file-ref') } FileRef */
-/** @typedef { import('@now/build-utils/file-fs-ref') } FileFsRef */
-/** @typedef {{[filePath: string]: FileRef|FileFsRef}} Files */
-
-/**
- * @callback delegate
- * @argument {string} name
- * @returns {string}
- */
-
-/**
- * Rename files using delegate function
- * @argument {Files} files
- * @argument {delegate} delegate
- * @returns {Files}
- */
-module.exports = function rename(files, delegate) {
-  return Object.keys(files).reduce(
-    (newFiles, name) => ({
-      ...newFiles,
-      [delegate(name)]: files[name],
-    }),
-    {},
-  );
-};
+module.exports = require('../dist/fs/rename').default;

packages/now-build-utils/fs/run-user-scripts.js

@@ -1,104 +1 @@
-const assert = require('assert');
-const fs = require('fs-extra');
-const path = require('path');
-const { spawn } = require('child_process');
-
-function spawnAsync(command, args, cwd) {
-  return new Promise((resolve, reject) => {
-    const child = spawn(command, args, { stdio: 'inherit', cwd });
-    child.on('error', reject);
-    child.on('close', (code, signal) => (code !== 0
-      ? reject(new Error(`Exited with ${code || signal}`))
-      : resolve()));
-  });
-}
-
-async function runShellScript(fsPath) {
-  assert(path.isAbsolute(fsPath));
-  const destPath = path.dirname(fsPath);
-  await spawnAsync(`./${path.basename(fsPath)}`, [], destPath);
-  return true;
-}
-
-async function scanParentDirs(destPath, scriptName) {
-  assert(path.isAbsolute(destPath));
-
-  let hasScript = false;
-  let hasPackageLockJson = false;
-  let currentDestPath = destPath;
-
-  // eslint-disable-next-line no-constant-condition
-  while (true) {
-    const packageJsonPath = path.join(currentDestPath, 'package.json');
-    // eslint-disable-next-line no-await-in-loop
-    if (await fs.exists(packageJsonPath)) {
-      // eslint-disable-next-line no-await-in-loop
-      const packageJson = JSON.parse(await fs.readFile(packageJsonPath));
-      hasScript = Boolean(
-        packageJson.scripts && packageJson.scripts[scriptName],
-      );
-      // eslint-disable-next-line no-await-in-loop
-      hasPackageLockJson = await fs.exists(
-        path.join(currentDestPath, 'package-lock.json'),
-      );
-      break;
-    }
-
-    const newDestPath = path.dirname(currentDestPath);
-    if (currentDestPath === newDestPath) break;
-    currentDestPath = newDestPath;
-  }
-
-  return { hasScript, hasPackageLockJson };
-}
-
-async function runNpmInstall(destPath, args = []) {
-  assert(path.isAbsolute(destPath));
-
-  let commandArgs = args;
-  console.log(`installing to ${destPath}`);
-  const { hasPackageLockJson } = await scanParentDirs(destPath);
-
-  if (hasPackageLockJson) {
-    commandArgs = args.filter(a => a !== '--prefer-offline');
-    await spawnAsync('npm', ['install'].concat(commandArgs), destPath);
-    await spawnAsync('npm', ['cache', 'clean', '--force'], destPath);
-  } else if (process.env.AWS_EXECUTION_ENV) {
-    console.log('using memory-fs for yarn cache');
-    await spawnAsync(
-      'node',
-      [path.join(__dirname, 'bootstrap-yarn.js'), '--cwd', destPath].concat(
-        commandArgs,
-      ),
-      destPath,
-    );
-  } else {
-    await spawnAsync('yarn', ['--cwd', destPath].concat(commandArgs), destPath);
-    await spawnAsync('yarn', ['cache', 'clean'], destPath);
-  }
-}
-
-async function runPackageJsonScript(destPath, scriptName) {
-  assert(path.isAbsolute(destPath));
-  const { hasScript, hasPackageLockJson } = await scanParentDirs(
-    destPath,
-    scriptName,
-  );
-  if (!hasScript) return false;
-
-  if (hasPackageLockJson) {
-    console.log(`running "npm run ${scriptName}"`);
-    await spawnAsync('npm', ['run', scriptName], destPath);
-  } else {
-    console.log(`running "yarn run ${scriptName}"`);
-    await spawnAsync('yarn', ['--cwd', destPath, 'run', scriptName], destPath);
-  }
-
-  return true;
-}
-
-module.exports = {
-  runShellScript,
-  runNpmInstall,
-  runPackageJsonScript,
-};
+module.exports = require('../dist/fs/run-user-scripts');

packages/now-build-utils/fs/stream-to-buffer.js

@@ -1,4 +1 @@
-const fastStreamToBuffer = require('fast-stream-to-buffer');
-const { promisify } = require('util');
-
-module.exports = promisify(fastStreamToBuffer);
+module.exports = require('../dist/fs/stream-to-buffer').default;

packages/now-build-utils/lambda.js

@@ -1,49 +1 @@
-const assert = require('assert');
-const { ZipFile } = require('yazl');
-const streamToBuffer = require('./fs/stream-to-buffer.js');
-
-class Lambda {
-  constructor({
-    zipBuffer, handler, runtime, environment,
-  }) {
-    this.type = 'Lambda';
-    this.zipBuffer = zipBuffer;
-    this.handler = handler;
-    this.runtime = runtime;
-    this.environment = environment;
-  }
-}
-
-const mtime = new Date(1540000000000);
-
-async function createLambda({
-  files, handler, runtime, environment = {},
-}) {
-  assert(typeof files === 'object', '"files" must be an object');
-  assert(typeof handler === 'string', '"handler" is not a string');
-  assert(typeof runtime === 'string', '"runtime" is not a string');
-  assert(typeof environment === 'object', '"environment" is not an object');
-  const zipFile = new ZipFile();
-
-  Object.keys(files)
-    .sort()
-    .forEach((name) => {
-      const file = files[name];
-      const stream = file.toStream();
-      zipFile.addReadStream(stream, name, { mode: file.mode, mtime });
-    });
-
-  zipFile.end();
-  const zipBuffer = await streamToBuffer(zipFile.outputStream);
-  return new Lambda({
-    zipBuffer,
-    handler,
-    runtime,
-    environment,
-  });
-}
-
-module.exports = {
-  Lambda,
-  createLambda,
-};
+module.exports = require('./dist/index');

packages/now-build-utils/package.json

@@ -1,19 +1,38 @@
 {
   "name": "@now/build-utils",
-  "version": "0.4.31-canary.2",
+  "version": "0.4.41-canary.3",
+  "license": "MIT",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zeit/now-builders.git",
+    "directory": "packages/now-build-utils"
+  },
   "dependencies": {
     "async-retry": "1.2.3",
     "async-sema": "2.1.4",
-    "fast-stream-to-buffer": "1.0.0",
+    "end-of-stream": "1.4.1",
     "fs-extra": "7.0.0",
     "glob": "7.1.3",
-    "into-stream": "4.0.0",
+    "into-stream": "5.0.0",
     "memory-fs": "0.4.1",
     "multistream": "2.1.1",
     "node-fetch": "2.2.0",
     "yazl": "2.4.3"
   },
   "scripts": {
-    "test": "jest"
+    "build": "tsc",
+    "test": "tsc && jest",
+    "prepublish": "tsc"
+  },
+  "devDependencies": {
+    "@types/async-retry": "^1.2.1",
+    "@types/end-of-stream": "^1.4.0",
+    "@types/fs-extra": "^5.0.5",
+    "@types/glob": "^7.1.1",
+    "@types/node-fetch": "^2.1.6",
+    "@types/yazl": "^2.4.1",
+    "typescript": "3.3.4000"
   }
 }

packages/now-build-utils/src/file-blob.ts

@@ -0,0 +1,46 @@
+import assert from 'assert';
+import intoStream from 'into-stream';
+import { File } from './types';
+
+interface FileBlobOptions {
+  mode?: number;
+  data: string | Buffer;
+}
+
+interface FromStreamOptions {
+  mode?: number;
+  stream: NodeJS.ReadableStream;
+}
+
+export default class FileBlob implements File {
+  public type: 'FileBlob';
+  public mode: number;
+  public data: string | Buffer;
+
+  constructor({ mode = 0o100644, data }: FileBlobOptions) {
+    assert(typeof mode === 'number');
+    assert(typeof data === 'string' || Buffer.isBuffer(data));
+    this.type = 'FileBlob';
+    this.mode = mode;
+    this.data = data;
+  }
+
+  static async fromStream({ mode = 0o100644, stream }: FromStreamOptions) {
+    assert(typeof mode === 'number');
+    assert(typeof stream.pipe === 'function'); // is-stream
+    const chunks: Buffer[] = [];
+
+    await new Promise<void>((resolve, reject) => {
+      stream.on('data', chunk => chunks.push(Buffer.from(chunk)));
+      stream.on('error', error => reject(error));
+      stream.on('end', () => resolve());
+    });
+
+    const data = Buffer.concat(chunks);
+    return new FileBlob({ mode, data });
+  }
+
+  toStream(): NodeJS.ReadableStream {
+    return intoStream(this.data);
+  }
+}

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

@@ -0,0 +1,90 @@
+import assert from 'assert';
+import fs from 'fs-extra';
+import multiStream from 'multistream';
+import path from 'path';
+import Sema from 'async-sema';
+import { File } from './types';
+
+const semaToPreventEMFILE = new Sema(20);
+
+interface FileFsRefOptions {
+  mode?: number;
+  fsPath: string;
+}
+
+interface FromStreamOptions {
+  mode: number;
+  stream: NodeJS.ReadableStream;
+  fsPath: string;
+}
+
+class FileFsRef implements File {
+  public type: 'FileFsRef';
+  public mode: number;
+  public fsPath: string;
+
+  constructor({ mode = 0o100644, fsPath }: FileFsRefOptions) {
+    assert(typeof mode === 'number');
+    assert(typeof fsPath === 'string');
+    this.type = 'FileFsRef';
+    this.mode = mode;
+    this.fsPath = fsPath;
+  }
+
+  static async fromFsPath({ mode, fsPath }: FileFsRefOptions): Promise<FileFsRef> {
+    let m = mode;
+    if (!m) {
+      const stat = await fs.lstat(fsPath);
+      m = stat.mode;
+    }
+    return new FileFsRef({ mode: m, fsPath });
+  }
+
+  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');
+    await fs.mkdirp(path.dirname(fsPath));
+
+    await new Promise<void>((resolve, reject) => {
+      const dest = fs.createWriteStream(fsPath, {
+        mode: mode & 0o777
+      });
+      stream.pipe(dest);
+      stream.on('error', reject);
+      dest.on('finish', resolve);
+      dest.on('error', reject);
+    });
+
+    return new FileFsRef({ mode, fsPath });
+  }
+
+  async toStreamAsync(): Promise<NodeJS.ReadableStream> {
+    await semaToPreventEMFILE.acquire();
+    const release = () => semaToPreventEMFILE.release();
+    const stream = fs.createReadStream(this.fsPath);
+    stream.on('close', release);
+    stream.on('error', release);
+    return stream;
+  }
+
+  toStream(): NodeJS.ReadableStream {
+    let flag = false;
+
+    // eslint-disable-next-line consistent-return
+    return multiStream((cb) => {
+      if (flag) return cb(null, null);
+      flag = true;
+
+      this.toStreamAsync()
+        .then((stream) => {
+          cb(null, stream);
+        })
+        .catch((error) => {
+          cb(error, null);
+        });
+    });
+  }
+}
+
+export = FileFsRef;

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

@@ -0,0 +1,93 @@
+import assert from 'assert';
+import fetch from 'node-fetch';
+import multiStream from 'multistream';
+import retry from 'async-retry';
+import Sema from 'async-sema';
+import { File } from './types';
+
+interface FileRefOptions {
+  mode?: number;
+  digest: string;
+  mutable?: boolean;
+}
+
+const semaToDownloadFromS3 = new Sema(5);
+
+class BailableError extends Error {
+  public bail: boolean;
+
+  constructor(...args: string[]) {
+    super(...args);
+    this.bail = false;
+  }
+}
+
+export default class FileRef implements File {
+  public type: 'FileRef';
+  public mode: number;
+  public digest: string;
+  public mutable: boolean;
+
+  constructor({ mode = 0o100644, digest, mutable = false }: FileRefOptions) {
+    assert(typeof mode === 'number');
+    assert(typeof digest === 'string');
+    assert(typeof mutable === 'boolean');
+    this.type = 'FileRef';
+    this.mode = mode;
+    this.digest = digest;
+    this.mutable = mutable;
+  }
+
+  async toStreamAsync(): Promise<NodeJS.ReadableStream> {
+    let url = '';
+    // sha:24be087eef9fac01d61b30a725c1a10d7b45a256
+    const digestParts = this.digest.split(':');
+    if (digestParts[0] === 'sha') {
+      url = this.mutable
+        ? `https://s3.amazonaws.com/now-files/${digestParts[1]}`
+        : `https://dmmcy0pwk6bqi.cloudfront.net/${digestParts[1]}`;
+    } else {
+      throw new Error('Expected digest to be sha');
+    }
+
+    await semaToDownloadFromS3.acquire();
+    // console.time(`downloading ${url}`);
+    try {
+      return await retry(
+        async () => {
+          const resp = await fetch(url);
+          if (!resp.ok) {
+            const error = new BailableError(
+              `download: ${resp.status} ${resp.statusText} for ${url}`,
+            );
+            if (resp.status === 403) error.bail = true;
+            throw error;
+          }
+          return resp.body;
+        },
+        { factor: 1, retries: 3 },
+      );
+    } finally {
+      // console.timeEnd(`downloading ${url}`);
+      semaToDownloadFromS3.release();
+    }
+  }
+
+  toStream(): NodeJS.ReadableStream {
+    let flag = false;
+
+    // eslint-disable-next-line consistent-return
+    return multiStream((cb) => {
+      if (flag) return cb(null, null);
+      flag = true;
+
+      this.toStreamAsync()
+        .then((stream) => {
+          cb(null, stream);
+        })
+        .catch((error) => {
+          cb(error, null);
+        });
+    });
+  }
+}

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

@@ -0,0 +1,44 @@
+import path from 'path';
+import FileFsRef from '../file-fs-ref';
+import { File, Files } from '../types';
+import { mkdirp, readlink, symlink } from 'fs-extra';
+
+export interface DownloadedFiles {
+  [filePath: string]: FileFsRef
+}
+
+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;
+}
+
+async function downloadFile(file: File, fsPath: string): Promise<FileFsRef> {
+  const { mode } = file;
+  if (mode && isSymbolicLink(mode) && file.type === 'FileFsRef') {
+    const [ target ] = await Promise.all([
+      readlink((file as FileFsRef).fsPath),
+      mkdirp(path.dirname(fsPath))
+    ]);
+    await symlink(target, fsPath);
+    return FileFsRef.fromFsPath({ mode, fsPath });
+  } else {
+    const stream = file.toStream();
+    return FileFsRef.fromStream({ mode, stream, fsPath });
+  }
+}
+
+export default async function download(files: Files, basePath: string): Promise<DownloadedFiles> {
+  const files2: DownloadedFiles = {};
+
+  await Promise.all(
+    Object.keys(files).map(async (name) => {
+      const file = files[name];
+      const fsPath = path.join(basePath, name);
+      files2[name] = await downloadFile(file, fsPath);
+    }),
+  );
+
+  return files2;
+}

packages/now-build-utils/src/fs/get-writable-directory.ts

@@ -0,0 +1,10 @@
+import { join } from 'path';
+import { tmpdir } from 'os';
+import { mkdirp } from 'fs-extra';
+
+export default async function getWritableDirectory() {
+  const name = Math.floor(Math.random() * 0x7fffffff).toString(16);
+  const directory = join(tmpdir(), name);
+  await mkdirp(directory);
+  return directory;
+}

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

@@ -0,0 +1,66 @@
+import path from 'path';
+import assert from 'assert';
+import vanillaGlob_ from 'glob';
+import { promisify } from 'util';
+import { lstat, Stats } from 'fs-extra';
+import FileFsRef from '../file-fs-ref';
+
+type GlobOptions = vanillaGlob_.IOptions;
+
+interface FsFiles {
+  [filePath: string]: FileFsRef
+}
+
+const vanillaGlob = promisify(vanillaGlob_);
+
+export default async function glob(pattern: string, opts: GlobOptions | string, mountpoint?: string): Promise<FsFiles> {
+  let options: GlobOptions;
+  if (typeof opts === 'string') {
+    options = { cwd: opts };
+  } else {
+    options = opts;
+  }
+
+  if (!options.cwd) {
+    throw new Error(
+      'Second argument (basePath) must be specified for names of resulting files',
+    );
+  }
+
+  if (!path.isAbsolute(options.cwd)) {
+    throw new Error(`basePath/cwd must be an absolute path (${options.cwd})`);
+  }
+
+  const results: FsFiles = {};
+
+  options.symlinks = {};
+  options.statCache = {};
+  options.stat = true;
+  options.dot = true;
+
+  const files = await vanillaGlob(pattern, options);
+
+  for (const relativePath of files) {
+    const fsPath = path.join(options.cwd!, relativePath);
+    let stat: Stats = options.statCache![fsPath] as Stats;
+    assert(
+      stat,
+      `statCache does not contain value for ${relativePath} (resolved to ${fsPath})`,
+    );
+    if (stat.isFile()) {
+      const isSymlink = options.symlinks![fsPath];
+      if (isSymlink) {
+        stat = await lstat(fsPath);
+      }
+
+      let finalPath = relativePath;
+      if (mountpoint) {
+        finalPath = path.join(mountpoint, finalPath);
+      }
+
+      results[finalPath] = new FileFsRef({ mode: stat.mode, fsPath });
+    }
+  }
+
+  return results;
+}

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

@@ -0,0 +1,12 @@
+import { Files } from '../types';
+type Delegate = (name: string) => string;
+
+export default function rename(files: Files, delegate: Delegate): Files {
+  return Object.keys(files).reduce(
+    (newFiles, name) => ({
+      ...newFiles,
+      [delegate(name)]: files[name],
+    }),
+    {},
+  );
+}

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

@@ -0,0 +1,112 @@
+import assert from 'assert';
+import fs from 'fs-extra';
+import path from 'path';
+import { spawn, SpawnOptions } from 'child_process';
+
+function spawnAsync(command: string, args: string[], cwd: string, opts: SpawnOptions = {}) {
+  return new Promise<void>((resolve, reject) => {
+    const child = spawn(command, args, { stdio: 'inherit', cwd, ...opts });
+    child.on('error', reject);
+    child.on('close', (code, signal) => (code !== 0
+      ? reject(new Error(`Exited with ${code || signal}`))
+      : resolve()));
+  });
+}
+
+async function chmodPlusX(fsPath: string) {
+  const s = await fs.stat(fsPath);
+  const newMode = s.mode | 64 | 8 | 1; // eslint-disable-line no-bitwise
+  if (s.mode === newMode) return;
+  const base8 = newMode.toString(8).slice(-3);
+  await fs.chmod(fsPath, base8);
+}
+
+export async function runShellScript(fsPath: string) {
+  assert(path.isAbsolute(fsPath));
+  const destPath = path.dirname(fsPath);
+  await chmodPlusX(fsPath);
+  await spawnAsync(`./${path.basename(fsPath)}`, [], destPath);
+  return true;
+}
+
+async function scanParentDirs(destPath: string, scriptName?: string) {
+  assert(path.isAbsolute(destPath));
+
+  let hasScript = false;
+  let hasPackageLockJson = false;
+  let currentDestPath = destPath;
+
+  // eslint-disable-next-line no-constant-condition
+  while (true) {
+    const packageJsonPath = path.join(currentDestPath, 'package.json');
+    // 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],
+      );
+      // eslint-disable-next-line no-await-in-loop
+      hasPackageLockJson = await fs.pathExists(
+        path.join(currentDestPath, 'package-lock.json'),
+      );
+      break;
+    }
+
+    const newDestPath = path.dirname(currentDestPath);
+    if (currentDestPath === newDestPath) break;
+    currentDestPath = newDestPath;
+  }
+
+  return { hasScript, hasPackageLockJson };
+}
+
+export async function installDependencies(destPath: string, args: string[] = []) {
+  assert(path.isAbsolute(destPath));
+
+  let commandArgs = args;
+  console.log(`installing to ${destPath}`);
+  const { hasPackageLockJson } = await scanParentDirs(destPath);
+
+  const opts = {
+    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',
+    },
+  };
+
+  if (hasPackageLockJson) {
+    commandArgs = args.filter(a => a !== '--prefer-offline');
+    await spawnAsync('npm', ['install'].concat(commandArgs), destPath, opts);
+  } else {
+    await spawnAsync(
+      'yarn',
+      ['--cwd', destPath].concat(commandArgs),
+      destPath,
+      opts,
+    );
+  }
+}
+
+export async function runPackageJsonScript(destPath: string, scriptName: string) {
+  assert(path.isAbsolute(destPath));
+  const { hasScript, hasPackageLockJson } = await scanParentDirs(
+    destPath,
+    scriptName,
+  );
+  if (!hasScript) return false;
+
+  if (hasPackageLockJson) {
+    console.log(`running "npm run ${scriptName}"`);
+    await spawnAsync('npm', ['run', scriptName], destPath);
+  } else {
+    console.log(`running "yarn run ${scriptName}"`);
+    await spawnAsync('yarn', ['--cwd', destPath, 'run', scriptName], destPath);
+  }
+
+  return true;
+}
+
+export const runNpmInstall = installDependencies;

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

@@ -0,0 +1,26 @@
+import eos from 'end-of-stream';
+
+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))
+
+    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

@@ -0,0 +1,30 @@
+import FileBlob from './file-blob';
+import FileFsRef from './file-fs-ref';
+import FileRef from './file-ref';
+import { File, Files, AnalyzeOptions, BuildOptions, PrepareCacheOptions } from './types';
+import { Lambda, createLambda } from './lambda';
+import download 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 streamToBuffer from './fs/stream-to-buffer';
+
+export {
+    FileBlob,
+    FileFsRef,
+    FileRef,
+    Files,
+    File,
+    Lambda,
+    createLambda,
+    download,
+    getWriteableDirectory,
+    glob,
+    rename,
+    installDependencies, runPackageJsonScript, runNpmInstall, runShellScript,
+    streamToBuffer,
+    AnalyzeOptions,
+    BuildOptions,
+    PrepareCacheOptions,
+};

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

@@ -0,0 +1,80 @@
+import assert from 'assert';
+import Sema from 'async-sema';
+import { ZipFile } from 'yazl';
+import streamToBuffer from './fs/stream-to-buffer';
+import { Files } from './types';
+
+interface Environment {
+  [key: string]: string;
+}
+
+interface LambdaOptions {
+  zipBuffer: Buffer;
+  handler: string;
+  runtime: string;
+  environment: Environment;
+}
+
+interface CreateLambdaOptions {
+  files: Files;
+  handler: string;
+  runtime: string;
+  environment?: Environment;
+}
+
+export class Lambda {
+  public type: 'Lambda';
+  public zipBuffer: Buffer;
+  public handler: string;
+  public runtime: string;
+  public environment: Environment;
+
+  constructor({
+    zipBuffer, handler, runtime, environment,
+  }: LambdaOptions) {
+    this.type = 'Lambda';
+    this.zipBuffer = zipBuffer;
+    this.handler = handler;
+    this.runtime = runtime;
+    this.environment = environment;
+  }
+}
+
+const sema = new Sema(10);
+const mtime = new Date(1540000000000);
+
+export async function createLambda({
+  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');
+  assert(typeof runtime === 'string', '"runtime" is not a string');
+  assert(typeof environment === 'object', '"environment" is not an object');
+
+  await sema.acquire();
+  try {
+    const zipFile = new ZipFile();
+    const zipBuffer = await new Promise<Buffer>((resolve, reject) => {
+      Object.keys(files)
+        .sort()
+        .forEach((name) => {
+          const file = files[name];
+          const stream = file.toStream() as import('stream').Readable;
+          stream.on('error', reject);
+          zipFile.addReadStream(stream, name, { mode: file.mode, mtime });
+        });
+
+      zipFile.end();
+      streamToBuffer(zipFile.outputStream).then(resolve).catch(reject);
+    });
+
+    return new Lambda({
+      zipBuffer,
+      handler,
+      runtime,
+      environment,
+    });
+  } finally {
+    sema.release();
+  }
+}

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

@@ -0,0 +1,101 @@
+export interface File {
+  type: string;
+  mode: number;
+  toStream: () => NodeJS.ReadableStream;
+}
+
+export interface Files {
+  [filePath: string]: File
+}
+
+export interface Config {
+  [key: string]: string
+}
+
+export interface AnalyzeOptions {
+  /**
+   * All source files of the project
+   */
+  files: Files;
+
+  /**
+   * Name of entrypoint file for this particular build job. Value
+   * `files[entrypoint]` is guaranteed to exist and be a valid File reference.
+   * `entrypoint` is always a discrete file and never a glob, since globs are
+   * expanded into separate builds at deployment time.
+   */
+  entrypoint: string;
+
+  /**
+   * A writable temporary directory where you are encouraged to perform your
+   * build process. This directory will be populated with the restored cache.
+   */
+  workPath: string;
+
+  /**
+   * An arbitrary object passed by the user in the build definition defined
+   * in `now.json`.
+   */
+  config: Config;
+}
+
+
+export interface BuildOptions {
+  /**
+   * All source files of the project
+   */
+  files: Files;
+
+  /**
+   * Name of entrypoint file for this particular build job. Value
+   * `files[entrypoint]` is guaranteed to exist and be a valid File reference.
+   * `entrypoint` is always a discrete file and never a glob, since globs are
+   * expanded into separate builds at deployment time.
+   */
+  entrypoint: string;
+
+  /**
+   * A writable temporary directory where you are encouraged to perform your
+   * build process. This directory will be populated with the restored cache.
+   */
+  workPath: string;
+
+  /**
+   * An arbitrary object passed by the user in the build definition defined
+   * in `now.json`.
+   */
+  config: Config;
+}
+
+export interface PrepareCacheOptions {
+  /**
+   * All source files of the project
+   */
+  files: Files;
+
+  /**
+   * Name of entrypoint file for this particular build job. Value
+   * `files[entrypoint]` is guaranteed to exist and be a valid File reference.
+   * `entrypoint` is always a discrete file and never a glob, since globs are
+   * expanded into separate builds at deployment time.
+   */
+  entrypoint: string;
+
+  /**
+   * A writable temporary directory where you are encouraged to perform your
+   * build process.
+   */
+  workPath: string;
+
+  /**
+   * A writable temporary directory where you can build a cache to use for
+   * the next run.
+   */
+  cachePath: string;
+
+  /**
+   * An arbitrary object passed by the user in the build definition defined
+   * in `now.json`.
+   */
+  config: Config;
+}

packages/now-build-utils/test/fixtures/07-cross-install/api/index.js

@@ -0,0 +1,5 @@
+const cowsay = require('cowsay').say;
+
+module.exports = (req, resp) => {
+  resp.end(cowsay({ text: 'cross-cow:RANDOMNESS_PLACEHOLDER' }));
+};

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

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "lib": "../lib"
+  }
+}

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

@@ -0,0 +1,7 @@
+{
+  "name": "lib",
+  "version": "0.0.1",
+  "dependencies": {
+    "cowsay": "*"
+  }
+}

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

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

packages/now-build-utils/test/symlinks/a.txt

@@ -0,0 +1 @@
+contents

packages/now-build-utils/test/symlinks/link.txt

@@ -0,0 +1 @@
+./a.txt

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

@@ -1,13 +1,15 @@
 /* global beforeAll, expect, it, jest */
-const fs = require('fs');
 const path = require('path');
+const fs = require('fs-extra');
+const assert = require('assert');
+const { glob, download } = require('../');
 
 const {
   packAndDeploy,
   testDeployment,
 } = require('../../../test/lib/deployment/test-deployment.js');
 
-jest.setTimeout(2 * 60 * 1000);
+jest.setTimeout(4 * 60 * 1000);
 const builderUrl = '@canary';
 let buildUtilsUrl;
 
@@ -17,6 +19,26 @@ beforeAll(async () => {
   console.log('buildUtilsUrl', buildUtilsUrl);
 });
 
+// unit tests
+
+it('should re-create symlinks properly', async () => {
+  const files = await glob('**', path.join(__dirname, 'symlinks'));
+  assert.equal(Object.keys(files).length, 2);
+
+  const outDir = path.join(__dirname, 'symlinks-out');
+  await fs.remove(outDir);
+
+  const files2 = await download(files, outDir);
+  assert.equal(Object.keys(files2).length, 2);
+
+  const [linkStat, aStat] = await Promise.all([
+    fs.lstat(path.join(outDir, 'link.txt')),
+    fs.lstat(path.join(outDir, 'a.txt')),
+  ]);
+  assert(linkStat.isSymbolicLink());
+  assert(aStat.isFile());
+});
+
 // own fixtures
 
 const fixturesPath = path.resolve(__dirname, 'fixtures');

packages/now-build-utils/tsconfig.json

@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "declaration": true,
+    "esModuleInterop": true,
+    "lib": ["esnext"],
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "noEmitOnError": true,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitReturns": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "outDir": "./dist",
+    "types": ["node"],
+    "strict": true,
+    "target": "esnext"
+  },
+  "include": [
+    "src/**/*"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
+}

packages/now-cgi/index.js

@@ -1,10 +1,10 @@
 const path = require('path');
 const { mkdirp, copyFile } = require('fs-extra');
 
-const glob = require('@now/build-utils/fs/glob');
-const download = require('@now/build-utils/fs/download');
-const { createLambda } = require('@now/build-utils/lambda');
-const getWritableDirectory = require('@now/build-utils/fs/get-writable-directory');
+const glob = require('@now/build-utils/fs/glob'); // eslint-disable-line import/no-extraneous-dependencies
+const download = require('@now/build-utils/fs/download'); // eslint-disable-line import/no-extraneous-dependencies
+const { createLambda } = require('@now/build-utils/lambda'); // eslint-disable-line import/no-extraneous-dependencies
+const getWritableDirectory = require('@now/build-utils/fs/get-writable-directory'); // eslint-disable-line import/no-extraneous-dependencies
 
 exports.analyze = ({ files, entrypoint }) => files[entrypoint].digest;
 

packages/now-cgi/package.json

@@ -1,6 +1,12 @@
 {
   "name": "@now/cgi",
-  "version": "0.0.14-canary.0",
+  "version": "0.0.16-canary.0",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zeit/now-builders.git",
+    "directory": "packages/now-cgi"
+  },
   "scripts": {
     "test": "best -I test/*.js",
     "prepublish": "./build.sh"
@@ -15,8 +21,5 @@
   "devDependencies": {
     "@zeit/best": "0.4.3",
     "rmfr": "2.0.0"
-  },
-  "peerDependencies": {
-    "@now/build-utils": ">=0.0.1"
   }
 }

packages/now-go/.gitignore

@@ -1,4 +1,5 @@
 node_modules
 *.log
-launcher
-bin
+/?.js
+/go
+/get-exported-function-name

packages/now-go/build.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-mkdir -p bin
-cd util
-GOOS=linux GOARCH=amd64 go build get-exported-function-name.go
-mv get-exported-function-name ../bin/
-

packages/now-go/download-go-bin.js

@@ -1,23 +0,0 @@
-const path = require('path');
-
-const fetch = require('node-fetch');
-const tar = require('tar');
-const getWritableDirectory = require('@now/build-utils/fs/get-writable-directory.js');
-
-const url = 'https://dl.google.com/go/go1.11.1.linux-amd64.tar.gz';
-
-module.exports = async () => {
-  const res = await fetch(url);
-  const dir = await getWritableDirectory();
-
-  if (!res.ok) {
-    throw new Error(`Failed to download: ${url}`);
-  }
-
-  return new Promise((resolve, reject) => {
-    res.body
-      .on('error', reject)
-      .pipe(tar.extract({ cwd: dir, strip: 1 }))
-      .on('finish', () => resolve(path.join(dir, 'bin', 'go')));
-  });
-};

packages/now-go/go-helpers.js

@@ -0,0 +1,129 @@
+const tar = require('tar');
+const execa = require('execa');
+const fetch = require('node-fetch');
+const { mkdirp } = require('fs-extra');
+const { dirname, join } = require('path');
+const debug = require('debug')('@now/go:go-helpers');
+
+const archMap = new Map([['x64', 'amd64'], ['x86', '386']]);
+const platformMap = new Map([['win32', 'windows']]);
+
+// Location where the `go` binary will be installed after `postinstall`
+const GO_DIR = join(__dirname, 'go');
+const GO_BIN = join(GO_DIR, 'bin/go');
+
+const getPlatform = p => platformMap.get(p) || p;
+const getArch = a => archMap.get(a) || a;
+const getGoUrl = (version, platform, arch) => {
+  const goArch = getArch(arch);
+  const goPlatform = getPlatform(platform);
+  const ext = platform === 'win32' ? 'zip' : 'tar.gz';
+  return `https://dl.google.com/go/go${version}.${goPlatform}-${goArch}.${ext}`;
+};
+
+async function getExportedFunctionName(filePath) {
+  debug('Detecting handler name for %o', filePath);
+  const bin = join(__dirname, 'get-exported-function-name');
+  const args = [filePath];
+  const name = await execa.stdout(bin, args);
+  debug('Detected exported name %o', name);
+  return name;
+}
+
+// Creates a `$GOPATH` directory tree, as per `go help gopath` instructions.
+// Without this, `go` won't recognize the `$GOPATH`.
+function createGoPathTree(goPath, platform, arch) {
+  const tuple = `${getPlatform(platform)}_${getArch(arch)}`;
+  debug('Creating GOPATH directory structure for %o (%s)', goPath, tuple);
+  return Promise.all([
+    mkdirp(join(goPath, 'bin')),
+    mkdirp(join(goPath, 'pkg', tuple)),
+  ]);
+}
+
+async function get({ src } = {}) {
+  const args = ['get'];
+  if (src) {
+    debug('Fetching `go` dependencies for file %o', src);
+    args.push(src);
+  } else {
+    debug('Fetching `go` dependencies for cwd %o', this.cwd);
+  }
+  await this(...args);
+}
+
+async function build({ src, dest }) {
+  debug('Building `go` binary %o -> %o', src, dest);
+  let sources;
+  if (Array.isArray(src)) {
+    sources = src;
+  } else {
+    sources = [src];
+  }
+  await this('build', '-o', dest, ...sources);
+}
+
+async function createGo(
+  goPath,
+  platform = process.platform,
+  arch = process.arch,
+  opts = {},
+  goMod = false,
+) {
+  const env = {
+    ...process.env,
+    PATH: `${dirname(GO_BIN)}:${process.env.PATH}`,
+    GOPATH: goPath,
+    ...opts.env,
+  };
+
+  if (goMod) {
+    env.GO111MODULE = 'on';
+  }
+
+  function go(...args) {
+    debug('Exec %o', `go ${args.join(' ')}`);
+    return execa('go', args, { stdio: 'inherit', ...opts, env });
+  }
+  go.cwd = opts.cwd || process.cwd();
+  go.get = get;
+  go.build = build;
+  go.goPath = goPath;
+  await createGoPathTree(goPath, platform, arch);
+  return go;
+}
+
+async function downloadGo(
+  dir = GO_DIR,
+  version = '1.12',
+  platform = process.platform,
+  arch = process.arch,
+) {
+  debug('Installing `go` v%s to %o for %s %s', version, dir, platform, arch);
+
+  const url = getGoUrl(version, platform, arch);
+  debug('Downloading `go` URL: %o', url);
+  const res = await fetch(url);
+
+  if (!res.ok) {
+    throw new Error(`Failed to download: ${url} (${res.status})`);
+  }
+
+  // TODO: use a zip extractor when `ext === "zip"`
+  await mkdirp(dir);
+  await new Promise((resolve, reject) => {
+    res.body
+      .on('error', reject)
+      .pipe(tar.extract({ cwd: dir, strip: 1 }))
+      .on('error', reject)
+      .on('finish', resolve);
+  });
+
+  return createGo(dir, platform, arch);
+}
+
+module.exports = {
+  createGo,
+  downloadGo,
+  getExportedFunctionName,
+};

packages/now-go/index.js

@@ -1,126 +1,198 @@
-const path = require('path');
-const { mkdirp, readFile, writeFile } = require('fs-extra');
+const { join, sep, dirname } = require('path');
+const {
+  readFile, writeFile, pathExists, move,
+} = require('fs-extra');
 
-const execa = require('execa');
-const { createLambda } = require('@now/build-utils/lambda.js');
-const getWritableDirectory = require('@now/build-utils/fs/get-writable-directory.js');
-const download = require('@now/build-utils/fs/download.js');
-const downloadGit = require('lambda-git');
-const glob = require('@now/build-utils/fs/glob.js');
-const downloadGoBin = require('./download-go-bin');
+const glob = require('@now/build-utils/fs/glob.js'); // eslint-disable-line import/no-extraneous-dependencies
+const download = require('@now/build-utils/fs/download.js'); // eslint-disable-line import/no-extraneous-dependencies
+const { createLambda } = require('@now/build-utils/lambda.js'); // eslint-disable-line import/no-extraneous-dependencies
+const getWritableDirectory = require('@now/build-utils/fs/get-writable-directory.js'); // eslint-disable-line import/no-extraneous-dependencies
+const { createGo, getExportedFunctionName } = require('./go-helpers');
 
-// creates a `$GOPATH` directory tree, as per
-// `go help gopath`'s instructions.
-// without this, Go won't recognize the `$GOPATH`
-async function createGoPathTree(goPath) {
-  await mkdirp(path.join(goPath, 'bin'));
-  await mkdirp(path.join(goPath, 'pkg', 'linux_amd64'));
-}
-
-exports.config = {
+const config = {
   maxLambdaSize: '10mb',
 };
 
-exports.build = async ({ files, entrypoint }) => {
-  console.log('downloading files...');
+async function build({ files, entrypoint }) {
+  console.log('Downloading user files...');
 
-  const gitPath = await getWritableDirectory();
-  const goPath = await getWritableDirectory();
-  const srcPath = path.join(goPath, 'src', 'lambda');
-  const outDir = await getWritableDirectory();
-
-  await createGoPathTree(goPath);
+  const [goPath, outDir] = await Promise.all([
+    getWritableDirectory(),
+    getWritableDirectory(),
+  ]);
 
+  const srcPath = join(goPath, 'src', 'lambda');
   const downloadedFiles = await download(files, srcPath);
 
-  console.log('downloading go binary...');
-  const goBin = await downloadGoBin();
-
-  console.log('downloading git binary...');
-  // downloads a git binary that works on Amazon Linux and sets
-  // `process.env.GIT_EXEC_PATH` so `go(1)` can see it
-  await downloadGit({ targetDirectory: gitPath });
-
-  const goEnv = {
-    ...process.env,
-    GOOS: 'linux',
-    GOARCH: 'amd64',
-    GOPATH: goPath,
-  };
-
-  console.log(`parsing AST for "${entrypoint}"`);
-  let handlerFunctionName = '';
+  console.log(`Parsing AST for "${entrypoint}"`);
+  let parseFunctionName;
   try {
-    handlerFunctionName = await execa.stdout(
-      path.join(__dirname, 'bin', 'get-exported-function-name'),
-      [downloadedFiles[entrypoint].fsPath],
+    parseFunctionName = await getExportedFunctionName(
+      downloadedFiles[entrypoint].fsPath,
     );
   } catch (err) {
-    console.log(`failed to parse AST for "${entrypoint}"`);
+    console.log(`Failed to parse AST for "${entrypoint}"`);
     throw err;
   }
 
-  if (handlerFunctionName === '') {
-    const e = new Error(
-      `Could not find an exported function on "${entrypoint}"`,
+  if (!parseFunctionName) {
+    const err = new Error(
+      `Could not find an exported function in "${entrypoint}"`,
     );
-    console.log(e.message);
-    throw e;
+    console.log(err.message);
+    throw err;
   }
 
-  console.log(
-    `Found exported function "${handlerFunctionName}" on "${entrypoint}"`,
-  );
+  const handlerFunctionName = parseFunctionName.split(',')[0];
 
-  const origianlMainGoContents = await readFile(
-    path.join(__dirname, 'main.go'),
-    'utf8',
+  console.log(
+    `Found exported function "${handlerFunctionName}" in "${entrypoint}"`,
   );
-  const mainGoContents = origianlMainGoContents.replace(
-    '__NOW_HANDLER_FUNC_NAME',
-    handlerFunctionName,
-  );
-  // in order to allow the user to have `main.go`, we need our `main.go` to be called something else
-  const mainGoFileName = 'main__now__go__.go';
 
   // we need `main.go` in the same dir as the entrypoint,
   // otherwise `go build` will refuse to build
-  const entrypointDirname = path.dirname(downloadedFiles[entrypoint].fsPath);
+  const entrypointDirname = dirname(downloadedFiles[entrypoint].fsPath);
 
-  // Go doesn't like to build files in different directories,
-  // so now we place `main.go` together with the user code
-  await writeFile(path.join(entrypointDirname, mainGoFileName), mainGoContents);
-
-  console.log('installing dependencies');
-  // `go get` will look at `*.go` (note we set `cwd`), parse
-  // the `import`s and download any packages that aren't part of the stdlib
-  try {
-    await execa(goBin, ['get'], {
-      env: goEnv,
-      cwd: entrypointDirname,
-      stdio: 'inherit',
-    });
-  } catch (err) {
-    console.log('failed to `go get`');
-    throw err;
-  }
-
-  console.log('running go build...');
-  try {
-    await execa(
-      goBin,
-      [
-        'build',
-        '-o',
-        path.join(outDir, 'handler'),
-        path.join(entrypointDirname, mainGoFileName),
-        downloadedFiles[entrypoint].fsPath,
-      ],
-      { env: goEnv, cwd: entrypointDirname, stdio: 'inherit' },
+  // check if package name other than main
+  const packageName = parseFunctionName.split(',')[1];
+  const isGoModExist = await pathExists(join(entrypointDirname, 'go.mod'));
+  if (packageName !== 'main') {
+    const go = await createGo(
+      goPath,
+      process.platform,
+      process.arch,
+      {
+        cwd: entrypointDirname,
+      },
+      true,
     );
-  } catch (err) {
-    console.log('failed to `go build`');
-    throw err;
+    if (!isGoModExist) {
+      try {
+        const defaultGoModContent = `module ${packageName}`;
+
+        await writeFile(join(entrypointDirname, 'go.mod'), defaultGoModContent);
+      } catch (err) {
+        console.log(`failed to create default go.mod for ${packageName}`);
+        throw err;
+      }
+    }
+
+    const mainModGoFileName = 'main__mod__.go';
+    const modMainGoContents = await readFile(
+      join(__dirname, mainModGoFileName),
+      'utf8',
+    );
+
+    let goPackageName = `${packageName}/${packageName}`;
+    const goFuncName = `${packageName}.${handlerFunctionName}`;
+
+    if (isGoModExist) {
+      const goModContents = await readFile(
+        join(entrypointDirname, 'go.mod'),
+        'utf8',
+      );
+      goPackageName = `${
+        goModContents.split('\n')[0].split(' ')[1]
+      }/${packageName}`;
+    }
+
+    const mainModGoContents = modMainGoContents
+      .replace('__NOW_HANDLER_PACKAGE_NAME', goPackageName)
+      .replace('__NOW_HANDLER_FUNC_NAME', goFuncName);
+
+    // write main__mod__.go
+    await writeFile(
+      join(entrypointDirname, mainModGoFileName),
+      mainModGoContents,
+    );
+
+    // move user go file to folder
+    try {
+      // default path
+      let finalDestination = join(entrypointDirname, packageName, entrypoint);
+      const entrypointArr = entrypoint.split(sep);
+
+      // if `entrypoint` include folder, only use filename
+      if (entrypointArr.length > 1) {
+        finalDestination = join(
+          entrypointDirname,
+          packageName,
+          entrypointArr.pop(),
+        );
+      }
+
+      await move(downloadedFiles[entrypoint].fsPath, finalDestination);
+    } catch (err) {
+      console.log('failed to move entry to package folder');
+      throw err;
+    }
+
+    console.log('tidy go.mod file');
+    try {
+      // ensure go.mod up-to-date
+      await go('mod', 'tidy');
+    } catch (err) {
+      console.log('failed to `go mod tidy`');
+      throw err;
+    }
+
+    console.log('Running `go build`...');
+    const destPath = join(outDir, 'handler');
+    try {
+      const src = [join(entrypointDirname, mainModGoFileName)];
+      await go.build({ src, dest: destPath });
+    } catch (err) {
+      console.log('failed to `go build`');
+      throw err;
+    }
+  } else {
+    const go = await createGo(
+      goPath,
+      process.platform,
+      process.arch,
+      {
+        cwd: entrypointDirname,
+      },
+      false,
+    );
+    const origianlMainGoContents = await readFile(
+      join(__dirname, 'main.go'),
+      'utf8',
+    );
+    const mainGoContents = origianlMainGoContents.replace(
+      '__NOW_HANDLER_FUNC_NAME',
+      handlerFunctionName,
+    );
+
+    // in order to allow the user to have `main.go`,
+    // we need our `main.go` to be called something else
+    const mainGoFileName = 'main__now__go__.go';
+
+    // Go doesn't like to build files in different directories,
+    // so now we place `main.go` together with the user code
+    await writeFile(join(entrypointDirname, mainGoFileName), mainGoContents);
+
+    // `go get` will look at `*.go` (note we set `cwd`), parse the `import`s
+    // and download any packages that aren't part of the stdlib
+    try {
+      await go.get();
+    } catch (err) {
+      console.log('failed to `go get`');
+      throw err;
+    }
+
+    console.log('Running `go build`...');
+    const destPath = join(outDir, 'handler');
+    try {
+      const src = [
+        join(entrypointDirname, mainGoFileName),
+        downloadedFiles[entrypoint].fsPath,
+      ];
+      await go.build({ src, dest: destPath });
+    } catch (err) {
+      console.log('failed to `go build`');
+      throw err;
+    }
   }
 
   const lambda = await createLambda({
@@ -133,4 +205,6 @@ exports.build = async ({ files, entrypoint }) => {
   return {
     [entrypoint]: lambda,
   };
-};
+}
+
+module.exports = { config, build };

packages/now-go/main.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	now "../../utils/go/bridge"
 	"net/http"
+	now "github.com/zeit/now-builders/utils/go/bridge"
 )
 
 func main() {

packages/now-go/main__mod__.go

@@ -0,0 +1,12 @@
+package main
+
+import (
+  "net/http"
+  "__NOW_HANDLER_PACKAGE_NAME"
+
+  now "github.com/zeit/now-builders/utils/go/bridge"
+)
+
+func main() {
+  now.Start(http.HandlerFunc(__NOW_HANDLER_FUNC_NAME))
+}

packages/now-go/package.json

@@ -1,29 +1,27 @@
 {
   "name": "@now/go",
-  "version": "0.2.11-canary.1",
+  "version": "0.3.1-canary.3",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zeit/now-builders.git",
+    "directory": "packages/now-go"
+  },
   "scripts": {
-    "test": "best -I test/*.js",
-    "prepublish": "./build.sh"
+    "postinstall": "node ./util/install"
   },
   "files": [
-    "bin",
-    "download-go-bin.js",
-    "index.js",
-    "main.go"
+    "*.js",
+    "main.go",
+    "main__mod__.go",
+    "util"
   ],
   "dependencies": {
+    "debug": "^4.1.1",
     "execa": "^1.0.0",
     "fs-extra": "^7.0.0",
-    "lambda-git": "^0.1.2",
     "mkdirp-promise": "5.0.1",
     "node-fetch": "^2.2.1",
     "tar": "4.4.6"
-  },
-  "devDependencies": {
-    "@zeit/best": "0.4.3",
-    "rmfr": "2.0.0"
-  },
-  "peerDependencies": {
-    "@now/build-utils": ">=0.0.1"
   }
 }

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

@@ -0,0 +1,13 @@
+package cowsay
+
+import (
+	"fmt"
+	"net/http"
+
+	say "github.com/dhruvbird/go-cowsay"
+)
+
+// Handler function
+func Handler(w http.ResponseWriter, r *http.Request) {
+	fmt.Fprintf(w, say.Format("cow:RANDOMNESS_PLACEHOLDER"))
+}

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

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

packages/now-go/test/fixtures/01-cowsay/subdirectory/index.go

@@ -0,0 +1,13 @@
+package subcow
+
+import (
+	"fmt"
+	"net/http"
+
+	say "github.com/dhruvbird/go-cowsay"
+)
+
+// Handler function
+func Handler(w http.ResponseWriter, r *http.Request) {
+	fmt.Fprintf(w, say.Format("subcow:RANDOMNESS_PLACEHOLDER"))
+}

packages/now-go/test/test.js

@@ -0,0 +1,33 @@
+/* global beforeAll, expect, it, jest */
+const fs = require('fs');
+const path = require('path');
+
+const {
+  packAndDeploy,
+  testDeployment,
+} = require('../../../test/lib/deployment/test-deployment.js');
+
+jest.setTimeout(4 * 60 * 1000);
+const buildUtilsUrl = '@canary';
+let builderUrl;
+
+beforeAll(async () => {
+  const builderPath = path.resolve(__dirname, '..');
+  builderUrl = await packAndDeploy(builderPath);
+  console.log('builderUrl', builderUrl);
+});
+
+const fixturesPath = path.resolve(__dirname, 'fixtures');
+
+// eslint-disable-next-line no-restricted-syntax
+for (const fixture of fs.readdirSync(fixturesPath)) {
+  // eslint-disable-next-line no-loop-func
+  it(`should build ${fixture}`, async () => {
+    await expect(
+      testDeployment(
+        { builderUrl, buildUtilsUrl },
+        path.join(fixturesPath, fixture),
+      ),
+    ).resolves.toBeDefined();
+  });
+}

packages/now-go/util/get-exported-function-name.go

@@ -34,7 +34,7 @@ func main() {
 		if fn.Name.IsExported() == true {
 			// we found the first exported function
 			// we're done!
-			fmt.Print(fn.Name.Name)
+			fmt.Print(fn.Name.Name, ",", parsed.Name.Name)
 			os.Exit(0)
 		}
 	}

packages/now-go/util/install.js

@@ -0,0 +1,18 @@
+const { join } = require('path');
+const { downloadGo } = require('../go-helpers');
+
+async function main() {
+  // First download the `go` binary for this platform/arch.
+  const go = await downloadGo();
+
+  // Build the `get-exported-function-name` helper program.
+  // `go get` is not necessary because the program has no external deps.
+  const src = join(__dirname, 'get-exported-function-name.go');
+  const dest = join(__dirname, '../get-exported-function-name');
+  await go.build({ src, dest });
+}
+
+main().catch((err) => {
+  console.error(err);
+  process.exit(1);
+});

packages/now-html-minifier/index.js

@@ -1,4 +1,4 @@
-const FileBlob = require('@now/build-utils/file-blob.js');
+const FileBlob = require('@now/build-utils/file-blob.js'); // eslint-disable-line import/no-extraneous-dependencies
 const { minify } = require('html-minifier');
 
 const defaultOptions = {
@@ -11,7 +11,6 @@ const defaultOptions = {
   removeRedundantAttributes: true,
   useShortDoctype: true,
   collapseWhitespace: true,
-  collapseInlineTagWhitespace: true,
   collapseBooleanAttributes: true,
   caseSensitive: true,
 };

packages/now-html-minifier/package.json

@@ -1,10 +1,13 @@
 {
   "name": "@now/html-minifier",
-  "version": "1.0.6",
+  "version": "1.0.8-canary.1",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zeit/now-builders.git",
+    "directory": "packages/now-html-minifier"
+  },
   "dependencies": {
     "html-minifier": "3.5.21"
-  },
-  "peerDependencies": {
-    "@now/build-utils": ">=0.0.1"
   }
 }

packages/now-lambda/index.js

@@ -1,5 +1,5 @@
-const { Lambda } = require('@now/build-utils/lambda.js');
-const streamToBuffer = require('@now/build-utils/fs/stream-to-buffer.js');
+const { Lambda } = require('@now/build-utils/lambda.js'); // eslint-disable-line import/no-extraneous-dependencies
+const streamToBuffer = require('@now/build-utils/fs/stream-to-buffer.js'); // eslint-disable-line import/no-extraneous-dependencies
 
 exports.build = async ({ files, entrypoint, config }) => {
   if (!files[entrypoint]) throw new Error('Entrypoint not found in files');

packages/now-lambda/package.json

@@ -1,8 +1,11 @@
 {
   "name": "@now/lambda",
-  "version": "0.4.8-canary.1",
-  "peerDependencies": {
-    "@now/build-utils": ">=0.0.1"
+  "version": "0.4.10-canary.1",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zeit/now-builders.git",
+    "directory": "packages/now-lambda"
   },
   "scripts": {
     "test": "jest"

packages/now-lambda/test/test.js

@@ -7,7 +7,7 @@ const {
   testDeployment,
 } = require('../../../test/lib/deployment/test-deployment.js');
 
-jest.setTimeout(2 * 60 * 1000);
+jest.setTimeout(4 * 60 * 1000);
 const buildUtilsUrl = '@canary';
 let builderUrl;
 

packages/now-md/index.js

@@ -1,4 +1,4 @@
-const FileBlob = require('@now/build-utils/file-blob.js');
+const FileBlob = require('@now/build-utils/file-blob.js'); // eslint-disable-line import/no-extraneous-dependencies
 const unified = require('unified');
 const unifiedStream = require('unified-stream');
 const markdown = require('remark-parse');
@@ -34,8 +34,6 @@ exports.build = async ({ files, entrypoint, config }) => {
     stream: stream.pipe(unifiedStream(processor)),
   });
 
-  console.log(result.data.toString());
-
   const replacedEntrypoint = entrypoint.replace(/\.[^.]+$/, '.html');
 
   return { [replacedEntrypoint]: result };

packages/now-md/package.json

@@ -1,6 +1,12 @@
 {
   "name": "@now/md",
-  "version": "0.4.8-canary.2",
+  "version": "0.4.10-canary.2",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zeit/now-builders.git",
+    "directory": "packages/now-md"
+  },
   "dependencies": {
     "rehype-document": "^2.2.0",
     "rehype-format": "^2.3.0",
@@ -10,9 +16,6 @@
     "unified": "^7.0.0",
     "unified-stream": "^1.0.2"
   },
-  "peerDependencies": {
-    "@now/build-utils": ">=0.0.1"
-  },
   "scripts": {
     "test": "jest"
   }

packages/now-md/test/test.js

@@ -7,7 +7,7 @@ const {
   testDeployment,
 } = require('../../../test/lib/deployment/test-deployment.js');
 
-jest.setTimeout(2 * 60 * 1000);
+jest.setTimeout(4 * 60 * 1000);
 const buildUtilsUrl = '@canary';
 let builderUrl;
 

packages/now-mdx-deck/index.js

@@ -1,12 +1,10 @@
-const download = require('@now/build-utils/fs/download.js');
+const download = require('@now/build-utils/fs/download.js'); // eslint-disable-line import/no-extraneous-dependencies
 const fs = require('fs');
 const { promisify } = require('util');
-const getWritableDirectory = require('@now/build-utils/fs/get-writable-directory.js');
-const glob = require('@now/build-utils/fs/glob.js');
+const getWritableDirectory = require('@now/build-utils/fs/get-writable-directory.js'); // eslint-disable-line import/no-extraneous-dependencies
+const glob = require('@now/build-utils/fs/glob.js'); // eslint-disable-line import/no-extraneous-dependencies
 const path = require('path');
-const { runNpmInstall } = require('@now/build-utils/fs/run-user-scripts.js');
-
-exports.analyze = ({ files, entrypoint }) => files[entrypoint].digest;
+const { runNpmInstall } = require('@now/build-utils/fs/run-user-scripts.js'); // eslint-disable-line import/no-extraneous-dependencies
 
 const writeFile = promisify(fs.writeFile);
 
@@ -17,7 +15,7 @@ exports.build = async ({ files, entrypoint, workPath }) => {
   const packageJson = { dependencies: { 'mdx-deck': '1.7.15' } };
   const packageJsonPath = path.join(workPath, 'package.json');
   await writeFile(packageJsonPath, JSON.stringify(packageJson));
-  console.log('running npm install...');
+  console.log('installing dependencies...');
   process.env.PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = '1'; // TODO opts argument for runNpmInstall
   await runNpmInstall(path.dirname(packageJsonPath), [
     '--prod',
@@ -45,17 +43,8 @@ exports.build = async ({ files, entrypoint, workPath }) => {
   return glob('**', outDir, mountpoint);
 };
 
-exports.prepareCache = async ({ cachePath }) => {
-  console.log('writing package.json...');
-  const packageJson = { dependencies: { 'mdx-deck': '1.7.15' } };
-  const packageJsonPath = path.join(cachePath, 'package.json');
-  await writeFile(packageJsonPath, JSON.stringify(packageJson));
-  console.log('running npm install...');
-  await runNpmInstall(path.dirname(packageJsonPath), ['--prod']);
-
-  return {
-    ...(await glob('node_modules/**', cachePath)),
-    ...(await glob('package-lock.json', cachePath)),
-    ...(await glob('yarn.lock', cachePath)),
-  };
-};
+exports.prepareCache = async ({ workPath }) => ({
+  ...(await glob('node_modules/**', workPath)),
+  ...(await glob('package-lock.json', workPath)),
+  ...(await glob('yarn.lock', workPath)),
+});

packages/now-mdx-deck/package.json

@@ -1,8 +1,11 @@
 {
   "name": "@now/mdx-deck",
-  "version": "0.4.17-canary.3",
-  "peerDependencies": {
-    "@now/build-utils": ">=0.0.1"
+  "version": "0.4.19-canary.2",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zeit/now-builders.git",
+    "directory": "packages/now-mdx-deck"
   },
   "scripts": {
     "test": "jest"

packages/now-mdx-deck/test/test.js

@@ -7,7 +7,7 @@ const {
   testDeployment,
 } = require('../../../test/lib/deployment/test-deployment.js');
 
-jest.setTimeout(2 * 60 * 1000);
+jest.setTimeout(4 * 60 * 1000);
 const buildUtilsUrl = '@canary';
 let builderUrl;
 

packages/now-next/index.js

@@ -1,46 +1,63 @@
-const { createLambda } = require('@now/build-utils/lambda.js');
-const download = require('@now/build-utils/fs/download.js');
-const FileFsRef = require('@now/build-utils/file-fs-ref.js');
-const FileBlob = require('@now/build-utils/file-blob');
+const { createLambda } = require('@now/build-utils/lambda'); // eslint-disable-line import/no-extraneous-dependencies
+const download = require('@now/build-utils/fs/download'); // eslint-disable-line import/no-extraneous-dependencies
+const FileFsRef = require('@now/build-utils/file-fs-ref'); // eslint-disable-line import/no-extraneous-dependencies
+const FileBlob = require('@now/build-utils/file-blob'); // eslint-disable-line import/no-extraneous-dependencies
+const resolveFrom = require('resolve-from');
 const path = require('path');
-const { readFile, writeFile, unlink } = require('fs.promised');
+const url = require('url');
 const {
   runNpmInstall,
   runPackageJsonScript,
-} = require('@now/build-utils/fs/run-user-scripts.js');
-const glob = require('@now/build-utils/fs/glob.js');
+} = require('@now/build-utils/fs/run-user-scripts'); // eslint-disable-line import/no-extraneous-dependencies
+const glob = require('@now/build-utils/fs/glob'); // eslint-disable-line import/no-extraneous-dependencies
+const {
+  readFile,
+  writeFile,
+  unlink: unlinkFile,
+  remove: removePath,
+  pathExists,
+} = require('fs-extra');
+const semver = require('semver');
+const nextLegacyVersions = require('./legacy-versions');
 const {
   excludeFiles,
   validateEntrypoint,
   includeOnlyEntryDirectory,
-  moveEntryDirectoryToRoot,
-  excludeLockFiles,
   normalizePackageJson,
-  excludeStaticDirectory,
   onlyStaticDirectory,
+  getNextConfig,
 } = require('./utils');
 
 /** @typedef { import('@now/build-utils/file-ref').Files } Files */
 /** @typedef { import('@now/build-utils/fs/download').DownloadedFiles } DownloadedFiles */
 
+/**
+ * @typedef {Object} BuildParamsMeta
+ * @property {boolean} [isDev] - Files object
+ * @property {?string} [requestPath] - Entrypoint specified for the builder
+ */
+
 /**
  * @typedef {Object} BuildParamsType
  * @property {Files} files - Files object
  * @property {string} entrypoint - Entrypoint specified for the builder
  * @property {string} workPath - Working directory for this build
+ * @property {BuildParamsMeta} [meta] - Various meta settings
  */
 
 /**
  * Read package.json from files
- * @param {DownloadedFiles} files
+ * @param {string} entryPath
  */
-async function readPackageJson(files) {
-  if (!files['package.json']) {
+async function readPackageJson(entryPath) {
+  const packagePath = path.join(entryPath, 'package.json');
+
+  try {
+    return JSON.parse(await readFile(packagePath, 'utf8'));
+  } catch (err) {
+    console.log('package.json not found in entry');
     return {};
   }
-
-  const packageJsonPath = files['package.json'].fsPath;
-  return JSON.parse(await readFile(packageJsonPath, 'utf8'));
 }
 
 /**
@@ -67,6 +84,63 @@ async function writeNpmRc(workPath, token) {
   );
 }
 
+function getNextVersion(packageJson) {
+  let nextVersion;
+  if (packageJson.dependencies && packageJson.dependencies.next) {
+    nextVersion = packageJson.dependencies.next;
+  } else if (packageJson.devDependencies && packageJson.devDependencies.next) {
+    nextVersion = packageJson.devDependencies.next;
+  }
+  return nextVersion;
+}
+
+function isLegacyNext(nextVersion) {
+  // If version is using the dist-tag instead of a version range
+  if (nextVersion === 'canary' || nextVersion === 'latest') {
+    return false;
+  }
+
+  // If the version is an exact match with the legacy versions
+  if (nextLegacyVersions.indexOf(nextVersion) !== -1) {
+    return true;
+  }
+
+  const maxSatisfying = semver.maxSatisfying(nextLegacyVersions, nextVersion);
+  // When the version can't be matched with legacy versions, so it must be a newer version
+  if (maxSatisfying === null) {
+    return false;
+  }
+
+  return true;
+}
+
+function setNextExperimentalPage(files, entry, meta) {
+  if (meta.requestPath) {
+    if (meta.requestPath.startsWith(path.join(entry, 'static'))) {
+      return onlyStaticDirectory(
+        includeOnlyEntryDirectory(files, entry),
+        entry,
+      );
+    }
+
+    const { pathname } = url.parse(meta.requestPath);
+    const assetPath = pathname.match(
+      /^\/?_next\/static\/[^/]+\/pages\/(.+)\.js$/,
+    );
+    // eslint-disable-next-line no-underscore-dangle
+    process.env.__NEXT_BUILDER_EXPERIMENTAL_PAGE = assetPath
+      ? assetPath[1]
+      : pathname;
+  }
+
+  if (meta.isDev) {
+    // eslint-disable-next-line no-underscore-dangle
+    process.env.__NEXT_BUILDER_EXPERIMENTAL_DEBUG = 'true';
+  }
+
+  return null;
+}
+
 exports.config = {
   maxLambdaSize: '5mb',
 };
@@ -75,130 +149,272 @@ exports.config = {
  * @param {BuildParamsType} buildParams
  * @returns {Promise<Files>}
  */
-exports.build = async ({ files, workPath, entrypoint }) => {
+exports.build = async ({
+  files, workPath, entrypoint, meta = {},
+}) => {
   validateEntrypoint(entrypoint);
 
-  console.log('downloading user files...');
   const entryDirectory = path.dirname(entrypoint);
-  const filesOnlyEntryDirectory = includeOnlyEntryDirectory(
-    files,
-    entryDirectory,
-  );
-  const filesWithEntryDirectoryRoot = moveEntryDirectoryToRoot(
-    filesOnlyEntryDirectory,
-    entryDirectory,
-  );
-  const filesWithoutLockfiles = excludeLockFiles(filesWithEntryDirectoryRoot);
-  const filesWithoutStaticDirectory = excludeStaticDirectory(
-    filesWithoutLockfiles,
-  );
-  const downloadedFiles = await download(filesWithoutStaticDirectory, workPath);
+  const maybeStaticFiles = setNextExperimentalPage(files, entryDirectory, meta);
+  if (maybeStaticFiles) return maybeStaticFiles; // return early if requestPath is static file
 
-  console.log('normalizing package.json');
-  const packageJson = normalizePackageJson(
-    await readPackageJson(downloadedFiles),
-  );
-  console.log('normalized package.json result: ', packageJson);
-  await writePackageJson(workPath, packageJson);
+  console.log('downloading user files...');
+  await download(files, workPath);
+  const entryPath = path.join(workPath, entryDirectory);
+  const dotNext = path.join(entryPath, '.next');
+
+  if (await pathExists(dotNext)) {
+    if (meta.isDev) {
+      await removePath(dotNext).catch((e) => {
+        if (e.code !== 'ENOENT') throw e;
+      });
+    } else {
+      console.warn(
+        'WARNING: You should probably not upload the `.next` directory. See https://zeit.co/docs/v2/deployments/official-builders/next-js-now-next/ for more information.',
+      );
+    }
+  }
+
+  const pkg = await readPackageJson(entryPath);
+
+  let nextVersion = getNextVersion(pkg);
+  if (!nextVersion) {
+    throw new Error(
+      'No Next.js version could be detected in "package.json". Make sure `"next"` is installed in "dependencies" or "devDependencies"',
+    );
+  }
+
+  const isLegacy = isLegacyNext(nextVersion);
+
+  console.log(`MODE: ${isLegacy ? 'legacy' : 'serverless'}`);
+
+  if (isLegacy) {
+    try {
+      await unlinkFile(path.join(entryPath, 'yarn.lock'));
+    } catch (err) {
+      console.log('no yarn.lock removed');
+    }
+
+    try {
+      await unlinkFile(path.join(entryPath, 'package-lock.json'));
+    } catch (err) {
+      console.log('no package-lock.json removed');
+    }
+
+    console.warn(
+      "WARNING: your application is being deployed in @now/next's legacy mode. http://err.sh/zeit/now-builders/now-next-legacy-mode",
+    );
+
+    console.log('normalizing package.json');
+    const packageJson = normalizePackageJson(pkg);
+    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',
+    );
+    pkg.scripts = {
+      'now-build': 'next build',
+      ...(pkg.scripts || {}),
+    };
+    console.log('normalized package.json result: ', pkg);
+    await writePackageJson(entryPath, pkg);
+  }
 
   if (process.env.NPM_AUTH_TOKEN) {
     console.log('found NPM_AUTH_TOKEN in environment, creating .npmrc');
-    await writeNpmRc(workPath, process.env.NPM_AUTH_TOKEN);
+    await writeNpmRc(entryPath, process.env.NPM_AUTH_TOKEN);
   }
 
-  console.log('running npm install...');
-  await runNpmInstall(workPath, ['--prefer-offline']);
-  console.log('running user script...');
-  await runPackageJsonScript(workPath, 'now-build');
-  console.log('running npm install --production...');
-  await runNpmInstall(workPath, ['--prefer-offline', '--production']);
-  if (process.env.NPM_AUTH_TOKEN) {
-    await unlink(path.join(workPath, '.npmrc'));
-  }
+  console.log('installing dependencies...');
+  await runNpmInstall(entryPath, ['--prefer-offline']);
 
-  const filesAfterBuild = await glob('**', workPath);
+  nextVersion = JSON.parse(
+    await readFile(resolveFrom(entryPath, 'next/package.json'), 'utf8'),
+  ).version;
 
-  console.log('preparing lambda files...');
-  let buildId;
-  try {
-    buildId = await readFile(path.join(workPath, '.next', 'BUILD_ID'), 'utf8');
-  } catch (err) {
-    console.error(
-      'BUILD_ID not found in ".next". The "package.json" "build" script did not run "next build"',
+  const isUpdated = (v) => {
+    if (v === 'canary') return true;
+
+    try {
+      return semver.satisfies(v, '>=8.0.5-canary.14', {
+        includePrerelease: true,
+      });
+    } catch (e) {
+      return false;
+    }
+  };
+
+  if ((meta.isDev || meta.requestPath) && !isUpdated(nextVersion)) {
+    throw new Error(
+      '`now dev` can only be used with Next.js >=8.0.5-canary.14!',
     );
-    throw new Error('Missing BUILD_ID');
   }
-  const dotNextRootFiles = await glob('.next/*', workPath);
-  const dotNextServerRootFiles = await glob('.next/server/*', workPath);
-  const nodeModules = excludeFiles(
-    await glob('node_modules/**', workPath),
-    file => file.startsWith('node_modules/.cache'),
-  );
-  const launcherFiles = {
-    'now__bridge.js': new FileFsRef({ fsPath: require('@now/node-bridge') }),
-  };
-  const nextFiles = {
-    ...nodeModules,
-    ...dotNextRootFiles,
-    ...dotNextServerRootFiles,
-    ...launcherFiles,
-  };
-  if (filesAfterBuild['next.config.js']) {
-    nextFiles['next.config.js'] = filesAfterBuild['next.config.js'];
+
+  console.log('running user script...');
+  await runPackageJsonScript(entryPath, 'now-build');
+
+  if (isLegacy) {
+    console.log('running npm install --production...');
+    await runNpmInstall(entryPath, ['--prefer-offline', '--production']);
+  }
+
+  if (process.env.NPM_AUTH_TOKEN) {
+    await unlinkFile(path.join(entryPath, '.npmrc'));
   }
-  const pages = await glob(
-    '**/*.js',
-    path.join(workPath, '.next', 'server', 'static', buildId, 'pages'),
-  );
-  const launcherPath = path.join(__dirname, 'launcher.js');
-  const launcherData = await readFile(launcherPath, 'utf8');
 
   const lambdas = {};
-  await Promise.all(
-    Object.keys(pages).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)) {
-        return;
+
+  if (isLegacy) {
+    const filesAfterBuild = await glob('**', entryPath);
+
+    console.log('preparing lambda files...');
+    let buildId;
+    try {
+      buildId = await readFile(
+        path.join(entryPath, '.next', 'BUILD_ID'),
+        'utf8',
+      );
+    } catch (err) {
+      console.error(
+        'BUILD_ID not found in ".next". The "package.json" "build" script did not run "next build"',
+      );
+      throw new Error('Missing BUILD_ID');
+    }
+    const dotNextRootFiles = await glob('.next/*', entryPath);
+    const dotNextServerRootFiles = await glob('.next/server/*', entryPath);
+    const nodeModules = excludeFiles(
+      await glob('node_modules/**', entryPath),
+      file => file.startsWith('node_modules/.cache'),
+    );
+    const launcherFiles = {
+      'now__bridge.js': new FileFsRef({ fsPath: require('@now/node-bridge') }),
+    };
+    const nextFiles = {
+      ...nodeModules,
+      ...dotNextRootFiles,
+      ...dotNextServerRootFiles,
+      ...launcherFiles,
+    };
+    if (filesAfterBuild['next.config.js']) {
+      nextFiles['next.config.js'] = filesAfterBuild['next.config.js'];
+    }
+    const pages = await glob(
+      '**/*.js',
+      path.join(entryPath, '.next', 'server', 'static', buildId, 'pages'),
+    );
+    const launcherPath = path.join(__dirname, 'legacy-launcher.js');
+    const launcherData = await readFile(launcherPath, 'utf8');
+
+    await Promise.all(
+      Object.keys(pages).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)) {
+          return;
+        }
+
+        const pathname = page.replace(/\.js$/, '');
+        const launcher = launcherData.replace(
+          'PATHNAME_PLACEHOLDER',
+          `/${pathname.replace(/(^|\/)index$/, '')}`,
+        );
+
+        const pageFiles = {
+          [`.next/server/static/${buildId}/pages/_document.js`]: filesAfterBuild[
+            `.next/server/static/${buildId}/pages/_document.js`
+          ],
+          [`.next/server/static/${buildId}/pages/_app.js`]: filesAfterBuild[
+            `.next/server/static/${buildId}/pages/_app.js`
+          ],
+          [`.next/server/static/${buildId}/pages/_error.js`]: filesAfterBuild[
+            `.next/server/static/${buildId}/pages/_error.js`
+          ],
+          [`.next/server/static/${buildId}/pages/${page}`]: filesAfterBuild[
+            `.next/server/static/${buildId}/pages/${page}`
+          ],
+        };
+
+        console.log(`Creating lambda for page: "${page}"...`);
+        lambdas[path.join(entryDirectory, pathname)] = await createLambda({
+          files: {
+            ...nextFiles,
+            ...pageFiles,
+            'now__launcher.js': new FileBlob({ data: launcher }),
+          },
+          handler: 'now__launcher.launcher',
+          runtime: 'nodejs8.10',
+        });
+        console.log(`Created lambda for page: "${page}"`);
+      }),
+    );
+  } else {
+    console.log('preparing lambda files...');
+    const launcherFiles = {
+      '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 pageKeys = Object.keys(pages);
+
+    if (pageKeys.length === 0) {
+      const nextConfig = await getNextConfig(workPath, entryPath);
+
+      if (nextConfig != null) {
+        console.info('Found next.config.js:');
+        console.info(nextConfig);
+        console.info();
       }
 
-      const pathname = page.replace(/\.js$/, '');
-      const launcher = launcherData.replace(
-        'PATHNAME_PLACEHOLDER',
-        `/${pathname.replace(/(^|\/)index$/, '')}`,
+      throw new Error(
+        'No serverless pages were built. https://err.sh/zeit/now-builders/now-next-no-serverless-pages-built',
       );
+    }
 
-      const pageFiles = {
-        [`.next/server/static/${buildId}/pages/_document.js`]: filesAfterBuild[
-          `.next/server/static/${buildId}/pages/_document.js`
-        ],
-        [`.next/server/static/${buildId}/pages/_app.js`]: filesAfterBuild[
-          `.next/server/static/${buildId}/pages/_app.js`
-        ],
-        [`.next/server/static/${buildId}/pages/_error.js`]: filesAfterBuild[
-          `.next/server/static/${buildId}/pages/_error.js`
-        ],
-        [`.next/server/static/${buildId}/pages/${page}`]: filesAfterBuild[
-          `.next/server/static/${buildId}/pages/${page}`
-        ],
-      };
+    // An optional assets folder that is placed alongside every page entrypoint
+    const assets = await glob(
+      'assets/**',
+      path.join(entryPath, '.next', 'serverless'),
+    );
 
-      console.log(`Creating lambda for page: "${page}"...`);
-      lambdas[path.join(entryDirectory, pathname)] = await createLambda({
-        files: {
-          ...nextFiles,
-          ...pageFiles,
-          'now__launcher.js': new FileBlob({ data: launcher }),
-        },
-        handler: 'now__launcher.launcher',
-        runtime: 'nodejs8.10',
-      });
-      console.log(`Created lambda for page: "${page}"`);
-    }),
-  );
+    const assetKeys = Object.keys(assets);
+    if (assetKeys.length > 0) {
+      console.log('detected assets to be bundled with lambda:');
+      assetKeys.forEach(assetFile => console.log(`\t${assetFile}`));
+    }
+
+    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)) {
+          return;
+        }
+
+        const pathname = page.replace(/\.js$/, '');
+
+        console.log(`Creating lambda for page: "${page}"...`);
+        lambdas[path.join(entryDirectory, pathname)] = await createLambda({
+          files: {
+            ...launcherFiles,
+            ...assets,
+            'page.js': pages[page],
+          },
+          handler: 'now__launcher.launcher',
+          runtime: 'nodejs8.10',
+        });
+        console.log(`Created lambda for page: "${page}"`);
+      }),
+    );
+  }
 
   const nextStaticFiles = await glob(
     '**',
-    path.join(workPath, '.next', 'static'),
+    path.join(entryPath, '.next', 'static'),
   );
   const staticFiles = Object.keys(nextStaticFiles).reduce(
     (mappedFiles, file) => ({
@@ -208,52 +424,53 @@ exports.build = async ({ files, workPath, entrypoint }) => {
     {},
   );
 
-  const nextStaticDirectory = onlyStaticDirectory(filesWithoutLockfiles);
-  const staticDirectoryFiles = Object.keys(nextStaticDirectory).reduce(
-    (mappedFiles, file) => ({
-      ...mappedFiles,
-      [path.join(entryDirectory, file)]: nextStaticDirectory[file],
-    }),
-    {},
+  const staticDirectoryFiles = onlyStaticDirectory(
+    includeOnlyEntryDirectory(files, entryDirectory),
+    entryDirectory,
   );
 
   return { ...lambdas, ...staticFiles, ...staticDirectoryFiles };
 };
 
-exports.prepareCache = async ({
-  files, entrypoint, cachePath, workPath,
-}) => {
-  console.log('downloading user files...');
+exports.prepareCache = async ({ workPath, entrypoint }) => {
+  console.log('preparing cache ...');
   const entryDirectory = path.dirname(entrypoint);
-  const filesOnlyEntryDirectory = includeOnlyEntryDirectory(
-    files,
-    entryDirectory,
-  );
-  const filesWithEntryDirectoryRoot = moveEntryDirectoryToRoot(
-    filesOnlyEntryDirectory,
-    entryDirectory,
-  );
-  const filesWithoutLockfiles = excludeLockFiles(filesWithEntryDirectoryRoot);
-  const filesWithoutStaticDirectory = excludeStaticDirectory(
-    filesWithoutLockfiles,
-  );
-  await download(filesWithoutStaticDirectory, workPath);
-  await download(await glob('.next/**', workPath), cachePath);
-  await download(await glob('node_modules/**', workPath), cachePath);
+  const entryPath = path.join(workPath, entryDirectory);
 
-  console.log('.next folder contents', await glob('.next/**', cachePath));
-  console.log(
-    '.cache folder contents',
-    await glob('node_modules/.cache/**', cachePath),
-  );
+  const pkg = await readPackageJson(entryPath);
+  const nextVersion = getNextVersion(pkg);
+  const isLegacy = isLegacyNext(nextVersion);
 
-  console.log('running npm install...');
-  await runNpmInstall(cachePath);
+  if (isLegacy) {
+    // skip caching legacy mode (swapping deps between all and production can get bug-prone)
+    return {};
+  }
 
+  console.log('producing cache file manifest ...');
+  const cacheEntrypoint = path.relative(workPath, entryPath);
   return {
-    ...(await glob('.next/records.json', cachePath)),
-    ...(await glob('.next/server/records.json', cachePath)),
-    ...(await glob('node_modules/**', cachePath)),
-    ...(await glob('yarn.lock', cachePath)),
+    ...(await glob(path.join(cacheEntrypoint, 'node_modules/**'), workPath)),
+    ...(await glob(path.join(cacheEntrypoint, '.next/cache/**'), workPath)),
+    ...(await glob(path.join(cacheEntrypoint, 'package-lock.json'), workPath)),
+    ...(await glob(path.join(cacheEntrypoint, 'yarn.lock'), workPath)),
   };
 };
+
+exports.subscribe = async ({ entrypoint, files }) => {
+  const entryDirectory = path.dirname(entrypoint);
+  const pageFiles = includeOnlyEntryDirectory(
+    files,
+    path.join(entryDirectory, 'pages'),
+  );
+
+  return [
+    path.join(entryDirectory, '_next/static/unoptimized-build/pages/**'),
+    path.join(entryDirectory, 'static/**'),
+    // List all pages without their extensions
+    ...Object.keys(pageFiles).map(page => page
+      .replace(/^pages\//i, '')
+      .split('.')
+      .slice(0, -1)
+      .join('.')),
+  ];
+};

packages/now-next/launcher.js

@@ -1,19 +1,13 @@
+if (!process.env.NODE_ENV) {
+  process.env.NODE_ENV = process.env.NOW_REGION === 'dev1' ? 'development' : 'production';
+}
+
 const { Server } = require('http');
-const next = require('next-server');
-const url = require('url');
-const { Bridge } = require('./now__bridge.js');
+const { Bridge } = require('./now__bridge');
+const page = require('./page');
 
-const bridge = new Bridge();
-bridge.port = 3000;
-
-process.env.NODE_ENV = 'production';
-
-const app = next({});
-
-const server = new Server((req, res) => {
-  const parsedUrl = url.parse(req.url, true);
-  app.render(req, res, 'PATHNAME_PLACEHOLDER', parsedUrl.query, parsedUrl);
-});
-server.listen(bridge.port);
+const server = new Server(page.render);
+const bridge = new Bridge(server);
+bridge.listen();
 
 exports.launcher = bridge.launcher;

packages/now-next/legacy-launcher.js

@@ -0,0 +1,20 @@
+const { Server } = require('http');
+const next = require('next-server');
+const url = require('url');
+const { Bridge } = require('./now__bridge');
+
+if (!process.env.NODE_ENV) {
+  process.env.NODE_ENV = process.env.NOW_REGION === 'dev1' ? 'development' : 'production';
+}
+
+const app = next({});
+
+const server = new Server((req, res) => {
+  const parsedUrl = url.parse(req.url, true);
+  app.render(req, res, 'PATHNAME_PLACEHOLDER', parsedUrl.query, parsedUrl);
+});
+
+const bridge = new Bridge(server);
+bridge.listen();
+
+exports.launcher = bridge.launcher;

packages/now-next/legacy-versions.js

@@ -0,0 +1,336 @@
+module.exports = [
+  '0.1.0',
+  '0.1.1',
+  '0.2.0',
+  '0.2.1',
+  '0.2.2',
+  '0.2.3',
+  '0.2.4',
+  '0.2.5',
+  '0.2.6',
+  '0.2.7',
+  '0.2.8',
+  '0.2.9',
+  '0.2.10',
+  '0.2.11',
+  '0.2.12',
+  '0.2.13',
+  '0.2.14',
+  '0.3.0',
+  '0.3.1',
+  '0.3.2',
+  '0.3.3',
+  '0.4.0',
+  '0.4.1',
+  '0.9.9',
+  '0.9.10',
+  '0.9.11',
+  '1.0.0',
+  '1.0.1',
+  '1.0.2',
+  '1.1.0',
+  '1.1.1',
+  '1.1.2',
+  '1.2.0',
+  '1.2.1',
+  '1.2.2',
+  '1.2.3',
+  '2.0.0-beta.0',
+  '2.0.0-beta.1',
+  '2.0.0-beta.2',
+  '2.0.0-beta.3',
+  '2.0.0-beta.4',
+  '2.0.0-beta.5',
+  '2.0.0-beta.6',
+  '2.0.0-beta.7',
+  '2.0.0-beta.8',
+  '2.0.0-beta.9',
+  '2.0.0-beta.10',
+  '2.0.0-beta.11',
+  '2.0.0-beta.12',
+  '2.0.0-beta.13',
+  '2.0.0-beta.14',
+  '2.0.0-beta.15',
+  '2.0.0-beta.16',
+  '2.0.0-beta.17',
+  '2.0.0-beta.18',
+  '2.0.0-beta.19',
+  '2.0.0-beta.20',
+  '2.0.0-beta.21',
+  '2.0.0-beta.22',
+  '2.0.0-beta.23',
+  '2.0.0-beta.24',
+  '2.0.0-beta.25',
+  '2.0.0-beta.26',
+  '2.0.0-beta.27',
+  '2.0.0-beta.28',
+  '2.0.0-beta.29',
+  '2.0.0-beta.30',
+  '2.0.0-beta.31',
+  '2.0.0-beta.32',
+  '2.0.0-beta.33',
+  '2.0.0-beta.34',
+  '2.0.0-beta.35',
+  '2.0.0-beta.36',
+  '2.0.0-beta.37',
+  '2.0.0-beta.38',
+  '2.0.0-beta.39',
+  '2.0.0-beta.40',
+  '2.0.0-beta.41',
+  '2.0.0-beta.42',
+  '2.0.0',
+  '2.0.1',
+  '2.1.0',
+  '2.1.1',
+  '2.2.0',
+  '2.3.0-alpha1',
+  '2.3.0',
+  '2.3.1',
+  '2.4.0',
+  '2.4.1',
+  '2.4.2',
+  '2.4.3',
+  '2.4.4',
+  '2.4.5',
+  '2.4.6',
+  '2.4.7',
+  '2.4.8',
+  '2.4.9',
+  '3.0.0-beta1',
+  '3.0.0-beta10',
+  '3.0.0-beta11',
+  '3.0.0-beta12',
+  '3.0.0-beta13',
+  '3.0.0-beta14',
+  '3.0.0-beta15',
+  '3.0.0-beta16',
+  '3.0.0-beta2',
+  '3.0.0-beta3',
+  '3.0.0-beta4',
+  '3.0.0-beta5',
+  '3.0.0-beta6',
+  '3.0.0-beta7',
+  '3.0.0-beta8',
+  '3.0.0-beta9',
+  '3.0.1-beta.1',
+  '3.0.1-beta.2',
+  '3.0.1-beta.3',
+  '3.0.1-beta.4',
+  '3.0.1-beta.5',
+  '3.0.1-beta.6',
+  '3.0.1-beta.7',
+  '3.0.1-beta.8',
+  '3.0.1-beta.9',
+  '3.0.1-beta.10',
+  '3.0.1-beta.11',
+  '3.0.1-beta.12',
+  '3.0.1-beta.13',
+  '3.0.1-beta.14',
+  '3.0.1-beta.15',
+  '3.0.1-beta.16',
+  '3.0.1-beta.17',
+  '3.0.1-beta.18',
+  '3.0.1-beta.19',
+  '3.0.1-beta.20',
+  '3.0.1-beta.21',
+  '3.0.1',
+  '3.0.2',
+  '3.0.3',
+  '3.0.4',
+  '3.0.5',
+  '3.0.6',
+  '3.1.0',
+  '3.2.0',
+  '3.2.1',
+  '3.2.2',
+  '3.2.3',
+  '4.0.0-beta.1',
+  '4.0.0-beta.2',
+  '4.0.0-beta.3',
+  '4.0.0-beta.4',
+  '4.0.0-beta.5',
+  '4.0.0-beta.6',
+  '4.0.0',
+  '4.0.1',
+  '4.0.2',
+  '4.0.3',
+  '4.0.4',
+  '4.0.5',
+  '4.1.0',
+  '4.1.1',
+  '4.1.2',
+  '4.1.3',
+  '4.1.4-canary.1',
+  '4.1.4-canary.2',
+  '4.1.4',
+  '4.2.0-canary.1',
+  '4.2.0-zones.2',
+  '4.2.0',
+  '4.2.1',
+  '4.2.2',
+  '4.2.3',
+  '4.3.0-canary.1',
+  '4.3.0-universal-alpha.1',
+  '4.3.0-universal-alpha.2',
+  '4.3.0-universal-alpha.3',
+  '4.3.0-universal-alpha.4',
+  '4.3.0-zones.1',
+  '4.4.0-canary.2',
+  '4.4.0-canary.3',
+  '5.0.0-universal-alpha.1',
+  '5.0.0-universal-alpha.2',
+  '5.0.0-universal-alpha.3',
+  '5.0.0-universal-alpha.4',
+  '5.0.0-universal-alpha.5',
+  '5.0.0-universal-alpha.6',
+  '5.0.0-universal-alpha.7',
+  '5.0.0-universal-alpha.8',
+  '5.0.0-universal-alpha.9',
+  '5.0.0-universal-alpha.10',
+  '5.0.0-universal-alpha.11',
+  '5.0.0-universal-alpha.12',
+  '5.0.0-universal-alpha.13',
+  '5.0.0-universal-alpha.14',
+  '5.0.0-universal-alpha.15',
+  '5.0.0-universal-alpha.16',
+  '5.0.0-universal-alpha.17',
+  '5.0.0-universal-alpha.18',
+  '5.0.0-universal-alpha.19',
+  '5.0.0-universal-alpha.20',
+  '5.0.0-universal-alpha.21',
+  '5.0.0-universal-alpha.22',
+  '5.0.0-universal-alpha.23',
+  '5.0.0-zones.1',
+  '5.0.0',
+  '5.0.1-canary.1',
+  '5.0.1-canary.2',
+  '5.0.1-canary.3',
+  '5.0.1-canary.4',
+  '5.0.1-canary.5',
+  '5.0.1-canary.6',
+  '5.0.1-canary.7',
+  '5.0.1-canary.8',
+  '5.0.1-canary.9',
+  '5.0.1-canary.10',
+  '5.0.1-canary.11',
+  '5.0.1-canary.12',
+  '5.0.1-canary.13',
+  '5.0.1-canary.14',
+  '5.0.1-canary.15',
+  '5.0.1-canary.16',
+  '5.0.1-canary.17',
+  '5.1.0',
+  '6.0.0-canary.1',
+  '6.0.0-canary.2',
+  '6.0.0-canary.3',
+  '6.0.0-canary.4',
+  '6.0.0-canary.5',
+  '6.0.0-canary.6',
+  '6.0.0-canary.7',
+  '6.0.0',
+  '6.0.1-canary.0',
+  '6.0.1-canary.1',
+  '6.0.1-canary.2',
+  '6.0.1',
+  '6.0.2-canary.0',
+  '6.0.2',
+  '6.0.3-canary.0',
+  '6.0.3-canary.1',
+  '6.0.3',
+  '6.0.4-canary.0',
+  '6.0.4-canary.1',
+  '6.0.4-canary.2',
+  '6.0.4-canary.3',
+  '6.0.4-canary.4',
+  '6.0.4-canary.5',
+  '6.0.4-canary.6',
+  '6.0.4-canary.7',
+  '6.0.4-canary.8',
+  '6.0.4-canary.9',
+  '6.1.0-canary.0',
+  '6.1.0',
+  '6.1.1-canary.0',
+  '6.1.1-canary.1',
+  '6.1.1-canary.2',
+  '6.1.1-canary.3',
+  '6.1.1-canary.4',
+  '6.1.1-canary.5',
+  '6.1.1',
+  '6.1.2',
+  '7.0.0-canary.0',
+  '7.0.0-canary.1',
+  '7.0.0-canary.2',
+  '7.0.0-canary.3',
+  '7.0.0-canary.4',
+  '7.0.0-canary.5',
+  '7.0.0-canary.6',
+  '7.0.0-canary.7',
+  '7.0.0-canary.8',
+  '7.0.0-canary.9',
+  '7.0.0-canary.10',
+  '7.0.0-canary.11',
+  '7.0.0-canary.12',
+  '7.0.0-canary.13',
+  '7.0.0-canary.14',
+  '7.0.0-canary.15',
+  '7.0.0-canary.16',
+  '7.0.0-canary.18',
+  '7.0.0-canary.19',
+  '7.0.0-canary.20',
+  '7.0.0',
+  '7.0.1-canary.0',
+  '7.0.1-canary.1',
+  '7.0.1-canary.2',
+  '7.0.1-canary.3',
+  '7.0.1-canary.4',
+  '7.0.1-canary.5',
+  '7.0.1-canary.6',
+  '7.0.1',
+  '7.0.2-alpha.1',
+  '7.0.2-alpha.3',
+  '7.0.2-canary.5',
+  '7.0.2-canary.6',
+  '7.0.2-canary.7',
+  '7.0.2-canary.8',
+  '7.0.2-canary.9',
+  '7.0.2-canary.10',
+  '7.0.2-canary.11',
+  '7.0.2-canary.12',
+  '7.0.2-canary.13',
+  '7.0.2-canary.14',
+  '7.0.2-canary.15',
+  '7.0.2-canary.16',
+  '7.0.2-canary.17',
+  '7.0.2-canary.18',
+  '7.0.2-canary.19',
+  '7.0.2-canary.20',
+  '7.0.2-canary.21',
+  '7.0.2-canary.22',
+  '7.0.2-canary.23',
+  '7.0.2-canary.24',
+  '7.0.2-canary.25',
+  '7.0.2-canary.26',
+  '7.0.2-canary.27',
+  '7.0.2-canary.28',
+  '7.0.2-canary.29',
+  '7.0.2-canary.31',
+  '7.0.2-canary.33',
+  '7.0.2-canary.34',
+  '7.0.2-canary.35',
+  '7.0.2-canary.36',
+  '7.0.2-canary.37',
+  '7.0.2-canary.38',
+  '7.0.2-canary.39',
+  '7.0.2-canary.40',
+  '7.0.2-canary.41',
+  '7.0.2-canary.42',
+  '7.0.2-canary.43',
+  '7.0.2-canary.44',
+  '7.0.2-canary.45',
+  '7.0.2-canary.46',
+  '7.0.2-canary.47',
+  '7.0.2-canary.48',
+  '7.0.2-canary.49',
+  '7.0.2-canary.50',
+  '7.0.2',
+];

packages/now-next/package.json

@@ -1,12 +1,20 @@
 {
   "name": "@now/next",
-  "version": "0.0.81-canary.1",
-  "dependencies": {
-    "@now/node-bridge": "0.1.4",
-    "execa": "^1.0.0",
-    "fs.promised": "^3.0.0"
+  "version": "0.1.3-canary.14",
+  "license": "MIT",
+  "scripts": {
+    "build": "tsc"
   },
-  "peerDependencies": {
-    "@now/build-utils": ">=0.0.1"
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zeit/now-builders.git",
+    "directory": "packages/now-next"
+  },
+  "dependencies": {
+    "@now/node-bridge": "^1.0.2-canary.2",
+    "execa": "^1.0.0",
+    "fs-extra": "^7.0.0",
+    "resolve-from": "^4.0.0",
+    "semver": "^5.6.0"
   }
 }

packages/now-next/tsconfig.json

@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "target": "ES2017",
+    "module": "commonjs",
+    "lib": ["es2017"],
+    "allowJs": true,
+    "checkJs": true,
+    "noEmit": true,
+    "strict": false,
+    "types": ["node"],
+    "esModuleInterop": true
+  },
+  "include": [
+    "./"
+  ],
+  "exclude": [
+    "./launcher.js",
+    "./legacy-launcher.js"
+  ]
+}

packages/now-next/utils.js

@@ -1,4 +1,5 @@
-const rename = require('@now/build-utils/fs/rename.js');
+const fs = require('fs-extra');
+const path = require('path');
 
 /** @typedef { import('@now/build-utils/file-ref') } FileRef */
 /** @typedef { import('@now/build-utils/file-fs-ref') } FileFsRef */
@@ -64,24 +65,6 @@ function includeOnlyEntryDirectory(files, entryDirectory) {
   return excludeFiles(files, matcher);
 }
 
-/**
- * Moves all files under the entry directory to the root directory
- * @param {Files} files
- * @param {string} entryDirectory
- * @returns {Files}
- */
-function moveEntryDirectoryToRoot(files, entryDirectory) {
-  if (entryDirectory === '.') {
-    return files;
-  }
-
-  function delegate(filePath) {
-    return filePath.replace(new RegExp(`^${entryDirectory}/`), '');
-  }
-
-  return rename(files, delegate);
-}
-
 /**
  * Exclude package manager lockfiles from files
  * @param {Files} files
@@ -99,26 +82,13 @@ function excludeLockFiles(files) {
 }
 
 /**
- * Exclude the static directory from files
+ * Include the static directory from files
  * @param {Files} files
  * @returns {Files}
  */
-function excludeStaticDirectory(files) {
+function onlyStaticDirectory(files, entryDir) {
   function matcher(filePath) {
-    return filePath.startsWith('static');
-  }
-
-  return excludeFiles(files, matcher);
-}
-
-/**
- * Exclude the static directory from files
- * @param {Files} files
- * @returns {Files}
- */
-function onlyStaticDirectory(files) {
-  function matcher(filePath) {
-    return !filePath.startsWith('static');
+    return !filePath.startsWith(path.join(entryDir, 'static'));
   }
 
   return excludeFiles(files, matcher);
@@ -153,29 +123,42 @@ function normalizePackageJson(defaultPackageJson = {}) {
       'react-dom': 'latest',
       ...dependencies, // override react if user provided it
       // next-server is forced to canary
-      'next-server': 'canary',
+      'next-server': 'v7.0.2-canary.49',
     },
     devDependencies: {
       ...devDependencies,
       // next is forced to canary
-      next: 'canary',
+      next: 'v7.0.2-canary.49',
       // next-server is a dependency here
       'next-server': undefined,
     },
     scripts: {
       ...defaultPackageJson.scripts,
-      'now-build': 'next build --lambdas',
+      'now-build': 'NODE_OPTIONS=--max_old_space_size=3000 next build --lambdas',
     },
   };
 }
 
+async function getNextConfig(workPath, entryPath) {
+  const entryConfig = path.join(entryPath, './next.config.js');
+  if (await fs.pathExists(entryConfig)) {
+    return fs.readFile(entryConfig, 'utf8');
+  }
+
+  const workConfig = path.join(workPath, './next.config.js');
+  if (await fs.pathExists(workConfig)) {
+    return fs.readFile(workConfig, 'utf8');
+  }
+
+  return null;
+}
+
 module.exports = {
   excludeFiles,
   validateEntrypoint,
   includeOnlyEntryDirectory,
-  moveEntryDirectoryToRoot,
   excludeLockFiles,
   normalizePackageJson,
-  excludeStaticDirectory,
   onlyStaticDirectory,
+  getNextConfig,
 };

packages/now-node-bridge/.eslintrc

@@ -0,0 +1,24 @@
+{
+  "extends": ["prettier", "airbnb-base"],
+  "rules": {
+    "no-console": 0,
+    "import/no-unresolved": 0,
+    "import/no-dynamic-require": 0,
+    "global-require": 0
+  },
+  "overrides": [
+    {
+      "files": ["test/**"],
+      "rules": {
+        "import/no-extraneous-dependencies": 0
+      },
+      "globals": {
+        "describe": true,
+        "it": true,
+        "test": true,
+        "expect": true
+      }
+    }
+  ]
+}
+

packages/now-node-bridge/.gitignore

@@ -0,0 +1 @@
+/bridge.*

packages/now-node-bridge/bridge.js

@@ -1,98 +0,0 @@
-const http = require('http');
-
-function normalizeEvent(event) {
-  if (event.Action === 'Invoke') {
-    const invokeEvent = JSON.parse(event.body);
-
-    const {
-      method, path, headers, encoding,
-    } = invokeEvent;
-
-    let { body } = invokeEvent;
-
-    if (body) {
-      if (encoding === 'base64') {
-        body = Buffer.from(body, encoding);
-      } else if (encoding === undefined) {
-        body = Buffer.from(body);
-      } else {
-        throw new Error(`Unsupported encoding: ${encoding}`);
-      }
-    }
-
-    return {
-      method,
-      path,
-      headers,
-      body,
-    };
-  }
-
-  const {
-    httpMethod: method, path, headers, body,
-  } = event;
-
-  return {
-    method,
-    path,
-    headers,
-    body,
-  };
-}
-
-class Bridge {
-  constructor() {
-    this.launcher = this.launcher.bind(this);
-  }
-
-  launcher(event) {
-    // eslint-disable-next-line consistent-return
-    return new Promise((resolve, reject) => {
-      if (this.userError) {
-        console.error('Error while initializing entrypoint:', this.userError);
-        return resolve({ statusCode: 500, body: '' });
-      }
-
-      if (!this.port) {
-        return resolve({ statusCode: 504, body: '' });
-      }
-
-      const {
-        method, path, headers, body,
-      } = normalizeEvent(event);
-
-      const opts = {
-        hostname: '127.0.0.1',
-        port: this.port,
-        path,
-        method,
-        headers,
-      };
-
-      const req = http.request(opts, (res) => {
-        const response = res;
-        const respBodyChunks = [];
-        response.on('data', chunk => respBodyChunks.push(Buffer.from(chunk)));
-        response.on('error', error => reject(error));
-        response.on('end', () => {
-          delete response.headers.connection;
-          delete response.headers['content-length'];
-
-          resolve({
-            statusCode: response.statusCode,
-            headers: response.headers,
-            body: Buffer.concat(respBodyChunks).toString('base64'),
-            encoding: 'base64',
-          });
-        });
-      });
-
-      if (body) req.write(body);
-      req.end();
-    });
-  }
-}
-
-module.exports = {
-  Bridge,
-};

packages/now-node-bridge/package.json

@@ -1,7 +1,26 @@
 {
   "name": "@now/node-bridge",
-  "version": "0.1.9",
-  "peerDependencies": {
-    "@now/build-utils": ">=0.0.1"
+  "version": "1.0.2-canary.2",
+  "license": "MIT",
+  "main": "./index.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zeit/now-builders.git",
+    "directory": "packages/now-node-bridge"
+  },
+  "files": [
+    "bridge.*",
+    "index.js"
+  ],
+  "scripts": {
+    "build": "tsc",
+    "test": "npm run build && jest",
+    "prepublish": "npm run build"
+  },
+  "devDependencies": {
+    "@types/aws-lambda": "8.10.19",
+    "@types/node": "11.9.4",
+    "jest": "24.1.0",
+    "typescript": "3.3.3"
   }
 }

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

@@ -0,0 +1,195 @@
+import { AddressInfo } from 'net';
+import { APIGatewayProxyEvent } from 'aws-lambda';
+import {
+  Server,
+  IncomingHttpHeaders,
+  OutgoingHttpHeaders,
+  request
+} from 'http';
+
+interface NowProxyEvent {
+  Action: string;
+  body: string;
+}
+
+export interface NowProxyRequest {
+  isApiGateway?: boolean;
+  method: string;
+  path: string;
+  headers: IncomingHttpHeaders;
+  body: Buffer;
+}
+
+export interface NowProxyResponse {
+  statusCode: number;
+  headers: OutgoingHttpHeaders;
+  body: string;
+  encoding: string;
+}
+
+/**
+ * If the `http.Server` handler function throws an error asynchronously,
+ * then it ends up being an unhandled rejection which doesn't kill the node
+ * process which causes the HTTP request to hang indefinitely. So print the
+ * error here and force the process to exit so that the lambda invocation
+ * returns an Unhandled error quickly.
+ */
+process.on('unhandledRejection', (err: Error) => {
+  console.error('Unhandled rejection:', err);
+  process.exit(1);
+});
+
+function normalizeNowProxyEvent(event: NowProxyEvent): NowProxyRequest {
+  let bodyBuffer: Buffer | null;
+  const { method, path, headers, encoding, body } = JSON.parse(event.body);
+
+  if (body) {
+    if (encoding === 'base64') {
+      bodyBuffer = Buffer.from(body, encoding);
+    } else if (encoding === undefined) {
+      bodyBuffer = Buffer.from(body);
+    } else {
+      throw new Error(`Unsupported encoding: ${encoding}`);
+    }
+  } else {
+    bodyBuffer = Buffer.alloc(0);
+  }
+
+  return { isApiGateway: false, method, path, headers, body: bodyBuffer };
+}
+
+function normalizeAPIGatewayProxyEvent(
+  event: APIGatewayProxyEvent
+): NowProxyRequest {
+  let bodyBuffer: Buffer | null;
+  const { httpMethod: method, path, headers, body } = event;
+
+  if (body) {
+    if (event.isBase64Encoded) {
+      bodyBuffer = Buffer.from(body, 'base64');
+    } else {
+      bodyBuffer = Buffer.from(body);
+    }
+  } else {
+    bodyBuffer = Buffer.alloc(0);
+  }
+
+  return { isApiGateway: true, method, path, headers, body: bodyBuffer };
+}
+
+function normalizeEvent(
+  event: NowProxyEvent | APIGatewayProxyEvent
+): NowProxyRequest {
+  if ('Action' in event) {
+    if (event.Action === 'Invoke') {
+      return normalizeNowProxyEvent(event);
+    } else {
+      throw new Error(`Unexpected event.Action: ${event.Action}`);
+    }
+  } else {
+    return normalizeAPIGatewayProxyEvent(event);
+  }
+}
+
+export class Bridge {
+  private server: Server | null;
+  private listening: Promise<AddressInfo>;
+  private resolveListening: (info: AddressInfo) => void;
+
+  constructor(server?: Server) {
+    this.server = null;
+    if (server) {
+      this.setServer(server);
+    }
+    this.launcher = this.launcher.bind(this);
+
+    // This is just to appease TypeScript strict mode, since it doesn't
+    // understand that the Promise constructor is synchronous
+    this.resolveListening = (info: AddressInfo) => {};
+
+    this.listening = new Promise(resolve => {
+      this.resolveListening = resolve;
+    });
+  }
+
+  setServer(server: Server) {
+    this.server = server;
+    server.once('listening', () => {
+      const addr = server.address();
+      if (typeof addr === 'string') {
+        throw new Error(`Unexpected string for \`server.address()\`: ${addr}`);
+      } else if (!addr) {
+        throw new Error('`server.address()` returned `null`');
+      } else {
+        this.resolveListening(addr);
+      }
+    });
+  }
+
+  listen() {
+    if (!this.server) {
+      throw new Error('Server has not been set!');
+    }
+
+    return this.server.listen({
+      host: '127.0.0.1',
+      port: 0
+    });
+  }
+
+  async launcher(
+    event: NowProxyEvent | APIGatewayProxyEvent
+  ): Promise<NowProxyResponse> {
+    const { port } = await this.listening;
+
+    const { isApiGateway, method, path, headers, body } = normalizeEvent(
+      event
+    );
+
+    const opts = {
+      hostname: '127.0.0.1',
+      port,
+      path,
+      method,
+      headers
+    };
+
+    // eslint-disable-next-line consistent-return
+    return new Promise((resolve, reject) => {
+      const req = request(opts, res => {
+        const response = res;
+        const respBodyChunks: Buffer[] = [];
+        response.on('data', chunk => respBodyChunks.push(Buffer.from(chunk)));
+        response.on('error', reject);
+        response.on('end', () => {
+          const bodyBuffer = Buffer.concat(respBodyChunks);
+          delete response.headers.connection;
+
+          if (isApiGateway) {
+            delete response.headers['content-length'];
+          } else if (response.headers['content-length']) {
+            response.headers['content-length'] = String(bodyBuffer.length);
+          }
+
+          resolve({
+            statusCode: response.statusCode || 200,
+            headers: response.headers,
+            body: bodyBuffer.toString('base64'),
+            encoding: 'base64'
+          });
+        });
+      });
+
+      req.on('error', error => {
+        setTimeout(() => {
+          // this lets express print the true error of why the connection was closed.
+          // it is probably 'Cannot set headers after they are sent to the client'
+          reject(error);
+        }, 2);
+      });
+
+      if (body) req.write(body);
+      req.end();
+    });
+  }
+}

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

@@ -0,0 +1,71 @@
+const assert = require('assert');
+const { Server } = require('http');
+const { Bridge } = require('../bridge');
+
+test('port binding', async () => {
+  const server = new Server();
+  const bridge = new Bridge(server);
+  bridge.listen();
+
+  // Test port binding
+  const info = await bridge.listening;
+  assert.equal(info.address, '127.0.0.1');
+  assert.equal(typeof info.port, 'number');
+
+  server.close();
+});
+
+test('`APIGatewayProxyEvent` normalizing', async () => {
+  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,
+  });
+  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');
+
+  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 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',
+    }),
+  });
+  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');
+
+  server.close();
+});

packages/now-node-bridge/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "esModuleInterop": true,
+    "lib": ["esnext"],
+    "target": "esnext",
+    "module": "commonjs",
+    "outDir": ".",
+    "strict": true,
+    "sourceMap": true,
+    "declaration": true
+  },
+  "include": [
+    "src/**/*"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
+}

packages/now-node-server/index.js

@@ -1,15 +1,14 @@
-const { createLambda } = require('@now/build-utils/lambda.js');
-const download = require('@now/build-utils/fs/download.js');
-const FileBlob = require('@now/build-utils/file-blob.js');
-const FileFsRef = require('@now/build-utils/file-fs-ref.js');
+const { createLambda } = require('@now/build-utils/lambda.js'); // eslint-disable-line import/no-extraneous-dependencies
+const download = require('@now/build-utils/fs/download.js'); // eslint-disable-line import/no-extraneous-dependencies
+const FileBlob = require('@now/build-utils/file-blob.js'); // eslint-disable-line import/no-extraneous-dependencies
+const FileFsRef = require('@now/build-utils/file-fs-ref.js'); // eslint-disable-line import/no-extraneous-dependencies
 const fs = require('fs-extra');
-const glob = require('@now/build-utils/fs/glob.js');
+const glob = require('@now/build-utils/fs/glob.js'); // eslint-disable-line import/no-extraneous-dependencies
 const path = require('path');
-const rename = require('@now/build-utils/fs/rename.js');
 const {
   runNpmInstall,
   runPackageJsonScript,
-} = require('@now/build-utils/fs/run-user-scripts.js');
+} = require('@now/build-utils/fs/run-user-scripts.js'); // eslint-disable-line import/no-extraneous-dependencies
 
 /** @typedef { import('@now/build-utils/file-ref') } FileRef */
 /** @typedef {{[filePath: string]: FileRef}} Files */
@@ -31,49 +30,52 @@ async function downloadInstallAndBundle(
   { files, entrypoint, workPath },
   { npmArguments = [] } = {},
 ) {
-  const userPath = path.join(workPath, 'user');
-  const nccPath = path.join(workPath, 'ncc');
-
   console.log('downloading user files...');
-  const downloadedFiles = await download(files, userPath);
+  const downloadedFiles = await download(files, workPath);
 
-  console.log('running npm install for user...');
-  const entrypointFsDirname = path.join(userPath, path.dirname(entrypoint));
+  console.log("installing dependencies for user's code...");
+  const entrypointFsDirname = path.join(workPath, path.dirname(entrypoint));
   await runNpmInstall(entrypointFsDirname, npmArguments);
-
-  console.log('writing ncc package.json...');
-  await download(
-    {
-      'package.json': new FileBlob({
-        data: JSON.stringify({
-          dependencies: {
-            '@zeit/ncc': '0.4.1',
-          },
-        }),
-      }),
-    },
-    nccPath,
-  );
-
-  console.log('running npm install for ncc...');
-  await runNpmInstall(nccPath, npmArguments);
-  return [downloadedFiles, userPath, nccPath, entrypointFsDirname];
+  return [downloadedFiles, entrypointFsDirname];
 }
 
-async function compile(workNccPath, downloadedFiles, entrypoint) {
+async function compile(workPath, downloadedFiles, entrypoint, config) {
   const input = downloadedFiles[entrypoint].fsPath;
-  const ncc = require(path.join(workNccPath, 'node_modules/@zeit/ncc'));
-  const { code, assets } = await ncc(input);
+  const inputDir = path.dirname(input);
+  const ncc = require('@zeit/ncc');
+  const { code, assets } = await ncc(input, { sourceMap: true });
+
+  if (config && config.includeFiles) {
+    // eslint-disable-next-line no-restricted-syntax
+    for (const pattern of config.includeFiles) {
+      // eslint-disable-next-line no-await-in-loop
+      const files = await glob(pattern, inputDir);
+
+      // eslint-disable-next-line no-restricted-syntax
+      for (const assetName of Object.keys(files)) {
+        const stream = files[assetName].toStream();
+        const { mode } = files[assetName];
+        // eslint-disable-next-line no-await-in-loop
+        const { data } = await FileBlob.fromStream({ stream });
+
+        assets[assetName] = {
+          source: data,
+          permissions: mode,
+        };
+      }
+    }
+  }
 
   const preparedFiles = {};
   const blob = new FileBlob({ data: code });
   // move all user code to 'user' subdirectory
-  preparedFiles[path.join('user', entrypoint)] = blob;
+  preparedFiles[entrypoint] = blob;
   // eslint-disable-next-line no-restricted-syntax
   for (const assetName of Object.keys(assets)) {
-    const blob2 = new FileBlob({ data: assets[assetName] });
+    const { source: data, permissions: mode } = assets[assetName];
+    const blob2 = new FileBlob({ data, mode });
     preparedFiles[
-      path.join('user', path.dirname(entrypoint), assetName)
+      path.join(path.dirname(entrypoint), assetName)
     ] = blob2;
   }
 
@@ -93,8 +95,6 @@ exports.build = async ({
 }) => {
   const [
     downloadedFiles,
-    workUserPath,
-    workNccPath,
     entrypointFsDirname,
   ] = await downloadInstallAndBundle(
     { files, entrypoint, workPath },
@@ -108,12 +108,15 @@ exports.build = async ({
   let preparedFiles;
 
   if (config && config.bundle === false) {
-    // move all user code to 'user' subdirectory
-    preparedFiles = await glob('**', workUserPath);
-    preparedFiles = rename(preparedFiles, name => path.join('user', name));
+    preparedFiles = await glob('**', workPath);
   } else {
     console.log('compiling entrypoint with ncc...');
-    preparedFiles = await compile(workNccPath, downloadedFiles, entrypoint);
+    preparedFiles = await compile(
+      workPath,
+      downloadedFiles,
+      entrypoint,
+      config,
+    );
   }
 
   const launcherPath = path.join(__dirname, 'launcher.js');
@@ -121,8 +124,7 @@ exports.build = async ({
   launcherData = launcherData.replace(
     '// PLACEHOLDER',
     [
-      'process.chdir("./user");',
-      `require("./${path.join('user', entrypoint)}");`,
+      `require("./${entrypoint}");`,
     ].join(' '),
   );
 
@@ -140,18 +142,8 @@ exports.build = async ({
   return { [entrypoint]: lambda };
 };
 
-exports.prepareCache = async ({
-  files, entrypoint, workPath, cachePath,
-}) => {
-  await fs.remove(workPath);
-  await downloadInstallAndBundle({ files, entrypoint, workPath: cachePath });
-
-  return {
-    ...(await glob('user/node_modules/**', cachePath)),
-    ...(await glob('user/package-lock.json', cachePath)),
-    ...(await glob('user/yarn.lock', cachePath)),
-    ...(await glob('ncc/node_modules/**', cachePath)),
-    ...(await glob('ncc/package-lock.json', cachePath)),
-    ...(await glob('ncc/yarn.lock', cachePath)),
-  };
-};
+exports.prepareCache = async ({ workPath }) => ({
+  ...(await glob('node_modules/**', workPath)),
+  ...(await glob('package-lock.json', workPath)),
+  ...(await glob('yarn.lock', workPath)),
+});

packages/now-node-server/launcher.js

@@ -4,19 +4,29 @@ const { Bridge } = require('./bridge.js');
 const bridge = new Bridge();
 
 const saveListen = Server.prototype.listen;
-Server.prototype.listen = function listen(...args) {
-  this.on('listening', function listening() {
-    bridge.port = this.address().port;
-  });
-  saveListen.apply(this, args);
+Server.prototype.listen = function listen() {
+  bridge.setServer(this);
+  Server.prototype.listen = saveListen;
+  return bridge.listen();
 };
 
+if (!process.env.NODE_ENV) {
+  process.env.NODE_ENV = process.env.NOW_REGION === 'dev1' ? 'development' : 'production';
+}
+
 try {
-  process.env.NODE_ENV = 'production';
   // PLACEHOLDER
-} catch (error) {
-  console.error(error);
-  bridge.userError = error;
+} 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`?',
+    );
+    process.exit(1);
+  } else {
+    console.error(err);
+    process.exit(1);
+  }
 }
 
 exports.launcher = bridge.launcher;

packages/now-node-server/package.json

@@ -1,12 +1,16 @@
 {
   "name": "@now/node-server",
-  "version": "0.4.25-canary.3",
-  "dependencies": {
-    "@now/node-bridge": "^0.1.9",
-    "fs-extra": "7.0.1"
+  "version": "0.5.4-canary.3",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zeit/now-builders.git",
+    "directory": "packages/now-node-server"
   },
-  "peerDependencies": {
-    "@now/build-utils": ">=0.0.1"
+  "dependencies": {
+    "@now/node-bridge": "^1.0.2-canary.2",
+    "@zeit/ncc": "0.17.3",
+    "fs-extra": "7.0.1"
   },
   "scripts": {
     "test": "jest"

packages/now-node-server/test/fixtures/01-cowsay/index.js

@@ -1,4 +1,4 @@
-const cowsay = require('cowsay/build/cowsay.umd.js').say;
+const cowsay = require('cowsay').say;
 const http = require('http');
 
 // test that process.env is not replaced by webpack

packages/now-node-server/test/fixtures/01-cowsay/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "cowsay": "^1.3.1"
+    "cowsay": "1.3.1"
   }
 }

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

@@ -1,4 +1,4 @@
-const yodasay = require('yodasay/build/yodasay.umd.js').say;
+const yodasay = require('yodasay').say;
 const http = require('http');
 
 // test that process.env is not replaced by webpack

packages/now-node-server/test/fixtures/01-cowsay/subdirectory/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "yodasay": "^1.1.6"
+    "yodasay": "1.1.9"
   }
 }