Publish

- @now/bash@0.0.3
 - @now/build-utils@0.4.31
 - @now/cgi@0.0.14
 - @now/go@0.2.11
 - @now/lambda@0.4.8
 - @now/md@0.4.8
 - @now/mdx-deck@0.4.17
 - @now/next@0.0.81
 - @now/node-server@0.4.25
 - @now/node@0.4.27
 - @now/php@0.4.12
 - @now/static-build@0.4.16

.circleci/config.yml

@@ -4,45 +4,39 @@ jobs:
     docker:
       - image: circleci/node:10
     working_directory: ~/repo
+    environment:
+      GOPATH: $HOME/go
     steps:
       - checkout
-      - run: yarn install
-      - run: yarn bootstrap
-  publish-canary:
-    docker:
-      - image: circleci/node:10
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - run: yarn install
-      - run: yarn bootstrap
       - run:
-          name: Saving Authentication Information
-          command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
+          name: Updating apt-get list
+          command: sudo apt-get update
       - run:
-          name: Publishing to Canary Channel
-          command: yarn run lerna publish from-git --npm-tag canary --yes
+          name: Installing the latest version of Go
+          command: sudo apt-get install golang-go
+      - run:
+          name: Installing dependencies
+          command: yarn install
+      - run:
+          name: Bootstrapping
+          command: yarn bootstrap
+      - run:
+          name: Linting
+          command: yarn lint
+      - run:
+          name: Tests
+          command: yarn test
+      - 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"
 workflows:
   version: 2
-  unscheduled:
+  build-and-deploy:
     jobs:
-      - build:
-          filters:
-            tags:
-              only: /.*/
-      - publish-canary:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /.*/
-            branches:
-              ignore: /.*/
-      # - publish-stable:
-      #     requires:
-      #       - build
-      #     filters:
-      #       tags:
-      #         only: /^(\d+\.)?(\d+\.)?(\*|\d+)$/
-      #       branches:
-      #         ignore: /.*/
+      - build

.eslintignore

@@ -0,0 +1,3 @@
+/tmp/*
+/node_modules/*
+/**/node_modules/*

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

.gitignore

@@ -1 +1,2 @@
 node_modules
+tmp

README.md

@@ -3,3 +3,25 @@
 This is the full list of official Builders provided by the ZEIT team.
 
 More details here: http://zeit.co/docs
+
+### Publishing to npm
+
+Run the following command to publish modified builders to npm:
+
+For the stable channel use:
+
+```
+yarn publish-stable
+```
+
+For the canary channel use:
+
+```
+yarn publish-canary
+```
+
+CircleCI will take care of publishing the updated packages to npm from there.
+
+If for some reason CircleCI fails to publish the npm package, you may do so
+manually by running `npm publish` from the package directory. Make sure to
+include the `--tag canary` parameter if you are publishing a canary release!

jest.config.js

@@ -0,0 +1,4 @@
+module.exports = {
+  testEnvironment: 'node',
+  collectCoverageFrom: ['packages/**/*.{js,jsx}', '!**/node_modules/**'],
+};

package.json

@@ -1,5 +1,6 @@
 {
   "name": "now-builders",
+  "version": "0.0.0",
   "private": true,
   "license": "MIT",
   "dependencies": {
@@ -11,6 +12,37 @@
   "scripts": {
     "lerna": "lerna",
     "bootstrap": "lerna bootstrap",
-    "publish-canary": "lerna version prerelease --preid canary"
+    "publish-stable": "lerna version",
+    "publish-canary": "lerna version prerelease --preid canary",
+    "lint": "tsc && eslint .",
+    "test": "jest --runInBand",
+    "lint-staged": "lint-staged"
+  },
+  "pre-commit": "lint-staged",
+  "lint-staged": {
+    "*.js": [
+      "prettier --write --single-quote",
+      "eslint --fix",
+      "git add"
+    ]
+  },
+  "devDependencies": {
+    "@types/fs-extra": "^5.0.4",
+    "@types/glob": "^7.1.1",
+    "@types/multistream": "^2.1.1",
+    "@types/node": "^10.12.8",
+    "buffer-replace": "^1.0.0",
+    "eslint": "^5.9.0",
+    "eslint-config-airbnb-base": "^13.1.0",
+    "eslint-config-prettier": "^3.1.0",
+    "eslint-plugin-import": "^2.14.0",
+    "fs-extra": "^7.0.1",
+    "glob": "^7.1.3",
+    "jest": "^23.6.0",
+    "lint-staged": "^8.0.4",
+    "node-fetch": "^2.3.0",
+    "pre-commit": "^1.2.2",
+    "prettier": "^1.15.2",
+    "typescript": "^3.1.6"
   }
 }

packages/now-bash/.gitignore

@@ -0,0 +1,2 @@
+node_modules
+handler

packages/now-bash/bootstrap

@@ -0,0 +1,14 @@
+#!/bin/bash
+set -euo pipefail
+cd "$LAMBDA_TASK_ROOT"
+
+# Configure `import`
+export IMPORT_CACHE="$LAMBDA_TASK_ROOT/.import-cache"
+export PATH="$IMPORT_CACHE/bin:$PATH"
+
+# Load `import` and runtime
+. "$(which import)"
+. "$IMPORT_CACHE/runtime.sh"
+
+# Load user code and process events in a loop forever
+_lambda_runtime_init

packages/now-bash/builder.sh

@@ -0,0 +1,49 @@
+#!/bin/bash
+set -euo pipefail
+
+# `import` debug logs are always enabled during build
+export IMPORT_DEBUG=1
+
+# Install `import`
+IMPORT_BIN="$IMPORT_CACHE/bin/import"
+mkdir -p "$(dirname "$IMPORT_BIN")"
+curl -sfLS https://import.pw > "$IMPORT_BIN"
+chmod +x "$IMPORT_BIN"
+
+# For now only the entrypoint file is copied into the lambda
+mkdir -p "$(dirname "$ENTRYPOINT")"
+cp "$SRC/$ENTRYPOINT" "$ENTRYPOINT"
+
+# Copy in the runtime
+cp "$BUILDER/runtime.sh" "$IMPORT_CACHE"
+cp "$BUILDER/bootstrap" .
+
+# Load `import`
+. "$(which import)"
+
+# Cache runtime and user dependencies
+echo "Caching imports in \"$ENTRYPOINT\"…"
+. "$IMPORT_CACHE/runtime.sh"
+. "$ENTRYPOINT"
+echo "Done caching imports"
+
+# Run user build script
+if declare -f build > /dev/null; then
+	echo "Running \`build\` function in \"$ENTRYPOINT\"…"
+	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
+	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

@@ -0,0 +1,55 @@
+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');
+
+exports.config = {
+  maxLambdaSize: '10mb',
+};
+
+exports.analyze = ({ files, entrypoint }) => files[entrypoint].digest;
+
+exports.build = async ({ files, entrypoint, config }) => {
+  const srcDir = await getWritableDirectory();
+  const workDir = await getWritableDirectory();
+
+  console.log('downloading files...');
+  await download(files, srcDir);
+
+  const configEnv = Object.keys(config).reduce((o, v) => {
+    o[`IMPORT_${snakeCase(v).toUpperCase()}`] = config[v]; // eslint-disable-line no-param-reassign
+    return o;
+  }, {});
+
+  const IMPORT_CACHE = `${workDir}/.import-cache`;
+  const env = Object.assign({}, process.env, configEnv, {
+    PATH: `${IMPORT_CACHE}/bin:${process.env.PATH}`,
+    IMPORT_CACHE,
+    SRC: srcDir,
+    BUILDER: __dirname,
+    ENTRYPOINT: entrypoint,
+  });
+
+  const builderPath = join(__dirname, 'builder.sh');
+
+  await execa(builderPath, [entrypoint], {
+    env,
+    cwd: workDir,
+  });
+
+  const lambda = await createLambda({
+    files: await glob('**', workDir),
+    handler: entrypoint, // not actually used in `bootstrap`
+    runtime: 'provided',
+    environment: Object.assign({}, configEnv, {
+      SCRIPT_FILENAME: entrypoint,
+    }),
+  });
+
+  return {
+    [entrypoint]: lambda,
+  };
+};

packages/now-bash/package.json

@@ -0,0 +1,22 @@
+{
+  "name": "@now/bash",
+  "version": "0.0.3",
+  "description": "Now 2.0 builder for HTTP endpoints written in Bash",
+  "main": "index.js",
+  "author": "Nathan Rajlich <nate@zeit.co>",
+  "license": "MIT",
+  "files": [
+    "builder.sh",
+    "runtime.sh",
+    "bootstrap",
+    "index.js",
+    "package.json"
+  ],
+  "dependencies": {
+    "execa": "^1.0.0",
+    "snake-case": "^2.1.0"
+  },
+  "peerDependencies": {
+    "@now/build-utils": ">=0.0.1"
+  }
+}

packages/now-bash/runtime.sh

@@ -0,0 +1,115 @@
+import "static-binaries@0.0.6"
+static_binaries jq
+
+# These get reset upon each request
+_STATUS_CODE="$(mktemp)"
+_HEADERS="$(mktemp)"
+
+_lambda_runtime_api() {
+	local endpoint="$1"
+	shift
+	curl -sfLS "http://$AWS_LAMBDA_RUNTIME_API/2018-06-01/runtime/$endpoint" "$@"
+}
+
+_lambda_runtime_init() {
+	# Initialize user code
+	. "$SCRIPT_FILENAME" || {
+		local exit_code="$?"
+		local error
+		error='{"exitCode":'"$exit_code"'}'
+		_lambda_runtime_api "init/error" -X POST -d "$error"
+		exit "$EXIT_CODE"
+	}
+
+	# Process events
+	while true; do _lambda_runtime_next; done
+}
+
+_lambda_runtime_next() {
+	echo 200 > "$_STATUS_CODE"
+	echo '{"content-type":"text/plain; charset=utf8"}' > "$_HEADERS"
+
+	local headers
+	headers="$(mktemp)"
+
+	# Get an event
+	local event
+	event="$(mktemp)"
+	_lambda_runtime_api invocation/next -D "$headers" | jq -r '.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.
+	# 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)"
+	mkfifo "$stdin"
+	_lambda_runtime_body "$event" > "$stdin" &
+
+	serve "$event" < "$stdin" > "$body" || exit_code="$?"
+	rm -f "$event" "$stdin"
+
+	if [ "$exit_code" -eq 0 ]; then
+		# Send the response
+		local response
+		response="$(jq -cnMr \
+			--arg statusCode "$(cat "$_STATUS_CODE")" \
+			--argjson headers "$(cat "$_HEADERS")" \
+			--arg body "$(base64 --wrap=0 < "$body")" \
+			'{statusCode:$statusCode|tonumber, headers:$headers, encoding:"base64", body:$body}')"
+		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"
+	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
+		else
+			# assume plain-text body
+			jq -r '.body' < "$1"
+		fi
+	fi
+}
+
+
+# Set the response status code.
+http_response_code() {
+	echo "$1" > "$_STATUS_CODE"
+}
+
+# Sets a response header.
+# Overrides existing header if it has already been set.
+http_response_header() {
+	local name="$1"
+	local value="$2"
+	local tmp
+	tmp="$(mktemp)"
+	jq --arg name "$name" --arg value "$value" '.[$name] = $value' < "$_HEADERS" > "$tmp"
+	mv -f "$tmp" "$_HEADERS"
+}
+
+http_response_redirect() {
+	http_response_code "${2:-302}"
+	http_response_header "location" "$1"
+}
+
+http_response_json() {
+	http_response_header "content-type" "application/json; charset=utf8"
+}

packages/now-bash/yarn.lock

@@ -0,0 +1,146 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+cross-spawn@^6.0.0:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+end-of-stream@^1.1.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
+  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
+  dependencies:
+    once "^1.4.0"
+
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+get-stream@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"
+
+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+lower-case@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
+  integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
+
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+
+no-case@^2.2.0:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
+  integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
+  dependencies:
+    lower-case "^1.1.1"
+
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
+  dependencies:
+    path-key "^2.0.0"
+
+once@^1.3.1, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+
+path-key@^2.0.0, path-key@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+semver@^5.5.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
+
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+
+signal-exit@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+
+snake-case@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f"
+  integrity sha1-Qb2xtz8w7GagTU4srRt2OH1NbZ8=
+  dependencies:
+    no-case "^2.2.0"
+
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
+
+which@^1.2.9:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=

packages/now-build-utils/.npmignore

@@ -0,0 +1 @@
+/test

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

@@ -2,7 +2,7 @@ const assert = require('assert');
 const intoStream = require('into-stream');
 
 class FileBlob {
-  constructor ({ mode = 0o100644, data }) {
+  constructor({ mode = 0o100644, data }) {
     assert(typeof mode === 'number');
     assert(typeof data === 'string' || Buffer.isBuffer(data));
     this.type = 'FileBlob';
@@ -10,14 +10,14 @@ class FileBlob {
     this.data = data;
   }
 
-  static async fromStream ({ mode = 0o100644, stream }) {
+  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('data', chunk => chunks.push(Buffer.from(chunk)));
+      stream.on('error', error => reject(error));
       stream.on('end', () => resolve());
     });
 
@@ -25,7 +25,7 @@ class FileBlob {
     return new FileBlob({ mode, data });
   }
 
-  toStream () {
+  toStream() {
     return intoStream(this.data);
   }
 }

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

@@ -1,21 +1,39 @@
 const assert = require('assert');
 const fs = require('fs-extra');
-const MultiStream = require('multistream');
+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 }) {
+  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;
   }
 
-  static async fromStream ({ mode = 0o100644, stream, 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');
@@ -24,36 +42,45 @@ class FileFsRef {
     await new Promise((resolve, reject) => {
       const dest = fs.createWriteStream(fsPath);
       stream.pipe(dest);
-      stream.on('error', (error) => reject(error));
-      dest.on('finish', () => resolve());
-      dest.on('error', (error) => reject(error));
+      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 });
   }
 
-  async toStreamAsync () {
+  /**
+   * @returns {Promise<NodeJS.ReadableStream>}
+   */
+  async toStreamAsync() {
     await semaToPreventEMFILE.acquire();
     const release = () => semaToPreventEMFILE.release();
     const stream = fs.createReadStream(this.fsPath);
-    stream.on('end', release);
+    stream.on('close', release);
     stream.on('error', release);
     return stream;
   }
 
-  toStream () {
+  /**
+   * @returns {NodeJS.ReadableStream}
+   */
+  toStream() {
     let flag;
 
-    return new MultiStream((cb) => {
-      if (flag) return cb();
+    // eslint-disable-next-line consistent-return
+    return multiStream((cb) => {
+      if (flag) return cb(null, null);
       flag = true;
 
-      this.toStreamAsync().then((stream) => {
-        cb(undefined, stream);
-      }).catch((error) => {
-        cb(error);
-      });
+      this.toStreamAsync()
+        .then((stream) => {
+          cb(null, stream);
+        })
+        .catch((error) => {
+          cb(error, null);
+        });
     });
   }
 }

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

@@ -1,21 +1,43 @@
 const assert = require('assert');
 const fetch = require('node-fetch');
-const MultiStream = require('multistream');
+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 }) {
+  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;
   }
 
-  async toStreamAsync () {
+  /**
+   * @returns {Promise<NodeJS.ReadableStream>}
+   */
+  async toStreamAsync() {
     let url;
     // sha:24be087eef9fac01d61b30a725c1a10d7b45a256
     const digestParts = this.digest.split(':');
@@ -29,33 +51,44 @@ class FileRef {
     await semaToDownloadFromS3.acquire();
     console.time(`downloading ${url}`);
     try {
-      return await retry(async () => {
-        const resp = await fetch(url);
-        if (!resp.ok) {
-          const error = new Error(`${resp.status} ${resp.statusText}`);
-          if (resp.status === 403) error.bail = true;
-          throw error;
-        }
-        return resp.body;
-      }, { factor: 1, retries: 3 });
+      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();
     }
   }
 
-  toStream () {
+  /**
+   * @returns {NodeJS.ReadableStream}
+   */
+  toStream() {
     let flag;
 
-    return new MultiStream((cb) => {
-      if (flag) return cb();
+    // eslint-disable-next-line consistent-return
+    return multiStream((cb) => {
+      if (flag) return cb(null, null);
       flag = true;
 
-      this.toStreamAsync().then((stream) => {
-        cb(undefined, stream);
-      }).catch((error) => {
-        cb(error);
-      });
+      this.toStreamAsync()
+        .then((stream) => {
+          cb(null, stream);
+        })
+        .catch((error) => {
+          cb(error, null);
+        });
     });
   }
 }

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

@@ -0,0 +1,83 @@
+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,20 +1,38 @@
-const FileFsRef = require('../file-fs-ref.js');
 const path = require('path');
+const FileFsRef = require('../file-fs-ref.js');
 
-async function downloadFile (file, fsPath) {
+/** @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 await FileFsRef.fromStream({ mode, stream, fsPath });
+  return FileFsRef.fromStream({ mode, stream, fsPath });
 }
 
-module.exports = async function download (files, basePath) {
+/**
+ * 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);
-  }));
+  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/fs/get-writable-directory.js

@@ -4,7 +4,7 @@ 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 () {
+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);

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

@@ -1,41 +1,67 @@
 const assert = require('assert');
-const FileFsRef = require('../file-fs-ref.js');
 const path = require('path');
 const vanillaGlob = require('glob');
+const FileFsRef = require('../file-fs-ref.js');
 
-module.exports = function glob (pattern, opts = {}, mountpoint) {
+/** @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') {
-      opts = { cwd: opts };
+      options = { cwd: opts };
+    } else {
+      options = opts;
     }
 
-    if (!opts.cwd) {
-      throw new Error('Second argument (basePath) must be specified for names of resulting files');
+    if (!options.cwd) {
+      throw new Error(
+        'Second argument (basePath) must be specified for names of resulting files',
+      );
     }
 
-    if (!path.isAbsolute(opts.cwd)) {
-      throw new Error(`basePath/cwd must be an absolute path (${opts.cwd})`);
+    if (!path.isAbsolute(options.cwd)) {
+      throw new Error(`basePath/cwd must be an absolute path (${options.cwd})`);
     }
 
-    opts.statCache = {};
-    opts.stat = true;
-    opts.dot = true;
+    options.statCache = {};
+    options.stat = true;
+    options.dot = true;
 
-    vanillaGlob(pattern, opts, (error, files) => {
+    // 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(opts.cwd, relativePath);
-        const stat = opts.statCache[fsPath];
-        assert(stat, `statCache does not contain value for ${relativePath} (resolved to ${fsPath})`);
-        if (stat.isFile()) {
-          let finalPath = relativePath;
-          if (mountpoint) finalPath = path.join(mountpoint, finalPath);
-          files2[finalPath] = new FileFsRef({ mode: stat.mode, fsPath });
-        }
+      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;
-      }, {}));
+          return files2;
+        }, {}),
+      );
     });
   });
 };

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

@@ -1,9 +1,25 @@
-module.exports = function rename (files, delegate) {
-  const files2 = {};
+/** @typedef { import('@now/build-utils/file-ref') } FileRef */
+/** @typedef { import('@now/build-utils/file-fs-ref') } FileFsRef */
+/** @typedef {{[filePath: string]: FileRef|FileFsRef}} Files */
 
-  for (const name in files) {
-    files2[delegate(name)] = files[name];
-  }
+/**
+ * @callback delegate
+ * @argument {string} name
+ * @returns {string}
+ */
 
-  return files2;
+/**
+ * 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],
+    }),
+    {},
+  );
 };

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

@@ -1,71 +1,104 @@
+const assert = require('assert');
 const fs = require('fs-extra');
 const path = require('path');
 const { spawn } = require('child_process');
 
-async function runShellScript (fsPath) {
-  const destPath = path.dirname(fsPath);
-  await spawnAsync('./' + path.basename(fsPath), [], destPath);
-  return true;
-}
-
-async function shouldUseNpm (destPath) {
-  while (true) {
-    if (await fs.exists(path.join(destPath, 'package.json'))) {
-      if (await fs.exists(path.join(destPath, 'package-lock.json'))) {
-        return true;
-      } else {
-        return false;
-      }
-    }
-
-    const newDestPath = path.dirname(destPath);
-    if (destPath === newDestPath) break;
-    destPath = newDestPath;
-  }
-
-  return false;
-}
-
-async function runNpmInstall (destPath, args = []) {
-  console.log(`installing to ${destPath}`);
-  if (await shouldUseNpm(destPath)) {
-    args = args.filter((a) => a !== '--prefer-offline');
-    await spawnAsync('npm', [ 'install' ].concat(args), destPath);
-  } else {
-    await spawnAsync('yarn', [ '--cwd', destPath ].concat(args), destPath);
-  }
-}
-
-async function runPackageJsonScript (destPath, scriptName) {
-  try {
-    if (await shouldUseNpm(destPath)) {
-      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);
-    }
-  } catch (error) {
-    console.log(error.message);
-    return false;
-  }
-
-  return true;
-}
-
-function spawnAsync (command, args, cwd) {
+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) => {
-      if (code !== 0) return reject(new Error(`Exited with ${code || signal}`));
-      resolve();
-    });
+    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
+  runPackageJsonScript,
 };

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

@@ -1,10 +1,4 @@
-const streamToBuffer = require('fast-stream-to-buffer');
+const fastStreamToBuffer = require('fast-stream-to-buffer');
+const { promisify } = require('util');
 
-module.exports = async function (stream) {
-  return await new Promise((resolve, reject) => {
-    streamToBuffer(stream, function (error, buffer) {
-      if (error) return reject(error);
-      resolve(buffer);
-    });
-  });
-};
+module.exports = promisify(fastStreamToBuffer);

packages/now-build-utils/lambda.js

@@ -3,7 +3,9 @@ const { ZipFile } = require('yazl');
 const streamToBuffer = require('./fs/stream-to-buffer.js');
 
 class Lambda {
-  constructor ({ zipBuffer, handler, runtime, environment }) {
+  constructor({
+    zipBuffer, handler, runtime, environment,
+  }) {
     this.type = 'Lambda';
     this.zipBuffer = zipBuffer;
     this.handler = handler;
@@ -14,26 +16,34 @@ class Lambda {
 
 const mtime = new Date(1540000000000);
 
-async function createLambda ({ files, handler, runtime, environment }) {
-  assert(typeof files === 'object');
-  assert(typeof handler === 'string');
-  assert(typeof runtime === 'string');
-  if (environment === undefined) environment = {};
-  assert(typeof environment === 'object');
+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();
 
-  for (const name of Object.keys(files).sort()) {
-    const file = files[name];
-    const stream = file.toStream();
-    zipFile.addReadStream(stream, name, { mode: file.mode, mtime });
-  }
+  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 });
+  return new Lambda({
+    zipBuffer,
+    handler,
+    runtime,
+    environment,
+  });
 }
 
 module.exports = {
   Lambda,
-  createLambda
+  createLambda,
 };

packages/now-build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/build-utils",
-  "version": "0.4.27-canary.2",
+  "version": "0.4.31",
   "dependencies": {
     "async-retry": "1.2.3",
     "async-sema": "2.1.4",
@@ -8,8 +8,12 @@
     "fs-extra": "7.0.0",
     "glob": "7.1.3",
     "into-stream": "4.0.0",
+    "memory-fs": "0.4.1",
     "multistream": "2.1.1",
     "node-fetch": "2.2.0",
     "yazl": "2.4.3"
+  },
+  "scripts": {
+    "test": "jest"
   }
 }

packages/now-build-utils/test/fixtures/08-yarn-npm/now.json

@@ -0,0 +1,11 @@
+{
+  "version": 2,
+  "builds": [
+    { "src": "with-npm/index.js", "use": "@now/node" },
+    { "src": "with-yarn/index.js", "use": "@now/node" }
+  ],
+  "probes": [
+    { "path": "/with-npm", "mustContain": "npm:RANDOMNESS_PLACEHOLDER" },
+    { "path": "/with-yarn", "mustContain": "yarn:RANDOMNESS_PLACEHOLDER" }
+  ]
+}

packages/now-build-utils/test/fixtures/08-yarn-npm/with-npm/must-be-npm.js

@@ -0,0 +1,14 @@
+const fs = require('fs');
+const path = require('path');
+
+const execpath = path.basename(process.env.npm_execpath);
+console.log('execpath', execpath);
+
+if (execpath === 'npm-cli.js') {
+  fs.writeFileSync(
+    'index.js',
+    'module.exports = (_, resp) => resp.end("npm:RANDOMNESS_PLACEHOLDER");',
+  );
+} else {
+  throw new Error('npm is expected');
+}

packages/now-build-utils/test/fixtures/08-yarn-npm/with-npm/package-lock.json

@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}

packages/now-build-utils/test/fixtures/08-yarn-npm/with-npm/package.json

@@ -0,0 +1,5 @@
+{
+  "scripts": {
+    "now-build": "node must-be-npm.js"
+  }
+}

packages/now-build-utils/test/fixtures/08-yarn-npm/with-yarn/must-be-yarn.js

@@ -0,0 +1,14 @@
+const fs = require('fs');
+const path = require('path');
+
+const execpath = path.basename(process.env.npm_execpath);
+console.log('execpath', execpath);
+
+if (execpath === 'yarn.js' || execpath === 'yarn') {
+  fs.writeFileSync(
+    'index.js',
+    'module.exports = (_, resp) => resp.end("yarn:RANDOMNESS_PLACEHOLDER");',
+  );
+} else {
+  throw new Error('yarn is expected');
+}

packages/now-build-utils/test/fixtures/08-yarn-npm/with-yarn/package.json

@@ -0,0 +1,5 @@
+{
+  "scripts": {
+    "now-build": "node must-be-yarn.js"
+  }
+}

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

@@ -0,0 +1,63 @@
+/* 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(2 * 60 * 1000);
+const builderUrl = '@canary';
+let buildUtilsUrl;
+
+beforeAll(async () => {
+  const buildUtilsPath = path.resolve(__dirname, '..');
+  buildUtilsUrl = await packAndDeploy(buildUtilsPath);
+  console.log('buildUtilsUrl', buildUtilsUrl);
+});
+
+// own fixtures
+
+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();
+  });
+}
+
+// few foreign tests
+
+const buildersToTestWith = ['now-node-server', 'now-static-build'];
+
+// eslint-disable-next-line no-restricted-syntax
+for (const builder of buildersToTestWith) {
+  const fixturesPath2 = path.resolve(
+    __dirname,
+    `../../${builder}/test/fixtures`,
+  );
+
+  // eslint-disable-next-line no-restricted-syntax
+  for (const fixture of fs.readdirSync(fixturesPath2)) {
+    // don't run all foreign fixtures, just some
+    if (['01-cowsay', '03-env-vars'].includes(fixture)) {
+      // eslint-disable-next-line no-loop-func
+      it(`should build ${builder}/${fixture}`, async () => {
+        await expect(
+          testDeployment(
+            { builderUrl, buildUtilsUrl },
+            path.join(fixturesPath2, fixture),
+          ),
+        ).resolves.toBeDefined();
+      });
+    }
+  }
+}

packages/now-cgi/.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-cgi/.gitignore

@@ -0,0 +1,2 @@
+node_modules
+handler

packages/now-cgi/build.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+export GOOS=linux
+export GOARCH=amd64
+export GOPATH=$HOME/go
+go get github.com/aws/aws-lambda-go/events
+go get github.com/aws/aws-lambda-go/lambda
+go build -o handler main.go

packages/now-cgi/index.js

@@ -0,0 +1,42 @@
+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');
+
+exports.analyze = ({ files, entrypoint }) => files[entrypoint].digest;
+
+exports.build = async ({ files, entrypoint }) => {
+  console.log('downloading files...');
+  const srcDir = await getWritableDirectory();
+  const outDir = await getWritableDirectory();
+
+  await download(files, srcDir);
+
+  const handlerPath = path.join(__dirname, 'handler');
+  await copyFile(handlerPath, path.join(outDir, 'handler'));
+
+  const entrypointOutDir = path.join(outDir, path.dirname(entrypoint));
+  await mkdirp(entrypointOutDir);
+
+  // For now only the entrypoint file is copied into the lambda
+  await copyFile(
+    path.join(srcDir, entrypoint),
+    path.join(outDir, entrypoint),
+  );
+
+  const lambda = await createLambda({
+    files: await glob('**', outDir),
+    handler: 'handler',
+    runtime: 'go1.x',
+    environment: {
+      SCRIPT_FILENAME: entrypoint,
+    },
+  });
+
+  return {
+    [entrypoint]: lambda,
+  };
+};

packages/now-cgi/main.go

@@ -0,0 +1,36 @@
+package main
+
+import (
+	now "../../utils/go/bridge"
+	"net/http"
+	"net/http/cgi"
+	"os"
+	"path/filepath"
+)
+
+type CgiHandler struct {
+	http.Handler
+	Dir    string
+	Script string
+}
+
+func (h *CgiHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	handler := cgi.Handler{
+		Path: h.Script,
+		Root: "/" + h.Script,
+		Dir:  h.Dir,
+		Env: []string{
+			"HTTPS=on",
+			"SERVER_PORT=443",
+			"SERVER_SOFTWARE=@now/cgi",
+		},
+	}
+	handler.ServeHTTP(w, r)
+}
+
+func main() {
+	workdir, _ := filepath.Abs(".")
+	script := os.Getenv("SCRIPT_FILENAME")
+	handler := &CgiHandler{nil, workdir, script}
+	now.Start(handler)
+}

packages/now-cgi/package.json

@@ -0,0 +1,22 @@
+{
+  "name": "@now/cgi",
+  "version": "0.0.14",
+  "scripts": {
+    "test": "best -I test/*.js",
+    "prepublish": "./build.sh"
+  },
+  "files": [
+    "index.js",
+    "handler"
+  ],
+  "dependencies": {
+    "fs-extra": "7.0.0"
+  },
+  "devDependencies": {
+    "@zeit/best": "0.4.3",
+    "rmfr": "2.0.0"
+  },
+  "peerDependencies": {
+    "@now/build-utils": ">=0.0.1"
+  }
+}

packages/now-cgi/yarn.lock

@@ -0,0 +1,862 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@mrmlnc/readdir-enhanced@^2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
+  dependencies:
+    call-me-maybe "^1.0.1"
+    glob-to-regexp "^0.3.0"
+
+"@nodelib/fs.stat@^1.0.1":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
+
+"@zeit/best@0.4.3":
+  version "0.4.3"
+  resolved "http://registry.npmjs.org/@zeit/best/-/best-0.4.3.tgz#eaebdfa8b24121a97b1753501ea8c9330d549b30"
+  dependencies:
+    arg "1.0.0"
+    chalk "2.3.1"
+    diff "3.5.0"
+    globby "8.0.0"
+    signal-exit "3.0.2"
+
+ansi-styles@^3.2.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  dependencies:
+    color-convert "^1.9.0"
+
+append-type@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/append-type/-/append-type-1.0.1.tgz#e29a6eb22cec0c0b9b93063b3cf6b10d9e0c60f4"
+
+arg@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-1.0.0.tgz#444d885a4e25b121640b55155ef7cd03975d6050"
+
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+
+arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+
+array-to-sentence@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/array-to-sentence/-/array-to-sentence-1.1.0.tgz#c804956dafa53232495b205a9452753a258d39fc"
+
+array-union@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+
+arrify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+
+assert-valid-glob-opts@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-valid-glob-opts/-/assert-valid-glob-opts-1.0.0.tgz#ab9b5438ec5e929f5bb08201819affb1227f730a"
+  dependencies:
+    glob-option-error "^1.0.0"
+    validate-glob-opts "^1.0.0"
+
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+
+atob@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
+call-me-maybe@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
+
+chalk@2.3.1:
+  version "2.3.1"
+  resolved "http://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
+  dependencies:
+    ansi-styles "^3.2.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.2.0"
+
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  dependencies:
+    color-name "1.1.3"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+
+component-emitter@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+
+debug@^2.2.0, debug@^2.3.3:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  dependencies:
+    ms "2.0.0"
+
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
+diff@3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+
+dir-glob@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
+  dependencies:
+    arrify "^1.0.1"
+    path-type "^3.0.0"
+
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  dependencies:
+    is-extendable "^0.1.0"
+
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+fast-glob@^2.0.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.3.tgz#d09d378e9ef6b0076a0fa1ba7519d9d4d9699c28"
+  dependencies:
+    "@mrmlnc/readdir-enhanced" "^2.2.1"
+    "@nodelib/fs.stat" "^1.0.1"
+    glob-parent "^3.1.0"
+    is-glob "^4.0.0"
+    merge2 "^1.2.1"
+    micromatch "^3.1.10"
+
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
+for-in@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  dependencies:
+    map-cache "^0.2.2"
+
+fs-extra@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+
+glob-option-error@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/glob-option-error/-/glob-option-error-1.0.0.tgz#57cc65def9c7d5c1461baf13129bb5403cff6176"
+
+glob-parent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  dependencies:
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
+
+glob-to-regexp@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
+
+glob@^7.0.5, glob@^7.1.2:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globby@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.0.tgz#e6f8340ead9a52fa417ec0e75ae664ae0026f5c6"
+  dependencies:
+    array-union "^1.0.1"
+    dir-glob "^2.0.0"
+    fast-glob "^2.0.2"
+    glob "^7.1.2"
+    ignore "^3.3.5"
+    pify "^3.0.0"
+    slash "^1.0.0"
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+  version "4.1.14"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.14.tgz#1b6e8362ef8c5ecb5da799901f39297e3054773a"
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+ignore@^3.3.5:
+  version "3.3.10"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+
+indexed-filter@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/indexed-filter/-/indexed-filter-1.0.3.tgz#7911439191cac588188464640a8db4f6b324973d"
+  dependencies:
+    append-type "^1.0.1"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+
+inspect-with-kind@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/inspect-with-kind/-/inspect-with-kind-1.0.5.tgz#fce151d4ce89722c82ca8e9860bb96f9167c316c"
+  dependencies:
+    kind-of "^6.0.2"
+
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  dependencies:
+    kind-of "^6.0.0"
+
+is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  dependencies:
+    kind-of "^6.0.0"
+
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
+is-extendable@^0.1.0, is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  dependencies:
+    is-plain-object "^2.0.4"
+
+is-extglob@^2.1.0, is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+
+is-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  dependencies:
+    is-extglob "^2.1.0"
+
+is-glob@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-plain-obj@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+
+is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  dependencies:
+    isobject "^3.0.1"
+
+is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+
+isarray@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  dependencies:
+    isarray "1.0.0"
+
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  dependencies:
+    object-visit "^1.0.0"
+
+merge2@^1.2.1:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
+
+micromatch@^3.1.10:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
+minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  dependencies:
+    brace-expansion "^1.1.7"
+
+mixin-deep@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  dependencies:
+    isobject "^3.0.0"
+
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  dependencies:
+    isobject "^3.0.1"
+
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  dependencies:
+    wrappy "1"
+
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+
+path-dirname@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+path-type@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  dependencies:
+    pify "^3.0.0"
+
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
+repeat-element@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+
+repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+
+rimraf@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+  dependencies:
+    glob "^7.0.5"
+
+rmfr@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/rmfr/-/rmfr-2.0.0.tgz#8a42e81332550b3f0019b8fb8ab245bea81b6d1c"
+  dependencies:
+    assert-valid-glob-opts "^1.0.0"
+    glob "^7.1.2"
+    graceful-fs "^4.1.11"
+    inspect-with-kind "^1.0.4"
+    rimraf "^2.6.2"
+
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  dependencies:
+    ret "~0.1.10"
+
+set-value@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.1"
+    to-object-path "^0.3.0"
+
+set-value@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
+signal-exit@3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
+source-map-resolve@^0.5.0:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  dependencies:
+    atob "^2.1.1"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
+source-map-url@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+
+source-map@^0.5.6:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  dependencies:
+    extend-shallow "^3.0.0"
+
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
+supports-color@^5.2.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  dependencies:
+    has-flag "^3.0.0"
+
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  dependencies:
+    kind-of "^3.0.2"
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
+union-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^0.4.3"
+
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+
+validate-glob-opts@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/validate-glob-opts/-/validate-glob-opts-1.0.2.tgz#ef9f98977d965537ea4f51fa7d5799e9c6ebca91"
+  dependencies:
+    array-to-sentence "^1.1.0"
+    indexed-filter "^1.0.0"
+    inspect-with-kind "^1.0.4"
+    is-plain-obj "^1.1.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"

packages/now-go/.gitignore

@@ -1,3 +1,4 @@
 node_modules
 *.log
+launcher
 bin

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

@@ -1,14 +1,14 @@
-const path = require('path')
+const path = require('path');
 
-const fetch = require('node-fetch')
-const tar = require('tar')
+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'
+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()
+  const res = await fetch(url);
+  const dir = await getWritableDirectory();
 
   if (!res.ok) {
     throw new Error(`Failed to download: ${url}`);
@@ -19,6 +19,5 @@ module.exports = async () => {
       .on('error', reject)
       .pipe(tar.extract({ cwd: dir, strip: 1 }))
       .on('finish', () => resolve(path.join(dir, 'bin', 'go')));
-  })
-
-}
+  });
+};

packages/now-go/index.js

@@ -1,120 +1,136 @@
-const path = require("path")
-const { mkdirp, readFile, writeFile } = require('fs-extra')
+const path = require('path');
+const { mkdirp, readFile, writeFile } = require('fs-extra');
 
-const execa = require('execa')
+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 downloadGoBin = require("./download-go-bin")
+const downloadGit = require('lambda-git');
 const glob = require('@now/build-utils/fs/glob.js');
+const downloadGoBin = require('./download-go-bin');
 
-const goFilenames = new Set([
-  'go.mod',
-  'go.sum',
-  'Gopkg.lock',
-  'Gopkg.toml'
-]);
-
-// creates a `$GOPATH` direcotry tree, as per
+// 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'))
+  await mkdirp(path.join(goPath, 'bin'));
+  await mkdirp(path.join(goPath, 'pkg', 'linux_amd64'));
 }
 
-exports.build = async ({files, entrypoint, config}) => {
-  console.log('downloading files...')
+exports.config = {
+  maxLambdaSize: '10mb',
+};
 
-  const gitPath = await getWritableDirectory()
-  const goPath = await getWritableDirectory()
-  const srcPath = path.join(goPath, 'src', 'lambda')
-  const outDir = await getWritableDirectory()
+exports.build = async ({ files, entrypoint }) => {
+  console.log('downloading files...');
 
-  await createGoPathTree(goPath)
+  const gitPath = await getWritableDirectory();
+  const goPath = await getWritableDirectory();
+  const srcPath = path.join(goPath, 'src', 'lambda');
+  const outDir = await getWritableDirectory();
 
-  files = await download(files, srcPath)
+  await createGoPathTree(goPath);
 
-  console.log('downloading go binary...')
-  const goBin = await downloadGoBin()
+  const downloadedFiles = await download(files, srcPath);
 
-  console.log('downloading git binary...')
+  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})
+  await downloadGit({ targetDirectory: gitPath });
 
   const goEnv = {
     ...process.env,
     GOOS: 'linux',
     GOARCH: 'amd64',
-    GOPATH: goPath
-  }
+    GOPATH: goPath,
+  };
 
-  console.log(`parsing AST for \"${entrypoint}\"`)
-  let handlerFunctionName = ''
+  console.log(`parsing AST for "${entrypoint}"`);
+  let handlerFunctionName = '';
   try {
     handlerFunctionName = await execa.stdout(
       path.join(__dirname, 'bin', 'get-exported-function-name'),
-      [files[entrypoint].fsPath]
-    )
+      [downloadedFiles[entrypoint].fsPath],
+    );
   } catch (err) {
-    console.log(`failed to parse AST for \"${entrypoint}\"`)
-    throw err
+    console.log(`failed to parse AST for "${entrypoint}"`);
+    throw err;
   }
 
   if (handlerFunctionName === '') {
-    const e = new Error(`Could not find an exported function on "${entrypoint}"`)
-    console.log(e.message)
-    throw e
+    const e = new Error(
+      `Could not find an exported function on "${entrypoint}"`,
+    );
+    console.log(e.message);
+    throw e;
   }
 
-  console.log(`Found exported function "${handlerFunctionName}" on \"${entrypoint}\"`)
+  console.log(
+    `Found exported function "${handlerFunctionName}" on "${entrypoint}"`,
+  );
 
-  const origianlMainGoContents = await readFile(path.join(__dirname, 'main.go'), 'utf8')
-  const mainGoContents = origianlMainGoContents.replace('__NOW_HANDLER_FUNC_NAME', handlerFunctionName)
+  const origianlMainGoContents = await readFile(
+    path.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'
+  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(files[entrypoint].fsPath)
+  const entrypointDirname = path.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)
+  await writeFile(path.join(entrypointDirname, mainGoFileName), mainGoContents);
 
-
-  console.log('installing dependencies')
+  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
+    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...')
+  console.log('running go build...');
   try {
-    await execa(goBin, [
-      'build',
-      '-o', path.join(outDir, 'handler'),
-      path.join(entrypointDirname, mainGoFileName), files[entrypoint].fsPath
-    ], {env: goEnv, cwd: entrypointDirname, stdio: 'inherit'})
-  } catch (err) { 
-    console.log('failed to `go build`')
-    throw err
+    await execa(
+      goBin,
+      [
+        'build',
+        '-o',
+        path.join(outDir, 'handler'),
+        path.join(entrypointDirname, mainGoFileName),
+        downloadedFiles[entrypoint].fsPath,
+      ],
+      { env: goEnv, cwd: entrypointDirname, stdio: 'inherit' },
+    );
+  } catch (err) {
+    console.log('failed to `go build`');
+    throw err;
   }
-  
+
   const lambda = await createLambda({
     files: await glob('**', outDir),
     handler: 'handler',
     runtime: 'go1.x',
-    environment: {}
-  })
+    environment: {},
+  });
 
   return {
-    [entrypoint]: lambda
-  }
-}
+    [entrypoint]: lambda,
+  };
+};

packages/now-go/main.go

@@ -1,140 +1,10 @@
 package main
 
 import (
-	b64 "encoding/base64"
-	"encoding/json"
-	"fmt"
-	"github.com/aws/aws-lambda-go/events"
-	"github.com/aws/aws-lambda-go/lambda"
-	"io/ioutil"
-	"net"
+	now "../../utils/go/bridge"
 	"net/http"
-	"strings"
 )
 
-type Request struct {
-	Host     string            `json:"host"`
-	Path     string            `json:"path"`
-	Method   string            `json`
-	Headers  map[string]string `json:"headers"`
-	Encoding string            `json"encoding,omitempty"`
-	Body     string            `json:"body"`
-}
-
-type Response struct {
-	StatusCode int               `json:"statusCode"`
-	Headers    map[string]string `json:"headers"`
-	Encoding   string            `json:"encoding,omitemtpy"`
-	Body       string            `json:"body"`
-}
-
-type ResponseError struct {
-	Code    string `json:"code"`
-	Message string `json:"message"`
-}
-
-type ResponseErrorWrapper struct {
-	Error ResponseError `json:"error"`
-}
-
-func createErrorResponse(message string, code string, statusCode int) (Response, error) {
-	obj := ResponseErrorWrapper{
-		Error: ResponseError{
-			Code:    code,
-			Message: message,
-		},
-	}
-
-	body, _ := json.Marshal(obj)
-
-	return Response{
-		StatusCode: statusCode,
-		Headers: map[string]string{
-			"Content-Type": "application/json",
-		},
-		Body: string(body),
-	}, nil
-}
-
 func main() {
-	l, err := net.Listen("tcp", ":0")
-	if err != nil {
-		panic(err)
-	}
-
-	http.HandleFunc("/", __NOW_HANDLER_FUNC_NAME)
-	go http.Serve(l, nil)
-
-	handler := func(_req events.APIGatewayProxyRequest) (Response, error) {
-		var req Request
-
-		err := json.Unmarshal([]byte(_req.Body), &req)
-
-		if err != nil {
-			fmt.Println(err)
-			return createErrorResponse("Invalid payload", "bad_request", 400)
-		}
-
-		if req.Encoding == "base64" {
-			decoded, _ := b64.StdEncoding.DecodeString(req.Body)
-			req.Body = string(decoded)
-		}
-
-		url := "http://" + l.Addr().String() + req.Path
-
-		internalReq, err := http.NewRequest(req.Method, url, strings.NewReader(req.Body))
-		if err != nil {
-			fmt.Println(err)
-			return createErrorResponse("Bad gateway", "bad_gateway", 502)
-		}
-
-		for k, v := range req.Headers {
-			internalReq.Header.Add(k, v)
-			if strings.ToLower(k) == "host" {
-				req.Host = v
-			}
-		}
-
-		client := &http.Client{}
-		internalRes, err := client.Do(internalReq)
-		if err != nil {
-			fmt.Println(err)
-			return createErrorResponse("Bad gateway", "bad_gateway", 502)
-		}
-		defer internalRes.Body.Close()
-
-		resHeaders := make(map[string]string, len(internalRes.Header))
-		var resEncoding string
-		for k, v := range internalRes.Header {
-			// FIXME: support multiple values via concatenating with ','
-			// see RFC 7230, section 3.2.2
-			if strings.ToLower(k) == "x-now-response-encoding" {
-				// we don't want to send this header down
-				resEncoding = v[0]
-			} else {
-				resHeaders[k] = v[0]
-			}
-		}
-
-		bodyBytes, err := ioutil.ReadAll(internalRes.Body)
-		if err != nil {
-			return createErrorResponse("Bad gateway", "bad_gateway", 502)
-		}
-
-		var resBody string
-		if resEncoding == "base64" {
-			resBody = b64.StdEncoding.EncodeToString(bodyBytes)
-		} else {
-			resBody = string(bodyBytes)
-		}
-
-		return Response{
-			StatusCode: internalRes.StatusCode,
-			Headers:    resHeaders,
-			Encoding:   resEncoding,
-			Body:       resBody,
-		}, nil
-	}
-
-	lambda.Start(handler)
+	now.Start(http.HandlerFunc(__NOW_HANDLER_FUNC_NAME))
 }

packages/now-go/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/go",
-  "version": "0.2.7-canary.2",
+  "version": "0.2.11",
   "scripts": {
     "test": "best -I test/*.js",
     "prepublish": "./build.sh"
@@ -16,11 +16,14 @@
     "fs-extra": "^7.0.0",
     "lambda-git": "^0.1.2",
     "mkdirp-promise": "5.0.1",
-    "now-fetch": "0.1.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-html-minifier/index.js

@@ -2,32 +2,30 @@ const FileBlob = require('@now/build-utils/file-blob.js');
 const { minify } = require('html-minifier');
 
 const defaultOptions = {
-    minifyCSS: true,
-    minifyJS: true,
-    removeComments: true,
-    removeAttributeQuotes: true,
-    removeEmptyAttributes: true,
-    removeOptionalTags: true,
-    removeRedundantAttributes: true,
-    useShortDoctype: true,
-    collapseWhitespace: true,
-    collapseInlineTagWhitespace: true,
-    collapseBooleanAttributes: true,
-    caseSensitive: true
+  minifyCSS: true,
+  minifyJS: true,
+  removeComments: true,
+  removeAttributeQuotes: true,
+  removeEmptyAttributes: true,
+  removeOptionalTags: true,
+  removeRedundantAttributes: true,
+  useShortDoctype: true,
+  collapseWhitespace: true,
+  collapseInlineTagWhitespace: true,
+  collapseBooleanAttributes: true,
+  caseSensitive: true,
 };
 
-exports.analyze = ({ files, entrypoint }) => {
-  return files[entrypoint].digest;
-};
+exports.analyze = ({ files, entrypoint }) => files[entrypoint].digest;
 
 exports.build = async ({ files, entrypoint, config }) => {
-    const stream = files[entrypoint].toStream();
-    const options = Object.assign({}, defaultOptions, config || {});
-    const { data } = await FileBlob.fromStream({ stream });
-    const content = data.toString();
+  const stream = files[entrypoint].toStream();
+  const options = Object.assign({}, defaultOptions, config || {});
+  const { data } = await FileBlob.fromStream({ stream });
+  const content = data.toString();
 
-    const minified = minify(content, options);
-    const result = new FileBlob({ data: minified });
+  const minified = minify(content, options);
+  const result = new FileBlob({ data: minified });
 
-    return { [entrypoint]: result };
+  return { [entrypoint]: result };
 };

packages/now-html-minifier/package.json

@@ -1,7 +1,10 @@
 {
   "name": "@now/html-minifier",
-  "version": "1.0.3-canary.2",
+  "version": "1.0.6",
   "dependencies": {
     "html-minifier": "3.5.21"
+  },
+  "peerDependencies": {
+    "@now/build-utils": ">=0.0.1"
   }
 }

packages/now-lambda/.npmignore

@@ -0,0 +1 @@
+/test

packages/now-lambda/index.js

@@ -1,24 +1,12 @@
 const { Lambda } = require('@now/build-utils/lambda.js');
-const path = require('path');
+const streamToBuffer = require('@now/build-utils/fs/stream-to-buffer.js');
 
-exports.build = async ({ files, entrypoint }) => {
+exports.build = async ({ files, entrypoint, config }) => {
   if (!files[entrypoint]) throw new Error('Entrypoint not found in files');
-
-  // handler=launcher.main!runtime=nodejs8.10!name.zip
-  const config = path.basename(entrypoint).split('!').reduce((a, c) => {
-    const [ k, v ] = c.split('=');
-    if (v) a[k] = v;
-    return a;
-  }, {});
-
-  if (!config.handler) throw new Error('Handler not found in config');
-  if (!config.runtime) throw new Error('Runtime not found in config');
-
-  const lambda = new Lambda({
-    zipStream: files[entrypoint].toStream(), // TODO zipBuffer
-    handler: config.handler,
-    runtime: config.runtime
-  });
-
+  const { handler, runtime } = config;
+  if (!handler) throw new Error('Handler not found in config');
+  if (!runtime) throw new Error('Runtime not found in config');
+  const zipBuffer = await streamToBuffer(files[entrypoint].toStream());
+  const lambda = new Lambda({ zipBuffer, handler, runtime });
   return { [entrypoint]: lambda };
 };

packages/now-lambda/package.json

@@ -1,4 +1,10 @@
 {
   "name": "@now/lambda",
-  "version": "0.4.4-canary.2"
+  "version": "0.4.8",
+  "peerDependencies": {
+    "@now/build-utils": ">=0.0.1"
+  },
+  "scripts": {
+    "test": "jest"
+  }
 }

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

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

packages/now-lambda/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(2 * 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-md/.npmignore

@@ -0,0 +1 @@
+/test

packages/now-md/index.js

@@ -1,37 +1,42 @@
 const FileBlob = require('@now/build-utils/file-blob.js');
-const unified = require('unified')
-const unifiedStream = require('unified-stream')
-const markdown = require('remark-parse')
-const remark2rehype = require('remark-rehype')
-const doc = require('rehype-document')
-const format = require('rehype-format')
-const html = require('rehype-stringify')
+const unified = require('unified');
+const unifiedStream = require('unified-stream');
+const markdown = require('remark-parse');
+const remark2rehype = require('remark-rehype');
+const doc = require('rehype-document');
+const format = require('rehype-format');
+const html = require('rehype-stringify');
 
-exports.analyze = ({ files, entrypoint }) => {
-  return files[entrypoint].digest;
-};
+exports.analyze = ({ files, entrypoint }) => files[entrypoint].digest;
 
 exports.build = async ({ files, entrypoint, config }) => {
   const stream = files[entrypoint].toStream();
-  const options = config || {}
+  const options = config || {};
 
-  const title = options.title || null
-  const language = options.language || 'en'
-  const meta = options.meta || null
-  const css = options.css || null
+  const title = options.title || null;
+  const language = options.language || 'en';
+  const meta = options.meta || null;
+  const css = options.css || null;
 
   const processor = unified()
     .use(markdown)
     .use(remark2rehype)
-    .use(doc, { title, language, meta, css })
+    .use(doc, {
+      title,
+      language,
+      meta,
+      css,
+    })
     .use(format)
     .use(html);
 
-  const result = await FileBlob.fromStream({ stream: stream.pipe(unifiedStream(processor)) });
+  const result = await FileBlob.fromStream({
+    stream: stream.pipe(unifiedStream(processor)),
+  });
 
-  console.log(result.data.toString())
+  console.log(result.data.toString());
 
-  entrypoint = entrypoint.replace(/\.[^\.]+$/, '.html');
+  const replacedEntrypoint = entrypoint.replace(/\.[^.]+$/, '.html');
 
-  return { [entrypoint]: result };
+  return { [replacedEntrypoint]: result };
 };

packages/now-md/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/md",
-  "version": "0.4.4-canary.2",
+  "version": "0.4.8",
   "dependencies": {
     "rehype-document": "^2.2.0",
     "rehype-format": "^2.3.0",
@@ -9,5 +9,11 @@
     "remark-rehype": "^3.0.1",
     "unified": "^7.0.0",
     "unified-stream": "^1.0.2"
+  },
+  "peerDependencies": {
+    "@now/build-utils": ">=0.0.1"
+  },
+  "scripts": {
+    "test": "jest"
   }
 }

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

@@ -0,0 +1,5 @@
+# Testing Markdown
+
+cow:RANDOMNESS_PLACEHOLDER
+
+[Wow a link!](https://zeit.co)

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

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

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

@@ -0,0 +1,5 @@
+# Testing Markdown
+
+yoda:RANDOMNESS_PLACEHOLDER
+
+[Wow a link!](https://zeit.co)

packages/now-md/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(2 * 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-mdx-deck/.npmignore

@@ -0,0 +1 @@
+/test

packages/now-mdx-deck/index.js

@@ -6,52 +6,56 @@ const glob = require('@now/build-utils/fs/glob.js');
 const path = require('path');
 const { runNpmInstall } = require('@now/build-utils/fs/run-user-scripts.js');
 
-exports.analyze = ({ files, entrypoint }) => {
-  return files[entrypoint].digest;
-};
+exports.analyze = ({ files, entrypoint }) => files[entrypoint].digest;
 
 const writeFile = promisify(fs.writeFile);
 
 exports.build = async ({ files, entrypoint, workPath }) => {
   console.log('downloading user files...');
-  files = await download(files, workPath);
+  const downloadedFiles = await download(files, workPath);
   console.log('writing package.json...');
-  const packageJson = { dependencies: { 'mdx-deck': '1.7.7' } };
+  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...');
   process.env.PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = '1'; // TODO opts argument for runNpmInstall
-  await runNpmInstall(path.dirname(packageJsonPath), [ '--prod', '--prefer-offline' ]);
+  await runNpmInstall(path.dirname(packageJsonPath), [
+    '--prod',
+    '--prefer-offline',
+  ]);
   console.log('building...');
   const outDir = await getWritableDirectory();
-  const entrypointFsPath = files[entrypoint].fsPath;
+  const entrypointFsPath = downloadedFiles[entrypoint].fsPath;
   const mountpoint = path.dirname(entrypoint);
 
-  const build = require(path.join(workPath, 'node_modules/mdx-deck/lib/build.js'));
+  const build = require(path.join(
+    workPath,
+    'node_modules/mdx-deck/lib/build.js',
+  ));
 
   await build({
     html: true,
     dirname: workPath,
     outDir,
     globals: {
-      FILENAME: JSON.stringify(entrypointFsPath)
-    }
+      FILENAME: JSON.stringify(entrypointFsPath),
+    },
   });
 
-  return await glob('**', outDir, mountpoint);
+  return glob('**', outDir, mountpoint);
 };
 
 exports.prepareCache = async ({ cachePath }) => {
   console.log('writing package.json...');
-  const packageJson = { dependencies: { 'mdx-deck': '1.7.7' } };
+  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' ]);
+  await runNpmInstall(path.dirname(packageJsonPath), ['--prod']);
 
   return {
-    ...await glob('node_modules/**', cachePath),
-    ...await glob('package-lock.json', cachePath),
-    ...await glob('yarn.lock', cachePath)
+    ...(await glob('node_modules/**', cachePath)),
+    ...(await glob('package-lock.json', cachePath)),
+    ...(await glob('yarn.lock', cachePath)),
   };
 };

packages/now-mdx-deck/package.json

@@ -1,4 +1,10 @@
 {
   "name": "@now/mdx-deck",
-  "version": "0.4.13-canary.2"
+  "version": "0.4.17",
+  "peerDependencies": {
+    "@now/build-utils": ">=0.0.1"
+  },
+  "scripts": {
+    "test": "jest"
+  }
 }

packages/now-mdx-deck/test/fixtures/01-cowsay/index.mdx

@@ -0,0 +1,5 @@
+# Testing Markdown
+---
+cow:RANDOMNESS_PLACEHOLDER
+---
+[Wow a link!](https://zeit.co)

packages/now-mdx-deck/test/fixtures/01-cowsay/now.json

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

packages/now-mdx-deck/test/fixtures/01-cowsay/subdirectory/index.mdx

@@ -0,0 +1,5 @@
+# Testing Markdown
+---
+yoda:RANDOMNESS_PLACEHOLDER
+---
+[Wow a link!](https://zeit.co)

packages/now-mdx-deck/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(2 * 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-next/index.js

@@ -1,182 +1,259 @@
 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 path = require('path');
 const { readFile, writeFile, unlink } = require('fs.promised');
-const rename = require('@now/build-utils/fs/rename.js');
-const { runNpmInstall, runPackageJsonScript
+const {
+  runNpmInstall,
+  runPackageJsonScript,
 } = require('@now/build-utils/fs/run-user-scripts.js');
 const glob = require('@now/build-utils/fs/glob.js');
+const {
+  excludeFiles,
+  validateEntrypoint,
+  includeOnlyEntryDirectory,
+  moveEntryDirectoryToRoot,
+  excludeLockFiles,
+  normalizePackageJson,
+  excludeStaticDirectory,
+  onlyStaticDirectory,
+} = require('./utils');
 
-// Exclude certain files from the files object
-function excludeFiles(files, matchFn) {
-  return Object.keys(files).reduce((newFiles, fileName) => {
-    if(matchFn(fileName)) {
-      return newFiles
-    }
-    newFiles[fileName] = files[fileName]
-    return newFiles
-  }, {})
+/** @typedef { import('@now/build-utils/file-ref').Files } Files */
+/** @typedef { import('@now/build-utils/fs/download').DownloadedFiles } DownloadedFiles */
+
+/**
+ * @typedef {Object} BuildParamsType
+ * @property {Files} files - Files object
+ * @property {string} entrypoint - Entrypoint specified for the builder
+ * @property {string} workPath - Working directory for this build
+ */
+
+/**
+ * Read package.json from files
+ * @param {DownloadedFiles} files
+ */
+async function readPackageJson(files) {
+  if (!files['package.json']) {
+    return {};
+  }
+
+  const packageJsonPath = files['package.json'].fsPath;
+  return JSON.parse(await readFile(packageJsonPath, 'utf8'));
 }
 
+/**
+ * Write package.json
+ * @param {string} workPath
+ * @param {Object} packageJson
+ */
+async function writePackageJson(workPath, packageJson) {
+  await writeFile(
+    path.join(workPath, 'package.json'),
+    JSON.stringify(packageJson, null, 2),
+  );
+}
+
+/**
+ * Write .npmrc with npm auth token
+ * @param {string} workPath
+ * @param {string} token
+ */
+async function writeNpmRc(workPath, token) {
+  await writeFile(
+    path.join(workPath, '.npmrc'),
+    `//registry.npmjs.org/:_authToken=${token}`,
+  );
+}
+
+exports.config = {
+  maxLambdaSize: '5mb',
+};
+
+/**
+ * @param {BuildParamsType} buildParams
+ * @returns {Promise<Files>}
+ */
 exports.build = async ({ files, workPath, entrypoint }) => {
-  if(!/package\.json$/.exec(entrypoint) && !/next\.config\.js$/.exec(entrypoint)) {
-    throw new Error(`Specified "src" for "@now/next" has to be "package.json" or "next.config.js"`)
-  }
+  validateEntrypoint(entrypoint);
 
-  const entryDirectory = path.dirname(entrypoint)
   console.log('downloading user files...');
-  const filesToDownload = excludeFiles(files, (file) => {
-    // If the file is not in the entry directory
-    if(entryDirectory !== '.' && !file.startsWith(entryDirectory)) {
-      return true
-    }
+  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);
 
-    // Exclude static directory
-    if(file.startsWith(path.join(entryDirectory, 'static'))) {
-      return true
-    }
+  console.log('normalizing package.json');
+  const packageJson = normalizePackageJson(
+    await readPackageJson(downloadedFiles),
+  );
+  console.log('normalized package.json result: ', packageJson);
+  await writePackageJson(workPath, packageJson);
 
-    if(file === 'package-lock.json') {
-      return true
-    }
-
-    if(file === 'yarn.lock') {
-      return true
-    }
-
-    return false
-  })
-  files = await download(rename(filesToDownload, (file) => {
-    if(entryDirectory !== '.') {
-      return file.replace(new RegExp(`^${entryDirectory}/`), '')
-    }
-    return file
-  }), workPath);
-
-  let packageJson = {}
-  if (files['package.json']) {
-    console.log('found package.json, overwriting')
-    const packageJsonPath = files['package.json'].fsPath
-    packageJson = JSON.parse(await readFile(packageJsonPath, 'utf8'))
+  if (process.env.NPM_AUTH_TOKEN) {
+    console.log('found NPM_AUTH_TOKEN in environment, creating .npmrc');
+    await writeNpmRc(workPath, process.env.NPM_AUTH_TOKEN);
   }
 
-  packageJson = {
-    ...packageJson,
-    dependencies: {
-      ...packageJson.dependencies,
-      'next-server': 'canary'
-    },
-    devDependencies: {
-      ...packageJson.devDependencies,
-      'next': 'canary'
-    },
-    scripts: {
-      ...packageJson.scripts,
-      'now-build': 'next build'
-    }
-  }
-
-  if(!packageJson.dependencies.react) {
-    console.log('"react" not found in dependencies, adding to "package.json" "dependencies"')
-    packageJson.dependencies['react'] = 'latest'
-  }
-  if(!packageJson.dependencies['react-dom']) {
-    console.log('"react-dom" not found in dependencies, adding to "package.json" "dependencies"')
-    packageJson.dependencies['react-dom'] = 'latest'
-  }
-
-  // in case the user has `next` on their `dependencies`, we remove it
-  delete packageJson.dependencies.next
-
-  console.log('>>>>>>', JSON.stringify(packageJson))
-  await writeFile(path.join(workPath, 'package.json'), JSON.stringify(packageJson, null, 2))
-
-  if(process.env.NPM_AUTH_TOKEN) {
-    console.log('found NPM_AUTH_TOKEN in environement, creating .npmrc')
-    await writeFile(path.join(workPath, '.npmrc'), `//registry.npmjs.org/:_authToken=${process.env.NPM_AUTH_TOKEN}`)
-  }
-  files = await glob('**', workPath);
-
   console.log('running npm install...');
-  await runNpmInstall(workPath, [ '--prefer-offline' ]);
+  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'))
+  await runNpmInstall(workPath, ['--prefer-offline', '--production']);
+  if (process.env.NPM_AUTH_TOKEN) {
+    await unlink(path.join(workPath, '.npmrc'));
   }
-  files = await glob('**', workPath)
+
+  const filesAfterBuild = await glob('**', workPath);
 
   console.log('preparing lambda files...');
-  let buildId
+  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"`)
-    throw new Error('Missing BUILD_ID')
+    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"',
+    );
+    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 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__launcher.js': new FileFsRef({ fsPath: path.join(__dirname, 'launcher.js') }),
-    'now__bridge.js': new FileFsRef({ fsPath: require('@now/node-bridge') })
+    'now__bridge.js': new FileFsRef({ fsPath: require('@now/node-bridge') }),
   };
-  const nextFiles = {...nodeModules, ...dotNextRootFiles, ...dotNextServerRootFiles, ...launcherFiles}
-  if(files['next.config.js']) {
-    nextFiles['next.config.js'] = files['next.config.js']
+  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(workPath, '.next', 'server', 'static', buildId, 'pages'))
+  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 = {}
-  for(const page in pages) {
-    // These default pages don't have to be handled a rendering, they'd always 404
-    if(['_app.js', '_error.js', '_document.js'].includes(page)) {
-      continue
-    }
+  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;
+      }
 
-    const pageFiles = {
-      [`.next/server/static/${buildId}/pages/_document.js`]: files[`.next/server/static/${buildId}/pages/_document.js`],
-      [`.next/server/static/${buildId}/pages/_app.js`]: files[`.next/server/static/${buildId}/pages/_app.js`],
-      [`.next/server/static/${buildId}/pages/_error.js`]: files[`.next/server/static/${buildId}/pages/_error.js`],
-      [`.next/server/static/${buildId}/pages/${page}`]: files[`.next/server/static/${buildId}/pages/${page}`]
-    }
+      const pathname = page.replace(/\.js$/, '');
+      const launcher = launcherData.replace(
+        'PATHNAME_PLACEHOLDER',
+        `/${pathname.replace(/(^|\/)index$/, '')}`,
+      );
 
-    lambdas[path.join(entryDirectory, page.replace(/\.js$/, ''))] = await createLambda({
-      files: {...nextFiles, ...pageFiles},
-      handler: 'now__launcher.launcher',
-      runtime: 'nodejs8.10'
-    })
-  }
+      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}`
+        ],
+      };
 
-  const nextStaticFiles = await glob('**', path.join(workPath, '.next', 'static'))
-  const staticFiles = {}
-  for(const staticFile in nextStaticFiles) {
-    staticFiles[path.join(entryDirectory, '_next/static/' + staticFile)] = nextStaticFiles[staticFile]
-  }
+      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}"`);
+    }),
+  );
 
-  return { ...lambdas, ...staticFiles };
+  const nextStaticFiles = await glob(
+    '**',
+    path.join(workPath, '.next', 'static'),
+  );
+  const staticFiles = Object.keys(nextStaticFiles).reduce(
+    (mappedFiles, file) => ({
+      ...mappedFiles,
+      [path.join(entryDirectory, `_next/static/${file}`)]: nextStaticFiles[file],
+    }),
+    {},
+  );
+
+  const nextStaticDirectory = onlyStaticDirectory(filesWithoutLockfiles);
+  const staticDirectoryFiles = Object.keys(nextStaticDirectory).reduce(
+    (mappedFiles, file) => ({
+      ...mappedFiles,
+      [path.join(entryDirectory, file)]: nextStaticDirectory[file],
+    }),
+    {},
+  );
+
+  return { ...lambdas, ...staticFiles, ...staticDirectoryFiles };
 };
 
-exports.prepareCache = async ({ files, cachePath, workPath }) => {
+exports.prepareCache = async ({
+  files, entrypoint, cachePath, workPath,
+}) => {
   console.log('downloading user files...');
-  await download(files, cachePath);
-  await download(await glob('.next/**', workPath), cachePath)
-  await download(await glob('node_modules/**', workPath), cachePath)
+  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);
 
-  console.log('.next folder contents', await glob('.next/**', cachePath))
-  console.log('.cache folder contents', await glob('node_modules/.cache/**', cachePath))
+  console.log('.next folder contents', await glob('.next/**', cachePath));
+  console.log(
+    '.cache folder contents',
+    await glob('node_modules/.cache/**', cachePath),
+  );
 
   console.log('running npm install...');
   await runNpmInstall(cachePath);
 
-
   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('.next/records.json', cachePath)),
+    ...(await glob('.next/server/records.json', cachePath)),
+    ...(await glob('node_modules/**', cachePath)),
+    ...(await glob('yarn.lock', cachePath)),
   };
 };

packages/now-next/launcher.js

@@ -1,15 +1,19 @@
-const { Bridge } = require('./now__bridge.js');
 const { Server } = require('http');
-const next = require('next-server')
+const next = require('next-server');
+const url = require('url');
+const { Bridge } = require('./now__bridge.js');
+
 const bridge = new Bridge();
 bridge.port = 3000;
 
 process.env.NODE_ENV = 'production';
 
-const app = next({})
-const handler = app.getRequestHandler()
+const app = next({});
 
-const server = new Server(handler);
+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);
 
 exports.launcher = bridge.launcher;

packages/now-next/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@now/next",
-  "version": "0.0.74-canary.2",
+  "version": "0.0.81",
   "dependencies": {
     "@now/node-bridge": "0.1.4",
     "execa": "^1.0.0",
     "fs.promised": "^3.0.0"
+  },
+  "peerDependencies": {
+    "@now/build-utils": ">=0.0.1"
   }
 }

packages/now-next/utils.js

@@ -0,0 +1,181 @@
+const rename = require('@now/build-utils/fs/rename.js');
+
+/** @typedef { import('@now/build-utils/file-ref') } FileRef */
+/** @typedef { import('@now/build-utils/file-fs-ref') } FileFsRef */
+/** @typedef {{[filePath: string]: FileRef|FileFsRef}} Files */
+
+/**
+ * Validate if the entrypoint is allowed to be used
+ * @param {string} entrypoint
+ * @throws {Error}
+ */
+function validateEntrypoint(entrypoint) {
+  if (
+    !/package\.json$/.exec(entrypoint)
+    && !/next\.config\.js$/.exec(entrypoint)
+  ) {
+    throw new Error(
+      'Specified "src" for "@now/next" has to be "package.json" or "next.config.js"',
+    );
+  }
+}
+
+/**
+ * This callback type is called `requestCallback` and is displayed as a global symbol.
+ *
+ * @callback matcher
+ * @param {string} filePath
+ * @returns {boolean}
+ */
+
+/**
+ * Exclude certain files from the files object
+ * @param {Files} files
+ * @param {matcher} matcher
+ * @returns {Files}
+ */
+function excludeFiles(files, matcher) {
+  return Object.keys(files).reduce((newFiles, filePath) => {
+    if (matcher(filePath)) {
+      return newFiles;
+    }
+    return {
+      ...newFiles,
+      [filePath]: files[filePath],
+    };
+  }, {});
+}
+
+/**
+ * Creates a new Files object holding only the entrypoint files
+ * @param {Files} files
+ * @param {string} entryDirectory
+ * @returns {Files}
+ */
+function includeOnlyEntryDirectory(files, entryDirectory) {
+  if (entryDirectory === '.') {
+    return files;
+  }
+
+  function matcher(filePath) {
+    return !filePath.startsWith(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
+ * @returns {Files}
+ */
+function excludeLockFiles(files) {
+  const newFiles = files;
+  if (newFiles['package-lock.json']) {
+    delete newFiles['package-lock.json'];
+  }
+  if (newFiles['yarn.lock']) {
+    delete newFiles['yarn.lock'];
+  }
+  return files;
+}
+
+/**
+ * Exclude the static directory from files
+ * @param {Files} files
+ * @returns {Files}
+ */
+function excludeStaticDirectory(files) {
+  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 excludeFiles(files, matcher);
+}
+
+/**
+ * Enforce specific package.json configuration for smallest possible lambda
+ * @param {{dependencies?: any, devDependencies?: any, scripts?: any}} defaultPackageJson
+ */
+function normalizePackageJson(defaultPackageJson = {}) {
+  const dependencies = {};
+  const devDependencies = {
+    ...defaultPackageJson.dependencies,
+    ...defaultPackageJson.devDependencies,
+  };
+
+  if (devDependencies.react) {
+    dependencies.react = devDependencies.react;
+    delete devDependencies.react;
+  }
+
+  if (devDependencies['react-dom']) {
+    dependencies['react-dom'] = devDependencies['react-dom'];
+    delete devDependencies['react-dom'];
+  }
+
+  return {
+    ...defaultPackageJson,
+    dependencies: {
+      // react and react-dom can be overwritten
+      react: 'latest',
+      'react-dom': 'latest',
+      ...dependencies, // override react if user provided it
+      // next-server is forced to canary
+      'next-server': 'canary',
+    },
+    devDependencies: {
+      ...devDependencies,
+      // next is forced to canary
+      next: 'canary',
+      // next-server is a dependency here
+      'next-server': undefined,
+    },
+    scripts: {
+      ...defaultPackageJson.scripts,
+      'now-build': 'next build --lambdas',
+    },
+  };
+}
+
+module.exports = {
+  excludeFiles,
+  validateEntrypoint,
+  includeOnlyEntryDirectory,
+  moveEntryDirectoryToRoot,
+  excludeLockFiles,
+  normalizePackageJson,
+  excludeStaticDirectory,
+  onlyStaticDirectory,
+};

packages/now-node-bridge/bridge.js

@@ -1,12 +1,52 @@
-const assert = require('assert');
 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 () {
+  constructor() {
     this.launcher = this.launcher.bind(this);
   }
 
-  launcher (event) {
+  launcher(event) {
+    // eslint-disable-next-line consistent-return
     return new Promise((resolve, reject) => {
       if (this.userError) {
         console.error('Error while initializing entrypoint:', this.userError);
@@ -17,45 +57,32 @@ class Bridge {
         return resolve({ statusCode: 504, body: '' });
       }
 
-      let method, path, headers, body;
-
-      if (event.Action === 'Invoke') {
-        event = JSON.parse(event.body);
-        method = event.method;
-        path = event.path;
-        headers = event.headers;
-        if (event.body) {
-          assert(event.encoding === 'base64', JSON.stringify(event)); // do we support anything else?
-          body = Buffer.from(event.body, event.encoding);
-        }
-      } else {
-        method = event.httpMethod;
-        path = event.path;
-        headers = event.headers;
-        body = event.body;
-      }
+      const {
+        method, path, headers, body,
+      } = normalizeEvent(event);
 
       const opts = {
         hostname: '127.0.0.1',
         port: this.port,
         path,
         method,
-        headers
+        headers,
       };
 
-      const req = http.request(opts, (resp) => {
+      const req = http.request(opts, (res) => {
+        const response = res;
         const respBodyChunks = [];
-        resp.on('data', (chunk) => respBodyChunks.push(Buffer.from(chunk)));
-        resp.on('error', (error) => reject(error));
-        resp.on('end', () => {
-          delete resp.headers.connection;
-          delete resp.headers['content-length'];
+        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: resp.statusCode,
-            headers: resp.headers,
+            statusCode: response.statusCode,
+            headers: response.headers,
             body: Buffer.concat(respBodyChunks).toString('base64'),
-            encoding: 'base64'
+            encoding: 'base64',
           });
         });
       });
@@ -67,5 +94,5 @@ class Bridge {
 }
 
 module.exports = {
-  Bridge
+  Bridge,
 };

packages/now-node-bridge/index.js

@@ -1,2 +1,3 @@
 const path = require('path');
+
 module.exports = path.join(__dirname, 'bridge.js');

packages/now-node-bridge/package.json

@@ -1,4 +1,7 @@
 {
   "name": "@now/node-bridge",
-  "version": "0.1.6-canary.2"
+  "version": "0.1.9",
+  "peerDependencies": {
+    "@now/build-utils": ">=0.0.1"
+  }
 }

packages/now-node-server/.npmignore

@@ -0,0 +1 @@
+/test

packages/now-node-server/index.js

@@ -2,133 +2,156 @@ 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 fs = require('fs');
+const fs = require('fs-extra');
 const glob = require('@now/build-utils/fs/glob.js');
 const path = require('path');
-const { promisify } = require('util');
-const { runNpmInstall, runPackageJsonScript
-  } = require('@now/build-utils/fs/run-user-scripts.js');
+const rename = require('@now/build-utils/fs/rename.js');
+const {
+  runNpmInstall,
+  runPackageJsonScript,
+} = require('@now/build-utils/fs/run-user-scripts.js');
 
-const fsp = {
-  readFile: promisify(fs.readFile)
-};
+/** @typedef { import('@now/build-utils/file-ref') } FileRef */
+/** @typedef {{[filePath: string]: FileRef}} Files */
 
-async function commonForTwo ({ files, entrypoint, workPath, cachePath }) {
-  const xPath = workPath || cachePath;
-  const preferOfflineArgument = workPath ? [ '--prefer-offline' ] : [];
+/**
+ * @typedef {Object} BuildParamsType
+ * @property {Files} files - Files object
+ * @property {string} entrypoint - Entrypoint specified for the builder
+ * @property {Object} config - User-passed config from now.json
+ * @property {string} workPath - Working directory for this build
+ */
 
-  const xUserPath = path.join(xPath, 'user');
-  const xRollupPath = path.join(xPath, 'rollup');
+/**
+ * @param {BuildParamsType} buildParams
+ * @param {Object} [options]
+ * @param {string[]} [options.npmArguments]
+ */
+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 filesOnDisk = await download(files, xUserPath);
+  const downloadedFiles = await download(files, userPath);
 
   console.log('running npm install for user...');
-  const entrypointFsDirname = path.join(xUserPath, path.dirname(entrypoint));
-  await runNpmInstall(entrypointFsDirname, preferOfflineArgument);
+  const entrypointFsDirname = path.join(userPath, path.dirname(entrypoint));
+  await runNpmInstall(entrypointFsDirname, npmArguments);
 
-  console.log('writing rollup package.json...');
-  await download({
-    'package.json': new FileBlob({
-      data: JSON.stringify({
-        dependencies: {
-          'builtins': '2.0.0',
-          'rollup': '0.67.0',
-          'rollup-plugin-commonjs': '9.2.0',
-          'rollup-plugin-json': '3.1.0',
-          'rollup-plugin-node-resolve': '3.4.0',
-          'rollup-plugin-terser': '3.0.0'
-        }
-      })
-    })
-  }, xRollupPath);
+  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 rollup...');
-  await runNpmInstall(xRollupPath, preferOfflineArgument);
-  return [ filesOnDisk, xRollupPath, entrypointFsDirname ];
+  console.log('running npm install for ncc...');
+  await runNpmInstall(nccPath, npmArguments);
+  return [downloadedFiles, userPath, nccPath, entrypointFsDirname];
 }
 
-exports.build = async ({ files, entrypoint, workPath }) => {
-  const [ filesOnDisk, workRollupPath, entrypointFsDirname ] =
-    await commonForTwo({ files, entrypoint, workPath });
+async function compile(workNccPath, downloadedFiles, entrypoint) {
+  const input = downloadedFiles[entrypoint].fsPath;
+  const ncc = require(path.join(workNccPath, 'node_modules/@zeit/ncc'));
+  const { code, assets } = await ncc(input);
+
+  const preparedFiles = {};
+  const blob = new FileBlob({ data: code });
+  // move all user code to 'user' subdirectory
+  preparedFiles[path.join('user', entrypoint)] = blob;
+  // eslint-disable-next-line no-restricted-syntax
+  for (const assetName of Object.keys(assets)) {
+    const blob2 = new FileBlob({ data: assets[assetName] });
+    preparedFiles[
+      path.join('user', path.dirname(entrypoint), assetName)
+    ] = blob2;
+  }
+
+  return preparedFiles;
+}
+
+exports.config = {
+  maxLambdaSize: '15mb',
+};
+
+/**
+ * @param {BuildParamsType} buildParams
+ * @returns {Promise<Files>}
+ */
+exports.build = async ({
+  files, entrypoint, config, workPath,
+}) => {
+  const [
+    downloadedFiles,
+    workUserPath,
+    workNccPath,
+    entrypointFsDirname,
+  ] = await downloadInstallAndBundle(
+    { files, entrypoint, workPath },
+    { npmArguments: ['--prefer-offline'] },
+  );
 
   console.log('running user script...');
   await runPackageJsonScript(entrypointFsDirname, 'now-build');
 
-  console.log('compiling entrypoint with rollup...');
-  const data = await compile(workRollupPath, filesOnDisk[entrypoint].fsPath);
-  const blob = new FileBlob({ data });
-
   console.log('preparing lambda files...');
-  // move all user code to 'user' subdirectory
-  const compiledFiles = { [path.join('user', entrypoint)]: blob };
-  const launcherPath = path.join(__dirname, 'launcher.js');
-  let launcherData = await fsp.readFile(launcherPath, 'utf8');
+  let preparedFiles;
 
-  launcherData = launcherData.replace('// PLACEHOLDER', [
-    'process.chdir("./user");',
-    `require("./${path.join('user', entrypoint)}");`
-  ].join(' '));
+  if (config && config.bundle === false) {
+    // move all user code to 'user' subdirectory
+    preparedFiles = await glob('**', workUserPath);
+    preparedFiles = rename(preparedFiles, name => path.join('user', name));
+  } else {
+    console.log('compiling entrypoint with ncc...');
+    preparedFiles = await compile(workNccPath, downloadedFiles, entrypoint);
+  }
+
+  const launcherPath = path.join(__dirname, 'launcher.js');
+  let launcherData = await fs.readFile(launcherPath, 'utf8');
+  launcherData = launcherData.replace(
+    '// PLACEHOLDER',
+    [
+      'process.chdir("./user");',
+      `require("./${path.join('user', entrypoint)}");`,
+    ].join(' '),
+  );
 
   const launcherFiles = {
     'launcher.js': new FileBlob({ data: launcherData }),
-    'bridge.js': new FileFsRef({ fsPath: require('@now/node-bridge') })
+    'bridge.js': new FileFsRef({ fsPath: require('@now/node-bridge') }),
   };
 
   const lambda = await createLambda({
-    files: { ...compiledFiles, ...launcherFiles },
+    files: { ...preparedFiles, ...launcherFiles },
     handler: 'launcher.launcher',
-    runtime: 'nodejs8.10'
+    runtime: 'nodejs8.10',
   });
 
   return { [entrypoint]: lambda };
 };
 
-exports.prepareCache = async ({ files, entrypoint, cachePath }) => {
-  await commonForTwo({ files, entrypoint, cachePath });
+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('rollup/node_modules/**', cachePath),
-    ...await glob('rollup/package-lock.json', cachePath),
-    ...await glob('rollup/yarn.lock', cachePath)
+    ...(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)),
   };
 };
-
-async function compile (workRollupPath, input) {
-  const rollup = require(path.join(workRollupPath, 'node_modules/rollup'));
-  const nodeResolve = require(path.join(workRollupPath, 'node_modules/rollup-plugin-node-resolve'));
-  const commonjs = require(path.join(workRollupPath, 'node_modules/rollup-plugin-commonjs'));
-  const json = require(path.join(workRollupPath, 'node_modules/rollup-plugin-json'));
-  const { terser } = require(path.join(workRollupPath, 'node_modules/rollup-plugin-terser'));
-  const builtins = require(path.join(workRollupPath, 'node_modules/builtins'))();
-
-  const bundle = await rollup.rollup({
-    input,
-    plugins: [
-      nodeResolve({
-        module: false,
-        jsnext: false,
-        browser: false,
-        preferBuiltins: true
-      }),
-      json(),
-      commonjs(),
-      terser()
-    ],
-    onwarn: function (error) {
-      if (/external dependency/.test(error.message)) {
-        const mod = error.message.split('\'')[1];
-        // ignore rollup warnings about known node.js modules
-        if (builtins.indexOf(mod) > -1) return;
-      }
-      console.error(error.message);
-    }
-  });
-
-  return (await bundle.generate({
-    format: 'cjs'
-  })).code;
-}

packages/now-node-server/launcher.js

@@ -1,10 +1,11 @@
-const { Bridge } = require('./bridge.js');
 const { Server } = require('http');
+const { Bridge } = require('./bridge.js');
+
 const bridge = new Bridge();
 
 const saveListen = Server.prototype.listen;
-Server.prototype.listen = function (...args) {
-  this.on('listening', function () {
+Server.prototype.listen = function listen(...args) {
+  this.on('listening', function listening() {
     bridge.port = this.address().port;
   });
   saveListen.apply(this, args);

packages/now-node-server/package.json

@@ -1,7 +1,14 @@
 {
   "name": "@now/node-server",
-  "version": "0.4.21-canary.2",
+  "version": "0.4.25",
   "dependencies": {
-    "@now/node-bridge": "^0.1.6-canary.2"
+    "@now/node-bridge": "^0.1.9",
+    "fs-extra": "7.0.1"
+  },
+  "peerDependencies": {
+    "@now/build-utils": ">=0.0.1"
+  },
+  "scripts": {
+    "test": "jest"
   }
 }

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

@@ -0,0 +1,11 @@
+const cowsay = require('cowsay/build/cowsay.umd.js').say;
+const http = require('http');
+
+// test that process.env is not replaced by webpack
+process.env.NODE_ENV = 'development';
+
+const server = http.createServer((req, resp) => {
+  resp.end(cowsay({ text: 'cow:RANDOMNESS_PLACEHOLDER' }));
+});
+
+server.listen();

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

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

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

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

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

@@ -0,0 +1,11 @@
+const yodasay = require('yodasay/build/yodasay.umd.js').say;
+const http = require('http');
+
+// test that process.env is not replaced by webpack
+process.env.NODE_ENV = 'development';
+
+const server = http.createServer((req, resp) => {
+  resp.end(yodasay({ text: 'yoda:RANDOMNESS_PLACEHOLDER' }));
+});
+
+server.listen();

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

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

packages/now-node-server/test/fixtures/03-env-vars/build-env/index.js

@@ -0,0 +1,10 @@
+const assert = require('assert');
+const http = require('http');
+
+const server = http.createServer((req, resp) => {
+  assert(!process.env.RANDOMNESS_BUILD_ENV_VAR);
+  assert(process.env.RANDOMNESS_ENV_VAR);
+  resp.end('BUILD_TIME_PLACEHOLDER:build-env');
+});
+
+server.listen();

packages/now-node-server/test/fixtures/03-env-vars/build-env/now-build.js

@@ -0,0 +1,12 @@
+const assert = require('assert');
+const fs = require('fs');
+
+assert(process.env.RANDOMNESS_BUILD_ENV_VAR);
+assert(!process.env.RANDOMNESS_ENV_VAR);
+
+fs.writeFileSync(
+  'index.js',
+  fs
+    .readFileSync('index.js', 'utf8')
+    .replace('BUILD_TIME_PLACEHOLDER', process.env.RANDOMNESS_BUILD_ENV_VAR),
+);

packages/now-node-server/test/fixtures/03-env-vars/build-env/package.json

@@ -0,0 +1,5 @@
+{
+  "scripts": {
+    "now-build": "node now-build.js"
+  }
+}

packages/now-node-server/test/fixtures/03-env-vars/env/index.js

@@ -0,0 +1,10 @@
+const assert = require('assert');
+const http = require('http');
+
+const server = http.createServer((req, resp) => {
+  assert(!process.env.RANDOMNESS_BUILD_ENV_VAR);
+  assert(process.env.RANDOMNESS_ENV_VAR);
+  resp.end(`${process.env.RANDOMNESS_ENV_VAR}:env`);
+});
+
+server.listen();

packages/now-node-server/test/fixtures/03-env-vars/now.json

@@ -0,0 +1,11 @@
+{
+  "version": 2,
+  "builds": [
+    { "src": "build-env/index.js", "use": "@now/node-server" },
+    { "src": "env/index.js", "use": "@now/node-server" }
+  ],
+  "probes": [
+    { "path": "/build-env", "mustContain": "RANDOMNESS_PLACEHOLDER:build-env" },
+    { "path": "/env", "mustContain": "RANDOMNESS_PLACEHOLDER:env" }
+  ]
+}

packages/now-node-server/test/fixtures/08-assets/index.js

@@ -0,0 +1,15 @@
+const fs = require('fs');
+const http = require('http');
+const path = require('path');
+
+const server = http.createServer((req, resp) => {
+  const asset1 = fs.readFileSync(
+    path.join(__dirname, 'subdirectory1/asset.txt'),
+  );
+  const asset2 = fs.readFileSync(
+    path.join(__dirname, 'subdirectory2/asset.txt'),
+  );
+  resp.end(`${asset1},${asset2}`);
+});
+
+server.listen();

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

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

packages/now-node-server/test/fixtures/08-assets/subdirectory1/asset.txt

@@ -0,0 +1 @@
+asset1:RANDOMNESS_PLACEHOLDER

packages/now-node-server/test/fixtures/08-assets/subdirectory2/asset.txt

@@ -0,0 +1 @@
+asset2:RANDOMNESS_PLACEHOLDER

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

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

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

@@ -0,0 +1,8 @@
+const http = require('http');
+const isBundled = require('./is-bundled.js');
+
+const server = http.createServer((req, resp) => {
+  resp.end(isBundled() ? 'RANDOMNESS_PLACEHOLDER' : '');
+});
+
+server.listen();

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

@@ -0,0 +1,3 @@
+const path = require('path');
+
+module.exports = () => path.basename(__filename) === 'index.js';

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

@@ -0,0 +1,8 @@
+const http = require('http');
+const isBundled = require('./is-bundled.js');
+
+const server = http.createServer((req, resp) => {
+  resp.end(isBundled() ? '' : 'RANDOMNESS_PLACEHOLDER');
+});
+
+server.listen();