Publish

- @now/python@0.0.41-canary.2

.circleci/config.yml

@@ -4,6 +4,8 @@ jobs:
     docker:
       - image: circleci/node:10
     working_directory: ~/repo
+    environment:
+      GOPATH: $HOME/go
     steps:
       - checkout
       - run:
@@ -24,51 +26,17 @@ jobs:
       - run:
           name: Tests
           command: yarn test
-  # 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
-  #     - run:
-  #         name: Publishing to Canary Channel
-  #         command: yarn run lerna publish from-git --npm-tag canary --yes
-  publish-stable:
-    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: Potentially save npm token
+          command: "([[ ! -z $NPM_TOKEN ]] && echo \"//registry.npmjs.org/:_authToken=$NPM_TOKEN\" >> ~/.npmrc) || echo \"Did not write npm token\""
       - run:
-          name: Publishing to Stable Channel
-          command: yarn run lerna publish from-git --yes
+          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-stable:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /^.*(\d+\.)(\d+\.)(\*|\d+)$/
-      # - publish-canary:
-      #     requires:
-      #       - build
-      #     filters:
-      #       tags:
-      #         only: /^.*canary.*($|\b)/
+      - build

.eslintignore

@@ -1,3 +1,4 @@
 /tmp/*
 /node_modules/*
 /**/node_modules/*
+/packages/now-go/go/*

.eslintrc

@@ -1,10 +1,24 @@
 {
-  "extends": ["airbnb-base", "prettier"],
+  "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,2 +1,4 @@
 node_modules
 tmp
+target/
+.next

README.md

@@ -2,7 +2,7 @@
 
 This is the full list of official Builders provided by the ZEIT team.
 
-More details here: http://zeit.co/docs
+More details here: https://zeit.co/docs/v2/deployments/builders/overview/
 
 ### Publishing to npm
 
@@ -19,3 +19,9 @@ 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!

errors/now-next-legacy-mode.md

@@ -0,0 +1,73 @@
+# `@now/next` Legacy Mode
+
+#### Why This Warning Occurred
+
+`@now/next` has two modes: `legacy` and `serverless`. You will always want to use the `serverless` mode. `legacy` is to provide backwards compatibility with previous `@now/next` versions.
+
+The differences:
+
+Legacy:
+
+- Minimal lambda size of `2.2Mb` (approximately)
+- Forces `next@v7.0.2-canary.49` and `next-server@v7.0.2-canary.49`
+- Forces all `dependencies` to be `devDependencies`
+- Loads `next.config.js` on bootup, breaking sometimes when users didn't use `phases` to load files
+- Used `next-server` which is the full Next.js server with routing etc.
+- Runs `npm install`
+- Runs `npm run now-build`
+- Runs `npm install --production` after build
+
+Serverless:
+
+- Minimal lambda size of `49Kb` (approximately)
+- Uses Next.js build targets (`target: 'serverless'`) in `next.config.js`. [documentation](https://github.com/zeit/next.js#summary)
+- Does not make changes to your application dependencies
+- Does not load `next.config.js` ([as per the serverless target documentation](https://github.com/zeit/next.js#summary))
+- Runs `npm install`
+- Runs `npm run now-build`
+- Does not run `npm install --production` as the output from the build is all that's needed to bundle lambdas.
+- No runtime dependencies, meaning smaller lambda functions
+- Optimized for fast [cold start](https://zeit.co/blog/serverless-ssr#cold-start)
+
+
+#### Possible Ways to Fix It
+
+In order to create the smallest possible lambdas Next.js has to be configured to build for the `serverless` target.
+
+1. Serverless Next.js requires Next.js 8 or later, to upgrade you can install the `latest` version: 
+
+```
+npm install next --save
+```
+
+2. Add the `now-build` script to your `package.json`
+
+```json
+{
+  "scripts": {
+    "now-build": "next build"
+  },
+}
+```
+
+3. Add `target: 'serverless'` to `next.config.js`
+
+```js
+module.exports = {
+  target: 'serverless'
+  // Other options are still valid
+}
+```
+
+4. Optionally make sure the `"src"` in `"builds"` points to your application `package.json`
+
+```js
+{
+  "version": 2,
+  "builds": [{ "src": "package.json", "use": "@now/next" }]
+}
+```
+
+### Useful Links
+
+- [Serverless target implementation](https://github.com/zeit/now-builders/pull/150) 

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

@@ -0,0 +1,43 @@
+# `@now/next` No Serverless Pages Built
+
+#### Why This Error Occurred
+
+This error occurs when you have your application is not configured for Serverless Next.js build output.
+
+#### Possible Ways to Fix It
+
+In order to create the smallest possible lambdas Next.js has to be configured to build for the `serverless` target.
+
+1. Serverless Next.js requires Next.js 8 or later, to upgrade you can install the `latest` version:
+
+```
+npm install next --save
+```
+
+2. Add the `now-build` script to your `package.json`
+
+```json
+{
+  "scripts": {
+    "now-build": "next build"
+  },
+}
+```
+
+3. Add `target: 'serverless'` to `next.config.js`
+
+```js
+module.exports = {
+  target: 'serverless'
+  // Other options are still valid
+}
+```
+
+4. Optionally make sure the `"src"` in `"builds"` points to your application `package.json`
+
+```js
+{
+  "version": 2,
+  "builds": [{ "src": "package.json", "use": "@now/next" }]
+}
+```

jest.config.js

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

package.json

@@ -1,5 +1,6 @@
 {
   "name": "now-builders",
+  "version": "0.0.0",
   "private": true,
   "license": "MIT",
   "dependencies": {
@@ -13,26 +14,36 @@
     "bootstrap": "lerna bootstrap",
     "publish-stable": "lerna version",
     "publish-canary": "lerna version prerelease --preid canary",
-    "lint": "eslint .",
-    "test": "jest",
+    "lint": "tsc && eslint .",
+    "test": "jest --runInBand --verbose",
     "lint-staged": "lint-staged"
   },
   "pre-commit": "lint-staged",
   "lint-staged": {
     "*.js": [
-      "eslint",
       "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",
+    "async-retry": "1.2.3",
+    "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"
+    "prettier": "^1.15.2",
+    "typescript": "^3.1.6"
   }
 }

packages/now-bash/.editorconfig

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

packages/now-bash/.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,40 @@
+#!/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 `handler` function
+if ! declare -f handler > /dev/null; then
+	echo "ERROR: A \`handler\` function must be defined in \"$ENTRYPOINT\"!" >&2
+	exit 1
+fi

packages/now-bash/index.js

@@ -0,0 +1,56 @@
+const execa = require('execa');
+const { join } = require('path');
+const snakeCase = require('snake-case');
+const glob = require('@now/build-utils/fs/glob'); // eslint-disable-line import/no-extraneous-dependencies
+const download = require('@now/build-utils/fs/download'); // eslint-disable-line import/no-extraneous-dependencies
+const { createLambda } = require('@now/build-utils/lambda'); // eslint-disable-line import/no-extraneous-dependencies
+const getWritableDirectory = require('@now/build-utils/fs/get-writable-directory'); // eslint-disable-line import/no-extraneous-dependencies
+
+exports.config = {
+  maxLambdaSize: '10mb',
+};
+
+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,
+    stdio: 'inherit',
+  });
+
+  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,24 @@
+{
+  "name": "@now/bash",
+  "version": "0.1.2",
+  "description": "Now 2.0 builder for HTTP endpoints written in Bash",
+  "main": "index.js",
+  "author": "Nathan Rajlich <nate@zeit.co>",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zeit/now-builders.git",
+    "directory": "packages/now-bash"
+  },
+  "files": [
+    "builder.sh",
+    "runtime.sh",
+    "bootstrap",
+    "index.js",
+    "package.json"
+  ],
+  "dependencies": {
+    "execa": "^1.0.0",
+    "snake-case": "^2.1.0"
+  }
+}

packages/now-bash/runtime.sh

@@ -0,0 +1,111 @@
+import "static-binaries@1.0.0"
+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 --raw-output --monochrome-output '.body' > "$event"
+
+	local request_id
+	request_id="$(grep -Fi Lambda-Runtime-Aws-Request-Id "$headers" | tr -d '[:space:]' | cut -d: -f2)"
+	rm -f "$headers"
+
+	# Execute the handler function from the script
+	local body
+	body="$(mktemp)"
+
+	local exit_code=0
+	REQUEST="$event"
+
+	# Stdin of the `handler` function is the HTTP request body.
+	# Need to use a fifo here instead of bash <() because Lambda
+	# errors with "/dev/fd/63 not found" for some reason :/
+	local stdin
+	stdin="$(mktemp -u)"
+	mkfifo "$stdin"
+	_lambda_runtime_body "$event" > "$stdin" &
+
+	handler "$event" < "$stdin" > "$body" || exit_code="$?"
+	rm -f "$event" "$stdin"
+
+	if [ "$exit_code" -eq 0 ]; then
+		# Send the response
+		jq --raw-input --raw-output --compact-output --slurp --monochrome-output \
+			--arg statusCode "$(cat "$_STATUS_CODE")" \
+			--argjson headers "$(cat "$_HEADERS")" \
+			'{statusCode:$statusCode|tonumber, headers:$headers, encoding:"base64", body:.|@base64}' < "$body" \
+			| _lambda_runtime_api "invocation/$request_id/response" -X POST -d @- > /dev/null
+		rm -f "$body" "$_HEADERS"
+	else
+		echo "\`handler\` function return code: $exit_code"
+		_lambda_runtime_api "invocation/$request_id/error" -X POST -d @- > /dev/null <<< '{"exitCode":'"$exit_code"'}'
+	fi
+}
+
+_lambda_runtime_body() {
+	if [ "$(jq --raw-output '.body | type' < "$1")" = "string" ]; then
+		if [ "$(jq --raw-output '.encoding' < "$1")" = "base64" ]; then
+			jq --raw-output '.body' < "$1" | base64 -d
+		else
+			# assume plain-text body
+			jq --raw-output '.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,2 @@
+/test
+tmp

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

@@ -1,20 +1,50 @@
 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 }) {
     assert(typeof mode === 'number');
     assert(typeof fsPath === 'string');
+    /** @type {string} */
     this.type = 'FileFsRef';
+    /** @type {number} */
     this.mode = mode;
+    /** @type {string} */
     this.fsPath = fsPath;
   }
 
+  /**
+   * Creates a `FileFsRef` with the correct `mode` from the file system.
+   *
+   * @argument {Object} options
+   * @argument {string} options.fsPath
+   * @returns {Promise<FileFsRef>}
+   */
+  static async fromFsPath({ fsPath }) {
+    const { mode } = await fs.lstat(fsPath);
+    return new FileFsRef({ mode, 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
@@ -24,37 +54,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 });
   }
 
+  /**
+   * @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;
   }
 
+  /**
+   * @returns {NodeJS.ReadableStream}
+   */
   toStream() {
     let flag;
 
     // eslint-disable-next-line consistent-return
-    return new MultiStream((cb) => {
-      if (flag) return cb();
+    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,20 +1,42 @@
 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 }) {
     assert(typeof mode === 'number');
     assert(typeof digest === 'string');
+    /** @type {string} */
     this.type = 'FileRef';
+    /** @type {number} */
     this.mode = mode;
+    /** @type {string} */
     this.digest = digest;
   }
 
+  /**
+   * @returns {Promise<NodeJS.ReadableStream>}
+   */
   async toStreamAsync() {
     let url;
     // sha:24be087eef9fac01d61b30a725c1a10d7b45a256
@@ -27,36 +49,46 @@ class FileRef {
     assert(url);
 
     await semaToDownloadFromS3.acquire();
-    console.time(`downloading ${url}`);
+    // 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(
+              `download: ${resp.status} ${resp.statusText} for ${url}`,
+            );
+            if (resp.status === 403) error.bail = true;
+            throw error;
+          }
+          return resp.body;
+        },
+        { factor: 1, retries: 3 },
+      );
     } finally {
-      console.timeEnd(`downloading ${url}`);
+      // console.timeEnd(`downloading ${url}`);
       semaToDownloadFromS3.release();
     }
   }
 
+  /**
+   * @returns {NodeJS.ReadableStream}
+   */
   toStream() {
     let flag;
 
     // eslint-disable-next-line consistent-return
-    return new MultiStream((cb) => {
-      if (flag) return cb();
+    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/download.js

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

@@ -1,8 +1,8 @@
 const path = require('path');
 const fs = require('fs-extra');
 
-const dev = !process.env.AWS_EXECUTION_ENV;
-const TMP_PATH = dev ? path.join(process.cwd(), 'tmp') : '/tmp';
+const prod = process.env.AWS_EXECUTION_ENV || process.env.X_GOOGLE_CODE_LOCATION;
+const TMP_PATH = prod ? '/tmp' : path.join(__dirname, 'tmp');
 
 module.exports = async function getWritableDirectory() {
   const name = Math.floor(Math.random() * 0x7fffffff).toString(16);

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

@@ -3,15 +3,30 @@ const path = require('path');
 const vanillaGlob = require('glob');
 const FileFsRef = require('../file-fs-ref.js');
 
+/** @typedef {import('fs').Stats} Stats */
+/** @typedef {import('glob').IOptions} GlobOptions */
+/** @typedef {import('../file-fs-ref').FsFiles|{}} GlobFiles */
+
+/**
+ * @argument {string} pattern
+ * @argument {GlobOptions|string} opts
+ * @argument {string} [mountpoint]
+ * @returns {Promise<GlobFiles>}
+ */
 module.exports = function glob(pattern, opts = {}, mountpoint) {
   return new Promise((resolve, reject) => {
-    let options = opts;
-    if (typeof options === 'string') {
-      options = { cwd: options };
+    /** @type {GlobOptions} */
+    let options;
+    if (typeof opts === 'string') {
+      options = { cwd: opts };
+    } else {
+      options = opts;
     }
 
     if (!options.cwd) {
-      throw new Error('Second argument (basePath) must be specified for names of resulting files');
+      throw new Error(
+        'Second argument (basePath) must be specified for names of resulting files',
+      );
     }
 
     if (!path.isAbsolute(options.cwd)) {
@@ -26,21 +41,27 @@ module.exports = function glob(pattern, opts = {}, mountpoint) {
     vanillaGlob(pattern, options, (error, files) => {
       if (error) return reject(error);
 
-      resolve(files.reduce((files2, relativePath) => {
-        const fsPath = path.join(options.cwd, relativePath);
-        const stat = options.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);
-          return {
-            ...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,6 +1,25 @@
+/** @typedef { import('@now/build-utils/file-ref') } FileRef */
+/** @typedef { import('@now/build-utils/file-fs-ref') } FileFsRef */
+/** @typedef {{[filePath: string]: FileRef|FileFsRef}} Files */
+
+/**
+ * @callback delegate
+ * @argument {string} name
+ * @returns {string}
+ */
+
+/**
+ * Rename files using delegate function
+ * @argument {Files} files
+ * @argument {delegate} delegate
+ * @returns {Files}
+ */
 module.exports = function rename(files, delegate) {
-  return Object.keys(files).reduce((newFiles, name) => ({
-    ...newFiles,
-    [delegate(name)]: files[name],
-  }), {});
+  return Object.keys(files).reduce(
+    (newFiles, name) => ({
+      ...newFiles,
+      [delegate(name)]: files[name],
+    }),
+    {},
+  );
 };

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

@@ -1,3 +1,4 @@
+const assert = require('assert');
 const fs = require('fs-extra');
 const path = require('path');
 const { spawn } = require('child_process');
@@ -6,27 +7,41 @@ function spawnAsync(command, args, cwd) {
   return new Promise((resolve, reject) => {
     const child = spawn(command, args, { stdio: 'inherit', cwd });
     child.on('error', reject);
-    child.on('close', (code, signal) => (code !== 0 ? reject(new Error(`Exited with ${code || signal}`)) : resolve()));
+    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 shouldUseNpm(destPath) {
+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(path.join(currentDestPath, 'package.json'))) {
+    if (await fs.exists(packageJsonPath)) {
       // eslint-disable-next-line no-await-in-loop
-      if (await fs.exists(path.join(currentDestPath, 'package-lock.json'))) {
-        return true;
-      }
-      return false;
+      const packageJson = JSON.parse(await fs.readFile(packageJsonPath));
+      hasScript = Boolean(
+        packageJson.scripts && scriptName && 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);
@@ -34,32 +49,40 @@ async function shouldUseNpm(destPath) {
     currentDestPath = newDestPath;
   }
 
-  return false;
+  return { hasScript, hasPackageLockJson };
 }
 
-async function runNpmInstall(destPath, args = []) {
+async function installDependencies(destPath, args = []) {
+  assert(path.isAbsolute(destPath));
+
   let commandArgs = args;
   console.log(`installing to ${destPath}`);
-  if (await shouldUseNpm(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 {
     await spawnAsync('yarn', ['--cwd', destPath].concat(commandArgs), destPath);
+    await spawnAsync('yarn', ['cache', 'clean'], 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;
+  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;
@@ -67,6 +90,7 @@ async function runPackageJsonScript(destPath, scriptName) {
 
 module.exports = {
   runShellScript,
-  runNpmInstall,
+  installDependencies,
+  runNpmInstall: installDependencies,
   runPackageJsonScript,
 };

packages/now-build-utils/lambda.js

@@ -1,4 +1,5 @@
 const assert = require('assert');
+const Sema = require('async-sema');
 const { ZipFile } = require('yazl');
 const streamToBuffer = require('./fs/stream-to-buffer.js');
 
@@ -14,6 +15,7 @@ class Lambda {
   }
 }
 
+const sema = new Sema(10);
 const mtime = new Date(1540000000000);
 
 async function createLambda({
@@ -23,19 +25,33 @@ async function createLambda({
   assert(typeof handler === 'string', '"handler" is not a string');
   assert(typeof runtime === 'string', '"runtime" is not a string');
   assert(typeof environment === 'object', '"environment" is not an object');
-  const zipFile = new ZipFile();
 
-  Object.keys(files).sort().forEach((name) => {
-    const file = files[name];
-    const stream = file.toStream();
-    zipFile.addReadStream(stream, name, { mode: file.mode, mtime });
-  });
+  await sema.acquire();
+  try {
+    const zipFile = new ZipFile();
+    const zipBuffer = await new Promise((resolve, reject) => {
+      Object.keys(files)
+        .sort()
+        .forEach((name) => {
+          const file = files[name];
+          const stream = file.toStream();
+          stream.on('error', reject);
+          zipFile.addReadStream(stream, name, { mode: file.mode, mtime });
+        });
 
-  zipFile.end();
-  const zipBuffer = await streamToBuffer(zipFile.outputStream);
-  return new Lambda({
-    zipBuffer, handler, runtime, environment,
-  });
+      zipFile.end();
+      streamToBuffer(zipFile.outputStream).then(resolve).catch(reject);
+    });
+
+    return new Lambda({
+      zipBuffer,
+      handler,
+      runtime,
+      environment,
+    });
+  } finally {
+    sema.release();
+  }
 }
 
 module.exports = {

packages/now-build-utils/package.json

@@ -1,6 +1,12 @@
 {
   "name": "@now/build-utils",
-  "version": "0.4.27",
+  "version": "0.4.35-canary.2",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zeit/now-builders.git",
+    "directory": "packages/now-build-utils"
+  },
   "dependencies": {
     "async-retry": "1.2.3",
     "async-sema": "2.1.4",
@@ -8,8 +14,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/07-cross-install/api/index.js

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

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

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

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

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

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

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

packages/now-build-utils/test/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(4 * 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'); // eslint-disable-line import/no-extraneous-dependencies
+const download = require('@now/build-utils/fs/download'); // eslint-disable-line import/no-extraneous-dependencies
+const { createLambda } = require('@now/build-utils/lambda'); // eslint-disable-line import/no-extraneous-dependencies
+const getWritableDirectory = require('@now/build-utils/fs/get-writable-directory'); // eslint-disable-line import/no-extraneous-dependencies
+
+exports.analyze = ({ files, entrypoint }) => files[entrypoint].digest;
+
+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,25 @@
+{
+  "name": "@now/cgi",
+  "version": "0.0.16-canary.0",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zeit/now-builders.git",
+    "directory": "packages/now-cgi"
+  },
+  "scripts": {
+    "test": "best -I test/*.js",
+    "prepublish": "./build.sh"
+  },
+  "files": [
+    "index.js",
+    "handler"
+  ],
+  "dependencies": {
+    "fs-extra": "7.0.0"
+  },
+  "devDependencies": {
+    "@zeit/best": "0.4.3",
+    "rmfr": "2.0.0"
+  }
+}

packages/now-cgi/yarn.lock

@@ -10,8 +10,8 @@
     glob-to-regexp "^0.3.0"
 
 "@nodelib/fs.stat@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.2.tgz#54c5a964462be3d4d78af631363c18d6fa91ac26"
+  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"
@@ -23,14 +23,6 @@
     globby "8.0.0"
     signal-exit "3.0.2"
 
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-
 ansi-styles@^3.2.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -110,13 +102,6 @@ base@^0.11.1:
     mixin-deep "^1.2.0"
     pascalcase "^0.1.1"
 
-bl@^1.0.0:
-  version "1.2.2"
-  resolved "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
-  dependencies:
-    readable-stream "^2.3.5"
-    safe-buffer "^5.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"
@@ -139,21 +124,6 @@ braces@^2.3.1:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-buffer-alloc-unsafe@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
-
-buffer-alloc@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
-  dependencies:
-    buffer-alloc-unsafe "^1.1.0"
-    buffer-fill "^1.0.0"
-
-buffer-fill@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
-
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -172,10 +142,6 @@ 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"
 
-camelcase@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
-
 chalk@2.3.1:
   version "2.3.1"
   resolved "http://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
@@ -184,10 +150,6 @@ chalk@2.3.1:
     escape-string-regexp "^1.0.5"
     supports-color "^5.2.0"
 
-chownr@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
-
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
@@ -197,18 +159,6 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-cliui@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-    wrap-ansi "^2.0.0"
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -238,32 +188,12 @@ copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
 
-core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-
-cross-spawn@^6.0.0:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
 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"
 
-decamelize@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
-  dependencies:
-    xregexp "4.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"
@@ -298,40 +228,10 @@ dir-glob@^2.0.0:
     arrify "^1.0.1"
     path-type "^3.0.0"
 
-end-of-stream@^1.0.0, 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"
-  dependencies:
-    once "^1.4.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"
 
-execa@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^3.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"
-
-execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  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"
-
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -390,12 +290,6 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  dependencies:
-    locate-path "^3.0.0"
-
 for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -406,11 +300,7 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
-fs-constants@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
-
-fs-extra@^7.0.0:
+fs-extra@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6"
   dependencies:
@@ -418,30 +308,10 @@ fs-extra@^7.0.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-minipass@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
-  dependencies:
-    minipass "^2.2.1"
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
-get-caller-file@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
-
-get-stream@^3.0.0:
-  version "3.0.0"
-  resolved "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-
-get-stream@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
-  dependencies:
-    pump "^3.0.0"
-
 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"
@@ -485,8 +355,8 @@ globby@8.0.0:
     slash "^1.0.0"
 
 graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+  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"
@@ -536,7 +406,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@~2.0.3:
+inherits@2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -546,10 +416,6 @@ inspect-with-kind@^1.0.4:
   dependencies:
     kind-of "^6.0.2"
 
-invert-kv@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
-
 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"
@@ -608,16 +474,6 @@ 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-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -646,22 +502,14 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-
 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, isarray@~1.0.0:
+isarray@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
 
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
@@ -672,13 +520,6 @@ isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
 
-isomorphic-unfetch@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/isomorphic-unfetch/-/isomorphic-unfetch-3.0.0.tgz#de6d80abde487b17de2c400a7ef9e5ecc2efb362"
-  dependencies:
-    node-fetch "^2.2.0"
-    unfetch "^4.0.0"
-
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -705,31 +546,6 @@ 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"
 
-lambda-git@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/lambda-git/-/lambda-git-0.1.2.tgz#32ee82a47d7fc4e9c05ab03ae22b5572d8e642e4"
-  dependencies:
-    tar-fs "^1.14.0"
-
-lcid@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
-  dependencies:
-    invert-kv "^2.0.0"
-
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
-map-age-cleaner@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74"
-  dependencies:
-    p-defer "^1.0.0"
-
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -740,14 +556,6 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-mem@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
-  dependencies:
-    map-age-cleaner "^0.1.1"
-    mimic-fn "^1.0.0"
-    p-is-promise "^1.1.0"
-
 merge2@^1.2.1:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
@@ -770,33 +578,12 @@ micromatch@^3.1.10:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-mimic-fn@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
-
 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"
 
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-
-minipass@^2.2.1, minipass@^2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minizlib@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.1.tgz#6734acc045a46e61d596a43bb9d9cd326e19cc42"
-  dependencies:
-    minipass "^2.2.1"
-
 mixin-deep@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
@@ -804,18 +591,6 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp-promise@5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz#e9b8f68e552c68a9c1713b84883f7a1dd039b8a1"
-  dependencies:
-    mkdirp "*"
-
-mkdirp@*, mkdirp@^0.5.0, mkdirp@^0.5.1:
-  version "0.5.1"
-  resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  dependencies:
-    minimist "0.0.8"
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -836,38 +611,6 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-
-node-fetch@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.2.0.tgz#4ee79bde909262f9775f731e3656d0db55ced5b5"
-
-now-fetch@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/now-fetch/-/now-fetch-0.1.1.tgz#f886974284281c9f2853ed326dbb8b152f47abce"
-  dependencies:
-    isomorphic-unfetch "^3.0.0"
-    now-token "^0.1.4"
-
-now-token@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/now-token/-/now-token-0.1.5.tgz#76e2b92e29035a744f70d6cab46c45befb935e16"
-  dependencies:
-    fs-extra "^7.0.0"
-    yargs "^12.0.2"
-
-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"
-  dependencies:
-    path-key "^2.0.0"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
@@ -888,48 +631,12 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
     wrappy "1"
 
-os-locale@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
-  dependencies:
-    execa "^0.10.0"
-    lcid "^2.0.0"
-    mem "^4.0.0"
-
-p-defer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-
-p-is-promise@^1.1.0:
-  version "1.1.0"
-  resolved "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
-
-p-limit@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
-  dependencies:
-    p-try "^2.0.0"
-
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  dependencies:
-    p-limit "^2.0.0"
-
-p-try@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
-
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
@@ -938,18 +645,10 @@ path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
 
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-
 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-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"
-
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -964,36 +663,6 @@ 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"
 
-process-nextick-args@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-
-pump@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954"
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-readable-stream@^2.3.0, readable-stream@^2.3.5:
-  version "2.3.6"
-  resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
 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"
@@ -1009,14 +678,6 @@ repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
 
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-
-require-main-filename@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
@@ -1041,24 +702,12 @@ rmfr@2.0.0:
     inspect-with-kind "^1.0.4"
     rimraf "^2.6.2"
 
-safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-
 safe-regex@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  resolved "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
   dependencies:
     ret "~0.1.10"
 
-semver@^5.5.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-
 set-value@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
@@ -1077,17 +726,7 @@ set-value@^2.0.0:
     is-plain-object "^2.0.3"
     split-string "^3.0.1"
 
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  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"
-
-signal-exit@3.0.2, signal-exit@^3.0.0:
+signal-exit@3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
@@ -1153,86 +792,12 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-string-width@^2.0.0, string-width@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  dependencies:
-    safe-buffer "~5.1.0"
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-
 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"
 
-tar-fs@^1.14.0:
-  version "1.16.3"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.3.tgz#966a628841da2c4010406a82167cbd5e0c72d509"
-  dependencies:
-    chownr "^1.0.1"
-    mkdirp "^0.5.1"
-    pump "^1.0.0"
-    tar-stream "^1.1.2"
-
-tar-stream@^1.1.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
-  dependencies:
-    bl "^1.0.0"
-    buffer-alloc "^1.2.0"
-    end-of-stream "^1.0.0"
-    fs-constants "^1.0.0"
-    readable-stream "^2.3.0"
-    to-buffer "^1.1.1"
-    xtend "^4.0.0"
-
-tar@4.4.6:
-  version "4.4.6"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
-  dependencies:
-    chownr "^1.0.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.3.3"
-    minizlib "^1.1.0"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.2"
-
-to-buffer@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
-
 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"
@@ -1255,10 +820,6 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-unfetch@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.0.1.tgz#8750c4c7497ade75d40387d7dbc4ba024416b8f6"
-
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
@@ -1287,10 +848,6 @@ use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
 
-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-
 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"
@@ -1300,62 +857,6 @@ validate-glob-opts@^1.0.0:
     inspect-with-kind "^1.0.4"
     is-plain-obj "^1.1.0"
 
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-
-which@^1.2.9:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  dependencies:
-    isexe "^2.0.0"
-
-wrap-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-
-xregexp@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
-
-xtend@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-
-"y18n@^3.2.1 || ^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-
-yallist@^3.0.0, yallist@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
-
-yargs-parser@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
-  dependencies:
-    camelcase "^4.1.0"
-
-yargs@^12.0.2:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^2.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^10.1.0"

packages/now-go/.gitignore

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

packages/now-go/build.sh

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

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

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

packages/now-go/go-helpers.js

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

packages/now-go/index.js

@@ -1,100 +1,90 @@
-const path = require('path');
-const { mkdirp, readFile, writeFile } = require('fs-extra');
+const { join, dirname } = require('path');
+const { readFile, writeFile } = require('fs-extra');
 
-const execa = require('execa');
-const { createLambda } = require('@now/build-utils/lambda.js');
-const getWritableDirectory = require('@now/build-utils/fs/get-writable-directory.js');
-const download = require('@now/build-utils/fs/download.js');
-const downloadGit = require('lambda-git');
-const glob = require('@now/build-utils/fs/glob.js');
-const downloadGoBin = require('./download-go-bin');
+const glob = require('@now/build-utils/fs/glob.js'); // eslint-disable-line import/no-extraneous-dependencies
+const download = require('@now/build-utils/fs/download.js'); // eslint-disable-line import/no-extraneous-dependencies
+const { createLambda } = require('@now/build-utils/lambda.js'); // eslint-disable-line import/no-extraneous-dependencies
+const getWritableDirectory = require('@now/build-utils/fs/get-writable-directory.js'); // eslint-disable-line import/no-extraneous-dependencies
+const { createGo, getExportedFunctionName } = require('./go-helpers');
 
-// creates a `$GOPATH` direcotry 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'));
-}
+const config = {
+  maxLambdaSize: '10mb',
+};
 
-exports.build = async ({ files, entrypoint }) => {
-  console.log('downloading files...');
+async function build({ files, entrypoint }) {
+  console.log('Downloading user files...');
 
-  const gitPath = await getWritableDirectory();
-  const goPath = await getWritableDirectory();
-  const srcPath = path.join(goPath, 'src', 'lambda');
-  const outDir = await getWritableDirectory();
-
-  await createGoPathTree(goPath);
+  const [goPath, outDir] = await Promise.all([
+    getWritableDirectory(),
+    getWritableDirectory(),
+  ]);
 
+  const srcPath = join(goPath, 'src', 'lambda');
   const downloadedFiles = await download(files, srcPath);
 
-  console.log('downloading go binary...');
-  const goBin = await downloadGoBin();
-
-  console.log('downloading git binary...');
-  // downloads a git binary that works on Amazon Linux and sets
-  // `process.env.GIT_EXEC_PATH` so `go(1)` can see it
-  await downloadGit({ targetDirectory: gitPath });
-
-  const goEnv = {
-    ...process.env,
-    GOOS: 'linux',
-    GOARCH: 'amd64',
-    GOPATH: goPath,
-  };
-
-  console.log(`parsing AST for "${entrypoint}"`);
-  let handlerFunctionName = '';
+  console.log(`Parsing AST for "${entrypoint}"`);
+  let handlerFunctionName;
   try {
-    handlerFunctionName = await execa.stdout(
-      path.join(__dirname, 'bin', 'get-exported-function-name'),
-      [downloadedFiles[entrypoint].fsPath],
+    handlerFunctionName = await getExportedFunctionName(
+      downloadedFiles[entrypoint].fsPath,
     );
   } catch (err) {
-    console.log(`failed to parse AST for "${entrypoint}"`);
+    console.log(`Failed to parse AST for "${entrypoint}"`);
     throw err;
   }
 
-  if (handlerFunctionName === '') {
-    const e = new Error(`Could not find an exported function on "${entrypoint}"`);
-    console.log(e.message);
-    throw e;
+  if (!handlerFunctionName) {
+    const err = new Error(
+      `Could not find an exported function in "${entrypoint}"`,
+    );
+    console.log(err.message);
+    throw err;
   }
 
-  console.log(`Found exported function "${handlerFunctionName}" on "${entrypoint}"`);
+  console.log(
+    `Found exported function "${handlerFunctionName}" in "${entrypoint}"`,
+  );
 
-  const origianlMainGoContents = await readFile(path.join(__dirname, 'main.go'), 'utf8');
-  const mainGoContents = origianlMainGoContents.replace('__NOW_HANDLER_FUNC_NAME', handlerFunctionName);
+  const origianlMainGoContents = await readFile(
+    join(__dirname, 'main.go'),
+    'utf8',
+  );
+  const mainGoContents = origianlMainGoContents.replace(
+    '__NOW_HANDLER_FUNC_NAME',
+    handlerFunctionName,
+  );
   // in order to allow the user to have `main.go`, we need our `main.go` to be called something else
   const mainGoFileName = 'main__now__go__.go';
 
   // we need `main.go` in the same dir as the entrypoint,
   // otherwise `go build` will refuse to build
-  const entrypointDirname = path.dirname(downloadedFiles[entrypoint].fsPath);
+  const entrypointDirname = dirname(downloadedFiles[entrypoint].fsPath);
 
   // Go doesn't like to build files in different directories,
   // so now we place `main.go` together with the user code
-  await writeFile(path.join(entrypointDirname, mainGoFileName), mainGoContents);
+  await writeFile(join(entrypointDirname, mainGoFileName), mainGoContents);
 
+  const go = await createGo(goPath, process.platform, process.arch, {
+    cwd: entrypointDirname,
+  });
 
-  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
+  // `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' });
+    await go.get();
   } catch (err) {
     console.log('failed to `go get`');
     throw err;
   }
 
-  console.log('running go build...');
+  console.log('Running `go build`...');
+  const destPath = join(outDir, 'handler');
   try {
-    await execa(goBin, [
-      'build',
-      '-o', path.join(outDir, 'handler'),
-      path.join(entrypointDirname, mainGoFileName), downloadedFiles[entrypoint].fsPath,
-    ], { env: goEnv, cwd: entrypointDirname, stdio: 'inherit' });
+    const src = [
+      join(entrypointDirname, mainGoFileName),
+      downloadedFiles[entrypoint].fsPath,
+    ];
+    await go.build({ src, dest: destPath });
   } catch (err) {
     console.log('failed to `go build`');
     throw err;
@@ -110,4 +100,6 @@ exports.build = async ({ files, entrypoint }) => {
   return {
     [entrypoint]: lambda,
   };
-};
+}
+
+module.exports = { config, build };

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

packages/now-go/util/install.js

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

packages/now-html-minifier/index.js

@@ -1,4 +1,4 @@
-const FileBlob = require('@now/build-utils/file-blob.js');
+const FileBlob = require('@now/build-utils/file-blob.js'); // eslint-disable-line import/no-extraneous-dependencies
 const { minify } = require('html-minifier');
 
 const defaultOptions = {

packages/now-html-minifier/package.json

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

packages/now-lambda/.npmignore

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

packages/now-lambda/index.js

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

packages/now-lambda/package.json

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

packages/now-lambda/test/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(4 * 60 * 1000);
+const buildUtilsUrl = '@canary';
+let builderUrl;
+
+beforeAll(async () => {
+  const builderPath = path.resolve(__dirname, '..');
+  builderUrl = await packAndDeploy(builderPath);
+  console.log('builderUrl', builderUrl);
+});
+
+const fixturesPath = path.resolve(__dirname, 'fixtures');
+
+// eslint-disable-next-line no-restricted-syntax
+for (const fixture of fs.readdirSync(fixturesPath)) {
+  // eslint-disable-next-line no-loop-func
+  it(`should build ${fixture}`, async () => {
+    await expect(
+      testDeployment(
+        { builderUrl, buildUtilsUrl },
+        path.join(fixturesPath, fixture),
+      ),
+    ).resolves.toBeDefined();
+  });
+}

packages/now-md/.npmignore

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

packages/now-md/index.js

@@ -1,4 +1,4 @@
-const FileBlob = require('@now/build-utils/file-blob.js');
+const FileBlob = require('@now/build-utils/file-blob.js'); // eslint-disable-line import/no-extraneous-dependencies
 const unified = require('unified');
 const unifiedStream = require('unified-stream');
 const markdown = require('remark-parse');
@@ -22,12 +22,17 @@ exports.build = async ({ files, entrypoint, config }) => {
     .use(markdown)
     .use(remark2rehype)
     .use(doc, {
-      title, language, meta, css,
+      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());
 

packages/now-md/package.json

@@ -1,6 +1,12 @@
 {
   "name": "@now/md",
-  "version": "0.4.4",
+  "version": "0.4.10-canary.1",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zeit/now-builders.git",
+    "directory": "packages/now-md"
+  },
   "dependencies": {
     "rehype-document": "^2.2.0",
     "rehype-format": "^2.3.0",
@@ -10,7 +16,7 @@
     "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(4 * 60 * 1000);
+const buildUtilsUrl = '@canary';
+let builderUrl;
+
+beforeAll(async () => {
+  const builderPath = path.resolve(__dirname, '..');
+  builderUrl = await packAndDeploy(builderPath);
+  console.log('builderUrl', builderUrl);
+});
+
+const fixturesPath = path.resolve(__dirname, 'fixtures');
+
+// eslint-disable-next-line no-restricted-syntax
+for (const fixture of fs.readdirSync(fixturesPath)) {
+  // eslint-disable-next-line no-loop-func
+  it(`should build ${fixture}`, async () => {
+    await expect(
+      testDeployment(
+        { builderUrl, buildUtilsUrl },
+        path.join(fixturesPath, fixture),
+      ),
+    ).resolves.toBeDefined();
+  });
+}

packages/now-mdx-deck/.npmignore

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

packages/now-mdx-deck/index.js

@@ -1,12 +1,10 @@
-const download = require('@now/build-utils/fs/download.js');
+const download = require('@now/build-utils/fs/download.js'); // eslint-disable-line import/no-extraneous-dependencies
 const fs = require('fs');
 const { promisify } = require('util');
-const getWritableDirectory = require('@now/build-utils/fs/get-writable-directory.js');
-const glob = require('@now/build-utils/fs/glob.js');
+const getWritableDirectory = require('@now/build-utils/fs/get-writable-directory.js'); // eslint-disable-line import/no-extraneous-dependencies
+const glob = require('@now/build-utils/fs/glob.js'); // eslint-disable-line import/no-extraneous-dependencies
 const path = require('path');
-const { runNpmInstall } = require('@now/build-utils/fs/run-user-scripts.js');
-
-exports.analyze = ({ files, entrypoint }) => files[entrypoint].digest;
+const { runNpmInstall } = require('@now/build-utils/fs/run-user-scripts.js'); // eslint-disable-line import/no-extraneous-dependencies
 
 const writeFile = promisify(fs.writeFile);
 
@@ -14,18 +12,24 @@ exports.build = async ({ files, entrypoint, workPath }) => {
   console.log('downloading user files...');
   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...');
+  console.log('installing dependencies...');
   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 = 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,
@@ -41,15 +45,15 @@ exports.build = async ({ files, entrypoint, workPath }) => {
 
 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']);
 
   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,7 +1,13 @@
 {
   "name": "@now/mdx-deck",
-  "version": "0.4.13",
-  "peerDependencies": {
-    "@now/build-utils": ">=0.0.1"
+  "version": "0.4.19-canary.1",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zeit/now-builders.git",
+    "directory": "packages/now-mdx-deck"
+  },
+  "scripts": {
+    "test": "jest"
   }
 }

packages/now-mdx-deck/test/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(4 * 60 * 1000);
+const buildUtilsUrl = '@canary';
+let builderUrl;
+
+beforeAll(async () => {
+  const builderPath = path.resolve(__dirname, '..');
+  builderUrl = await packAndDeploy(builderPath);
+  console.log('builderUrl', builderUrl);
+});
+
+const fixturesPath = path.resolve(__dirname, 'fixtures');
+
+// eslint-disable-next-line no-restricted-syntax
+for (const fixture of fs.readdirSync(fixturesPath)) {
+  // eslint-disable-next-line no-loop-func
+  it(`should build ${fixture}`, async () => {
+    await expect(
+      testDeployment(
+        { builderUrl, buildUtilsUrl },
+        path.join(fixturesPath, fixture),
+      ),
+    ).resolves.toBeDefined();
+  });
+}

packages/now-next/index.js

@@ -1,254 +1,328 @@
-const { createLambda } = require('@now/build-utils/lambda.js');
-const download = require('@now/build-utils/fs/download.js');
-const FileFsRef = require('@now/build-utils/file-fs-ref.js');
-const FileBlob = require('@now/build-utils/file-blob');
+const { createLambda } = require('@now/build-utils/lambda.js'); // eslint-disable-line import/no-extraneous-dependencies
+const download = require('@now/build-utils/fs/download.js'); // eslint-disable-line import/no-extraneous-dependencies
+const FileFsRef = require('@now/build-utils/file-fs-ref.js'); // eslint-disable-line import/no-extraneous-dependencies
+const FileBlob = require('@now/build-utils/file-blob'); // eslint-disable-line import/no-extraneous-dependencies
 const path = require('path');
 const { readFile, writeFile, unlink } = require('fs.promised');
-const rename = require('@now/build-utils/fs/rename.js');
 const {
   runNpmInstall,
-  runPackageJsonScript
-} = require('@now/build-utils/fs/run-user-scripts.js');
-const glob = require('@now/build-utils/fs/glob.js');
+  runPackageJsonScript,
+} = require('@now/build-utils/fs/run-user-scripts.js'); // eslint-disable-line import/no-extraneous-dependencies
+const glob = require('@now/build-utils/fs/glob.js'); // eslint-disable-line import/no-extraneous-dependencies
+const semver = require('semver');
+const nextLegacyVersions = require('./legacy-versions');
+const {
+  excludeFiles,
+  validateEntrypoint,
+  includeOnlyEntryDirectory,
+  normalizePackageJson,
+  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;
-    }
-    return {
-      ...newFiles,
-      [fileName]: files[fileName]
-    };
-  }, {});
-}
+/** @typedef { import('@now/build-utils/file-ref').Files } Files */
+/** @typedef { import('@now/build-utils/fs/download').DownloadedFiles } DownloadedFiles */
 
-function shouldExcludeFile(entryDirectory) {
-  return file => {
-    // If the file is not in the entry directory
-    if (entryDirectory !== '.' && !file.startsWith(entryDirectory)) {
-      return true;
-    }
+/**
+ * @typedef {Object} BuildParamsType
+ * @property {Files} files - Files object
+ * @property {string} entrypoint - Entrypoint specified for the builder
+ * @property {string} workPath - Working directory for this build
+ */
 
-    // Exclude static directory
-    if (file.startsWith(path.join(entryDirectory, 'static'))) {
-      return true;
-    }
+/**
+ * Read package.json from files
+ * @param {string} entryPath
+ */
+async function readPackageJson(entryPath) {
+  const packagePath = path.join(entryPath, 'package.json');
 
-    if (file === 'package-lock.json') {
-      return true;
-    }
-
-    if (file === 'yarn.lock') {
-      return true;
-    }
-
-    return false;
-  };
-}
-
-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"'
-    );
+  try {
+    return JSON.parse(await readFile(packagePath, 'utf8'));
+  } catch (err) {
+    console.log('package.json not found in entry');
+    return {};
   }
+}
+
+/**
+ * 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 }) => {
+  validateEntrypoint(entrypoint);
 
   console.log('downloading user files...');
   const entryDirectory = path.dirname(entrypoint);
-  const filesToDownload = excludeFiles(
-    files,
-    shouldExcludeFile(entryDirectory)
-  );
-  const entrypointHandledFilesToDownload = rename(filesToDownload, file => {
-    if (entryDirectory !== '.') {
-      return file.replace(new RegExp(`^${entryDirectory}/`), '');
-    }
-    return file;
-  });
-  let downloadedFiles = await download(
-    entrypointHandledFilesToDownload,
-    workPath
-  );
+  await download(files, workPath);
+  const entryPath = path.join(workPath, entryDirectory);
 
-  let packageJson = {};
-  if (downloadedFiles['package.json']) {
-    console.log('found package.json, overwriting');
-    const packageJsonPath = downloadedFiles['package.json'].fsPath;
-    packageJson = JSON.parse(await readFile(packageJsonPath, 'utf8'));
+  const pkg = await readPackageJson(entryPath);
+
+  let nextVersion;
+  if (pkg.dependencies && pkg.dependencies.next) {
+    nextVersion = pkg.dependencies.next;
+  } else if (pkg.devDependencies && pkg.devDependencies.next) {
+    nextVersion = pkg.devDependencies.next;
   }
 
-  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"'
+  if (!nextVersion) {
+    throw new Error(
+      'No Next.js version could be detected in "package.json". Make sure `"next"` is installed in "dependencies" or "devDependencies"',
     );
-    packageJson.dependencies.react = 'latest';
   }
-  if (!packageJson.dependencies['react-dom']) {
-    console.log(
-      '"react-dom" not found in dependencies, adding to "package.json" "dependencies"'
+
+  const isLegacy = (() => {
+    // If version is using the dist-tag instead of a version range
+    if (nextVersion === 'canary' || nextVersion === 'latest') {
+      return false;
+    }
+
+    // If the version is an exact match with the legacy versions
+    if (nextLegacyVersions.indexOf(nextVersion) !== -1) {
+      return true;
+    }
+
+    const maxSatisfying = semver.maxSatisfying(nextLegacyVersions, nextVersion);
+    // When the version can't be matched with legacy versions, so it must be a newer version
+    if (maxSatisfying === null) {
+      return false;
+    }
+
+    return true;
+  })();
+
+  console.log(`MODE: ${isLegacy ? 'legacy' : 'serverless'}`);
+
+  if (isLegacy) {
+    try {
+      await unlink(path.join(entryPath, 'yarn.lock'));
+    } catch (err) {
+      console.log('no yarn.lock removed');
+    }
+
+    try {
+      await unlink(path.join(entryPath, 'package-lock.json'));
+    } catch (err) {
+      console.log('no package-lock.json removed');
+    }
+
+    console.warn(
+      "WARNING: your application is being deployed in @now/next's legacy mode. http://err.sh/zeit/now-builders/now-next-legacy-mode",
     );
-    packageJson.dependencies['react-dom'] = 'latest';
+
+    console.log('normalizing package.json');
+    const packageJson = normalizePackageJson(pkg);
+    console.log('normalized package.json result: ', packageJson);
+    await writePackageJson(entryPath, packageJson);
+  } else if (!pkg.scripts || !pkg.scripts['now-build']) {
+    console.warn(
+      'WARNING: "now-build" script not found. Adding \'"now-build": "next build"\' to "package.json" automatically',
+    );
+    pkg.scripts = {
+      'now-build': 'next build',
+      ...(pkg.scripts || {}),
+    };
+    console.log('normalized package.json result: ', pkg);
+    await writePackageJson(entryPath, pkg);
   }
 
-  // in case the user has `next` on their `dependencies`, we remove it
-  delete packageJson.dependencies.next;
-
-  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}`
-    );
+    console.log('found NPM_AUTH_TOKEN in environment, creating .npmrc');
+    await writeNpmRc(entryPath, process.env.NPM_AUTH_TOKEN);
   }
-  downloadedFiles = await glob('**', workPath);
 
-  console.log('running npm install...');
-  await runNpmInstall(workPath, ['--prefer-offline']);
+  console.log('installing dependencies...');
+  await runNpmInstall(entryPath, ['--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'));
-  }
-  downloadedFiles = await glob('**', workPath);
+  await runPackageJsonScript(entryPath, 'now-build');
 
-  console.log('preparing lambda files...');
-  let buildId;
-  try {
-    buildId = await readFile(path.join(workPath, '.next', 'BUILD_ID'), 'utf8');
-  } catch (err) {
-    console.error(
-      'BUILD_ID not found in ".next". The "package.json" "build" script did not run "next build"'
-    );
-    throw new Error('Missing BUILD_ID');
+  if (isLegacy) {
+    console.log('running npm install --production...');
+    await runNpmInstall(entryPath, ['--prefer-offline', '--production']);
   }
-  const dotNextRootFiles = await glob('.next/*', workPath);
-  const dotNextServerRootFiles = await glob('.next/server/*', workPath);
-  const nodeModules = excludeFiles(
-    await glob('node_modules/**', workPath),
-    file => file.startsWith('node_modules/.cache')
-  );
-  const launcherFiles = {
-    'now__bridge.js': new FileFsRef({ fsPath: require('@now/node-bridge') })
-  };
-  const nextFiles = {
-    ...nodeModules,
-    ...dotNextRootFiles,
-    ...dotNextServerRootFiles,
-    ...launcherFiles
-  };
-  if (downloadedFiles['next.config.js']) {
-    nextFiles['next.config.js'] = downloadedFiles['next.config.js'];
+
+  if (process.env.NPM_AUTH_TOKEN) {
+    await unlink(path.join(entryPath, '.npmrc'));
   }
-  const pages = await glob(
-    '**/*.js',
-    path.join(workPath, '.next', 'server', 'static', buildId, 'pages')
-  );
-  const launcherPath = path.join(__dirname, 'launcher.js');
-  const launcherData = await readFile(launcherPath, 'utf8');
 
   const lambdas = {};
-  await Promise.all(
-    Object.keys(pages).map(async page => {
-      // These default pages don't have to be handled as they'd always 404
-      if (['_app.js', '_error.js', '_document.js'].includes(page)) {
-        return;
-      }
 
-      const pathname = page.replace(/\.js$/, '');
-      const launcher = launcherData.replace(
-        'PATHNAME_PLACEHOLDER',
-        `/${pathname.replace(/(^|\/)index$/, '')}`
+  if (isLegacy) {
+    const filesAfterBuild = await glob('**', entryPath);
+
+    console.log('preparing lambda files...');
+    let buildId;
+    try {
+      buildId = await readFile(
+        path.join(entryPath, '.next', 'BUILD_ID'),
+        'utf8',
       );
+    } catch (err) {
+      console.error(
+        'BUILD_ID not found in ".next". The "package.json" "build" script did not run "next build"',
+      );
+      throw new Error('Missing BUILD_ID');
+    }
+    const dotNextRootFiles = await glob('.next/*', entryPath);
+    const dotNextServerRootFiles = await glob('.next/server/*', entryPath);
+    const nodeModules = excludeFiles(
+      await glob('node_modules/**', entryPath),
+      file => file.startsWith('node_modules/.cache'),
+    );
+    const launcherFiles = {
+      'now__bridge.js': new FileFsRef({ fsPath: require('@now/node-bridge') }),
+    };
+    const nextFiles = {
+      ...nodeModules,
+      ...dotNextRootFiles,
+      ...dotNextServerRootFiles,
+      ...launcherFiles,
+    };
+    if (filesAfterBuild['next.config.js']) {
+      nextFiles['next.config.js'] = filesAfterBuild['next.config.js'];
+    }
+    const pages = await glob(
+      '**/*.js',
+      path.join(entryPath, '.next', 'server', 'static', buildId, 'pages'),
+    );
+    const launcherPath = path.join(__dirname, 'legacy-launcher.js');
+    const launcherData = await readFile(launcherPath, 'utf8');
 
-      const pageFiles = {
-        [`.next/server/static/${buildId}/pages/_document.js`]: downloadedFiles[
-          `.next/server/static/${buildId}/pages/_document.js`
-        ],
-        [`.next/server/static/${buildId}/pages/_app.js`]: downloadedFiles[
-          `.next/server/static/${buildId}/pages/_app.js`
-        ],
-        [`.next/server/static/${buildId}/pages/_error.js`]: downloadedFiles[
-          `.next/server/static/${buildId}/pages/_error.js`
-        ],
-        [`.next/server/static/${buildId}/pages/${page}`]: downloadedFiles[
-          `.next/server/static/${buildId}/pages/${page}`
-        ]
-      };
+    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;
+        }
 
-      lambdas[path.join(entryDirectory, pathname)] = await createLambda({
-        files: {
-          ...nextFiles,
-          ...pageFiles,
-          'now__launcher.js': new FileBlob({ data: launcher })
-        },
-        handler: 'now__launcher.launcher',
-        runtime: 'nodejs8.10'
-      });
-    })
-  );
+        const pathname = page.replace(/\.js$/, '');
+        const launcher = launcherData.replace(
+          'PATHNAME_PLACEHOLDER',
+          `/${pathname.replace(/(^|\/)index$/, '')}`,
+        );
+
+        const pageFiles = {
+          [`.next/server/static/${buildId}/pages/_document.js`]: filesAfterBuild[
+            `.next/server/static/${buildId}/pages/_document.js`
+          ],
+          [`.next/server/static/${buildId}/pages/_app.js`]: filesAfterBuild[
+            `.next/server/static/${buildId}/pages/_app.js`
+          ],
+          [`.next/server/static/${buildId}/pages/_error.js`]: filesAfterBuild[
+            `.next/server/static/${buildId}/pages/_error.js`
+          ],
+          [`.next/server/static/${buildId}/pages/${page}`]: filesAfterBuild[
+            `.next/server/static/${buildId}/pages/${page}`
+          ],
+        };
+
+        console.log(`Creating lambda for page: "${page}"...`);
+        lambdas[path.join(entryDirectory, pathname)] = await createLambda({
+          files: {
+            ...nextFiles,
+            ...pageFiles,
+            'now__launcher.js': new FileBlob({ data: launcher }),
+          },
+          handler: 'now__launcher.launcher',
+          runtime: 'nodejs8.10',
+        });
+        console.log(`Created lambda for page: "${page}"`);
+      }),
+    );
+  } else {
+    console.log('preparing lambda files...');
+    const launcherFiles = {
+      'now__bridge.js': new FileFsRef({ fsPath: require('@now/node-bridge') }),
+      'now__launcher.js': new FileFsRef({
+        fsPath: path.join(__dirname, 'launcher.js'),
+      }),
+    };
+    const pages = await glob(
+      '**/*.js',
+      path.join(entryPath, '.next', 'serverless', 'pages'),
+    );
+
+    const pageKeys = Object.keys(pages);
+
+    if (pageKeys.length === 0) {
+      throw new Error(
+        'No serverless pages were built. https://err.sh/zeit/now-builders/now-next-no-serverless-pages-built',
+      );
+    }
+
+    await Promise.all(
+      pageKeys.map(async (page) => {
+        // These default pages don't have to be handled as they'd always 404
+        if (['_app.js', '_error.js', '_document.js'].includes(page)) {
+          return;
+        }
+
+        const pathname = page.replace(/\.js$/, '');
+
+        console.log(`Creating lambda for page: "${page}"...`);
+        lambdas[path.join(entryDirectory, pathname)] = await createLambda({
+          files: {
+            ...launcherFiles,
+            'page.js': pages[page],
+          },
+          handler: 'now__launcher.launcher',
+          runtime: 'nodejs8.10',
+        });
+        console.log(`Created lambda for page: "${page}"`);
+      }),
+    );
+  }
 
   const nextStaticFiles = await glob(
     '**',
-    path.join(workPath, '.next', 'static')
+    path.join(entryPath, '.next', 'static'),
   );
   const staticFiles = Object.keys(nextStaticFiles).reduce(
     (mappedFiles, file) => ({
       ...mappedFiles,
-      [path.join(entryDirectory, `_next/static/${file}`)]: nextStaticFiles[file]
+      [path.join(entryDirectory, `_next/static/${file}`)]: nextStaticFiles[file],
     }),
-    {}
+    {},
   );
 
-  return { ...lambdas, ...staticFiles };
-};
-
-exports.prepareCache = async ({ files, 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);
-
-  console.log('.next folder contents', await glob('.next/**', cachePath));
-  console.log(
-    '.cache folder contents',
-    await glob('node_modules/.cache/**', cachePath)
+  const nextStaticDirectory = onlyStaticDirectory(
+    includeOnlyEntryDirectory(files, entryDirectory),
+  );
+  const staticDirectoryFiles = Object.keys(nextStaticDirectory).reduce(
+    (mappedFiles, file) => ({
+      ...mappedFiles,
+      [path.join(entryDirectory, file)]: nextStaticDirectory[file],
+    }),
+    {},
   );
 
-  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))
-  };
+  return { ...lambdas, ...staticFiles, ...staticDirectoryFiles };
 };

packages/now-next/launcher.js

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

packages/now-next/legacy-launcher.js

@@ -0,0 +1,19 @@
+const { Server } = require('http');
+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 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/legacy-versions.js

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

packages/now-next/package.json

@@ -1,12 +1,16 @@
 {
   "name": "@now/next",
-  "version": "0.0.76",
+  "version": "0.0.85-canary.5",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zeit/now-builders.git",
+    "directory": "packages/now-next"
+  },
   "dependencies": {
     "@now/node-bridge": "0.1.4",
     "execa": "^1.0.0",
-    "fs.promised": "^3.0.0"
-  },
-  "peerDependencies": {
-    "@now/build-utils": ">=0.0.1"
+    "fs.promised": "^3.0.0",
+    "semver": "^5.6.0"
   }
 }

packages/now-next/utils.js

@@ -0,0 +1,146 @@
+/** @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);
+}
+
+/**
+ * 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 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': 'v7.0.2-canary.49',
+    },
+    devDependencies: {
+      ...devDependencies,
+      // next is forced to canary
+      next: 'v7.0.2-canary.49',
+      // next-server is a dependency here
+      'next-server': undefined,
+    },
+    scripts: {
+      ...defaultPackageJson.scripts,
+      'now-build': 'NODE_OPTIONS=--max_old_space_size=3000 next build --lambdas',
+    },
+  };
+}
+
+module.exports = {
+  excludeFiles,
+  validateEntrypoint,
+  includeOnlyEntryDirectory,
+  excludeLockFiles,
+  normalizePackageJson,
+  onlyStaticDirectory,
+};

packages/now-node-bridge/bridge.js

@@ -1,10 +1,15 @@
 const http = require('http');
 
 function normalizeEvent(event) {
+  let isApiGateway = true;
+
   if (event.Action === 'Invoke') {
+    isApiGateway = false;
     const invokeEvent = JSON.parse(event.body);
 
-    const { method, path, headers, encoding } = invokeEvent;
+    const {
+      method, path, headers, encoding,
+    } = invokeEvent;
 
     let { body } = invokeEvent;
 
@@ -19,20 +24,16 @@ function normalizeEvent(event) {
     }
 
     return {
-      method,
-      path,
-      headers,
-      body
+      isApiGateway, method, path, headers, body,
     };
   }
 
-  const { httpMethod: method, path, headers, body } = event;
+  const {
+    httpMethod: method, path, headers, body,
+  } = event;
 
   return {
-    method,
-    path,
-    headers,
-    body
+    isApiGateway, method, path, headers, body,
   };
 }
 
@@ -53,34 +54,51 @@ class Bridge {
         return resolve({ statusCode: 504, body: '' });
       }
 
-      const { method, path, headers, body } = normalizeEvent(event);
+      const {
+        isApiGateway, 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, res => {
+      const req = http.request(opts, (res) => {
         const response = res;
         const respBodyChunks = [];
         response.on('data', chunk => respBodyChunks.push(Buffer.from(chunk)));
-        response.on('error', error => reject(error));
+        response.on('error', reject);
         response.on('end', () => {
+          const bodyBuffer = Buffer.concat(respBodyChunks);
           delete response.headers.connection;
-          delete response.headers['content-length'];
+
+          if (isApiGateway) {
+            delete response.headers['content-length'];
+          } else
+          if (response.headers['content-length']) {
+            response.headers['content-length'] = bodyBuffer.length;
+          }
 
           resolve({
             statusCode: response.statusCode,
             headers: response.headers,
-            body: Buffer.concat(respBodyChunks).toString('base64'),
-            encoding: 'base64'
+            body: bodyBuffer.toString('base64'),
+            encoding: 'base64',
           });
         });
       });
 
+      req.on('error', (error) => {
+        setTimeout(() => {
+          // this lets express print the true error of why the connection was closed.
+          // it is probably 'Cannot set headers after they are sent to the client'
+          reject(error);
+        }, 2);
+      });
+
       if (body) req.write(body);
       req.end();
     });
@@ -88,5 +106,5 @@ class Bridge {
 }
 
 module.exports = {
-  Bridge
+  Bridge,
 };

packages/now-node-bridge/package.json

@@ -1,7 +1,10 @@
 {
   "name": "@now/node-bridge",
-  "version": "0.1.6",
-  "peerDependencies": {
-    "@now/build-utils": ">=0.0.1"
+  "version": "0.1.11-canary.0",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zeit/now-builders.git",
+    "directory": "packages/now-node-bridge"
   }
 }

packages/now-node-server/.npmignore

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

packages/now-node-server/index.js

@@ -1,114 +1,132 @@
-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 glob = require('@now/build-utils/fs/glob.js');
+const { createLambda } = require('@now/build-utils/lambda.js'); // eslint-disable-line import/no-extraneous-dependencies
+const download = require('@now/build-utils/fs/download.js'); // eslint-disable-line import/no-extraneous-dependencies
+const FileBlob = require('@now/build-utils/file-blob.js'); // eslint-disable-line import/no-extraneous-dependencies
+const FileFsRef = require('@now/build-utils/file-fs-ref.js'); // eslint-disable-line import/no-extraneous-dependencies
+const fs = require('fs-extra');
+const glob = require('@now/build-utils/fs/glob.js'); // eslint-disable-line import/no-extraneous-dependencies
 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'); // eslint-disable-line import/no-extraneous-dependencies
+const {
+  runNpmInstall,
+  runPackageJsonScript,
+} = require('@now/build-utils/fs/run-user-scripts.js'); // eslint-disable-line import/no-extraneous-dependencies
 
-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);
+  console.log("installing dependencies for user's code...");
+  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',
-        },
+  console.log('writing ncc package.json...');
+  await download(
+    {
+      'package.json': new FileBlob({
+        data: JSON.stringify({
+          license: 'UNLICENSED',
+          dependencies: {
+            '@zeit/ncc': '0.15.2',
+          },
+        }),
       }),
-    }),
-  }, xRollupPath);
-
-  console.log('running npm install for rollup...');
-  await runNpmInstall(xRollupPath, preferOfflineArgument);
-  return [filesOnDisk, xRollupPath, entrypointFsDirname];
-}
-
-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(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);
     },
-  });
+    nccPath,
+  );
 
-  return (await bundle.generate({
-    format: 'cjs',
-  })).code;
+  console.log('installing dependencies for ncc...');
+  await runNpmInstall(nccPath, npmArguments);
+  return [downloadedFiles, userPath, nccPath, entrypointFsDirname];
 }
 
-exports.build = async ({ 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, { sourceMap: true });
+
+  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 { source: data, permissions: mode } = assets[assetName];
+    const blob2 = new FileBlob({ data, mode });
+    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 [
-    filesOnDisk,
-    workRollupPath,
+    downloadedFiles,
+    workUserPath,
+    workNccPath,
     entrypointFsDirname,
-  ] = await commonForTwo({ files, entrypoint, workPath });
+  ] = 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 }),
@@ -116,7 +134,7 @@ exports.build = async ({ files, entrypoint, workPath }) => {
   };
 
   const lambda = await createLambda({
-    files: { ...compiledFiles, ...launcherFiles },
+    files: { ...preparedFiles, ...launcherFiles },
     handler: 'launcher.launcher',
     runtime: 'nodejs8.10',
   });
@@ -124,15 +142,18 @@ exports.build = async ({ files, entrypoint, workPath }) => {
   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)),
   };
 };

packages/now-node-server/launcher.js

@@ -12,7 +12,10 @@ Server.prototype.listen = function listen(...args) {
 };
 
 try {
-  process.env.NODE_ENV = 'production';
+  if (!process.env.NODE_ENV) {
+    process.env.NODE_ENV = 'production';
+  }
+
   // PLACEHOLDER
 } catch (error) {
   console.error(error);

packages/now-node-server/package.json

@@ -1,10 +1,17 @@
 {
   "name": "@now/node-server",
-  "version": "0.4.21",
-  "dependencies": {
-    "@now/node-bridge": "^0.1.6"
+  "version": "0.4.27-canary.5",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zeit/now-builders.git",
+    "directory": "packages/now-node-server"
   },
-  "peerDependencies": {
-    "@now/build-utils": ">=0.0.1"
+  "dependencies": {
+    "@now/node-bridge": "^0.1.11-canary.0",
+    "fs-extra": "7.0.1"
+  },
+  "scripts": {
+    "test": "jest"
   }
 }

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

@@ -0,0 +1,11 @@
+const cowsay = require('cowsay').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').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.9"
+  }
+}

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