Publish

- @now/build-utils@0.4.31-canary.1
 - @now/lambda@0.4.8-canary.0
 - @now/md@0.4.8-canary.1
 - @now/mdx-deck@0.4.17-canary.2
 - @now/node-server@0.4.25-canary.2
 - @now/node@0.4.27-canary.2
 - @now/php@0.4.12-canary.2
 - @now/static-build@0.4.16-canary.1

.circleci/config.yml

@@ -4,6 +4,8 @@ jobs:
     docker:
       - image: circleci/node:10
     working_directory: ~/repo
+    environment:
+      GOPATH: $HOME/go
     steps:
       - checkout
       - run:
@@ -24,65 +26,17 @@ jobs:
       - run:
           name: Tests
           command: yarn test
-  # publish-canary:
-  #   docker:
-  #     - image: circleci/node:10
-  #   working_directory: ~/repo
-  #   steps:
-  #     - checkout
-  #     - run:
-  #         name: Updating apt-get list
-  #         command: sudo apt-get update
-  #     - run:
-  #         name: Installing the latest version of Go
-  #         command: sudo apt-get install golang-go
-  #     - 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:
-          name: Updating apt-get list
-          command: sudo apt-get update
+          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: Installing the latest version of Go
-          command: sudo apt-get install golang-go
-      - run: yarn install
-      - run: yarn bootstrap
+          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: Saving Authentication Information
-          command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
-      - run:
-          name: Publishing to Stable Channel
-          command: yarn run lerna publish from-git --yes
+          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+)$/
-            branches:
-              ignore: /.*/
-      # - publish-canary:
-      #     requires:
-      #       - build
-      #     filters:
-      #       tags:
-      #         only: /^.*canary.*($|\b)/
+      - build

README.md

@@ -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!

jest.config.js

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

package.json

@@ -30,12 +30,16 @@
     "@types/glob": "^7.1.1",
     "@types/multistream": "^2.1.1",
     "@types/node": "^10.12.8",
+    "buffer-replace": "^1.0.0",
     "eslint": "^5.9.0",
     "eslint-config-airbnb-base": "^13.1.0",
     "eslint-config-prettier": "^3.1.0",
     "eslint-plugin-import": "^2.14.0",
+    "fs-extra": "^7.0.1",
+    "glob": "^7.1.3",
     "jest": "^23.6.0",
     "lint-staged": "^8.0.4",
+    "node-fetch": "^2.3.0",
     "pre-commit": "^1.2.2",
     "prettier": "^1.15.2",
     "typescript": "^3.1.6"

packages/now-build-utils/.npmignore

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

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

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

packages/now-build-utils/fs/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');
@@ -13,22 +14,34 @@ function spawnAsync(command, args, cwd) {
 }
 
 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 && 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);
@@ -36,16 +49,29 @@ async function shouldUseNpm(destPath) {
     currentDestPath = newDestPath;
   }
 
-  return false;
+  return { hasScript, hasPackageLockJson };
 }
 
 async function runNpmInstall(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 if (process.env.AWS_EXECUTION_ENV) {
+    console.log('using memory-fs for yarn cache');
+    await spawnAsync(
+      'node',
+      [path.join(__dirname, 'bootstrap-yarn.js'), '--cwd', destPath].concat(
+        commandArgs,
+      ),
+      destPath,
+    );
   } else {
     await spawnAsync('yarn', ['--cwd', destPath].concat(commandArgs), destPath);
     await spawnAsync('yarn', ['cache', 'clean'], destPath);
@@ -53,21 +79,19 @@ async function runNpmInstall(destPath, args = []) {
 }
 
 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;

packages/now-build-utils/package.json

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,56 @@
+/* global beforeAll, expect, it, jest */
+const fs = require('fs');
+const path = require('path');
+
+const {
+  packAndDeploy,
+  testDeployment,
+} = require('../../../test/lib/deployment/test-deployment.js');
+
+jest.setTimeout(2 * 60 * 1000);
+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({ 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({ buildUtilsUrl }, path.join(fixturesPath2, fixture)),
+        ).resolves.toBeDefined();
+      });
+    }
+  }
+}

packages/now-cgi/build.sh

@@ -1,4 +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/main.go

@@ -70,7 +70,7 @@ func (h *CgiHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		Path: h.Script,
 		Root: "/" + h.Script,
 		Dir: h.Dir,
-		Env: []string{"SERVER_PORT=443"},
+		Env: []string{"SERVER_PORT=443", "HTTPS=on", "SERVER_SOFTWARE=@now/cgi"},
 	}
 	cgih.ServeHTTP(w, r)
 }

packages/now-cgi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/cgi",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "scripts": {
     "test": "best -I test/*.js",
     "prepublish": "./build.sh"

packages/now-go/main.go

@@ -91,7 +91,10 @@ func main() {
 		for k, v := range req.Headers {
 			internalReq.Header.Add(k, v)
 			if strings.ToLower(k) == "host" {
-				req.Host = v
+				// we need to set `Host` in the request
+				// because Go likes to ignore the `Host` header
+				// see https://github.com/golang/go/issues/7682
+				internalReq.Host = v
 			}
 		}
 
@@ -108,12 +111,7 @@ func main() {
 		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]
-			}
+			resHeaders[k] = v[0]
 		}
 
 		bodyBytes, err := ioutil.ReadAll(internalRes.Body)
@@ -121,17 +119,12 @@ func main() {
 			return createErrorResponse("Bad gateway", "bad_gateway", 502)
 		}
 
-		var resBody string
-		if resEncoding == "base64" {
-			resBody = b64.StdEncoding.EncodeToString(bodyBytes)
-		} else {
-			resBody = string(bodyBytes)
-		}
+		resBody = b64.StdEncoding.EncodeToString(bodyBytes)
 
 		return Response{
 			StatusCode: internalRes.StatusCode,
 			Headers:    resHeaders,
-			Encoding:   resEncoding,
+			Encoding:   "base64",
 			Body:       resBody,
 		}, nil
 	}

packages/now-go/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/go",
-  "version": "0.2.9",
+  "version": "0.2.11-canary.0",
   "scripts": {
     "test": "best -I test/*.js",
     "prepublish": "./build.sh"

packages/now-html-minifier/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/html-minifier",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "dependencies": {
     "html-minifier": "3.5.21"
   },

packages/now-lambda/.npmignore

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

packages/now-lambda/package.json

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

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

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

packages/now-lambda/test/test.js

@@ -0,0 +1,29 @@
+/* global beforeAll, expect, it, jest */
+const fs = require('fs');
+const path = require('path');
+
+const {
+  packAndDeploy,
+  testDeployment,
+} = require('../../../test/lib/deployment/test-deployment.js');
+
+jest.setTimeout(2 * 60 * 1000);
+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 }, path.join(fixturesPath, fixture)),
+    ).resolves.toBeDefined();
+  });
+}

packages/now-md/.npmignore

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

packages/now-md/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/md",
-  "version": "0.4.6",
+  "version": "0.4.8-canary.1",
   "dependencies": {
     "rehype-document": "^2.2.0",
     "rehype-format": "^2.3.0",
@@ -12,5 +12,8 @@
   },
   "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,29 @@
+/* global beforeAll, expect, it, jest */
+const fs = require('fs');
+const path = require('path');
+
+const {
+  packAndDeploy,
+  testDeployment,
+} = require('../../../test/lib/deployment/test-deployment.js');
+
+jest.setTimeout(2 * 60 * 1000);
+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 }, path.join(fixturesPath, fixture)),
+    ).resolves.toBeDefined();
+  });
+}

packages/now-mdx-deck/.npmignore

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

packages/now-mdx-deck/index.js

@@ -14,7 +14,7 @@ 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...');
@@ -47,7 +47,7 @@ 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...');

packages/now-mdx-deck/package.json

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

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

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

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

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

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

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

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

@@ -0,0 +1,29 @@
+/* global beforeAll, expect, it, jest */
+const fs = require('fs');
+const path = require('path');
+
+const {
+  packAndDeploy,
+  testDeployment,
+} = require('../../../test/lib/deployment/test-deployment.js');
+
+jest.setTimeout(2 * 60 * 1000);
+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 }, path.join(fixturesPath, fixture)),
+    ).resolves.toBeDefined();
+  });
+}

packages/now-next/index.js

@@ -17,6 +17,7 @@ const {
   excludeLockFiles,
   normalizePackageJson,
   excludeStaticDirectory,
+  onlyStaticDirectory,
 } = require('./utils');
 
 /** @typedef { import('@now/build-utils/file-ref').Files } Files */
@@ -66,6 +67,10 @@ async function writeNpmRc(workPath, token) {
   );
 }
 
+exports.config = {
+  maxLambdaSize: '5mb',
+};
+
 /**
  * @param {BuildParamsType} buildParams
  * @returns {Promise<Files>}
@@ -87,10 +92,13 @@ exports.build = async ({ files, workPath, entrypoint }) => {
   const filesWithoutStaticDirectory = excludeStaticDirectory(
     filesWithoutLockfiles,
   );
-  let downloadedFiles = await download(filesWithoutStaticDirectory, workPath);
+  const downloadedFiles = await download(filesWithoutStaticDirectory, workPath);
 
   console.log('normalizing package.json');
-  const packageJson = normalizePackageJson(readPackageJson(downloadedFiles));
+  const packageJson = normalizePackageJson(
+    await readPackageJson(downloadedFiles),
+  );
+  console.log('normalized package.json result: ', packageJson);
   await writePackageJson(workPath, packageJson);
 
   if (process.env.NPM_AUTH_TOKEN) {
@@ -98,8 +106,6 @@ exports.build = async ({ files, workPath, entrypoint }) => {
     await writeNpmRc(workPath, process.env.NPM_AUTH_TOKEN);
   }
 
-  downloadedFiles = await glob('**', workPath);
-
   console.log('running npm install...');
   await runNpmInstall(workPath, ['--prefer-offline']);
   console.log('running user script...');
@@ -110,7 +116,7 @@ exports.build = async ({ files, workPath, entrypoint }) => {
     await unlink(path.join(workPath, '.npmrc'));
   }
 
-  downloadedFiles = await glob('**', workPath);
+  const filesAfterBuild = await glob('**', workPath);
 
   console.log('preparing lambda files...');
   let buildId;
@@ -137,8 +143,8 @@ exports.build = async ({ files, workPath, entrypoint }) => {
     ...dotNextServerRootFiles,
     ...launcherFiles,
   };
-  if (downloadedFiles['next.config.js']) {
-    nextFiles['next.config.js'] = downloadedFiles['next.config.js'];
+  if (filesAfterBuild['next.config.js']) {
+    nextFiles['next.config.js'] = filesAfterBuild['next.config.js'];
   }
   const pages = await glob(
     '**/*.js',
@@ -162,16 +168,16 @@ exports.build = async ({ files, workPath, entrypoint }) => {
       );
 
       const pageFiles = {
-        [`.next/server/static/${buildId}/pages/_document.js`]: downloadedFiles[
+        [`.next/server/static/${buildId}/pages/_document.js`]: filesAfterBuild[
           `.next/server/static/${buildId}/pages/_document.js`
         ],
-        [`.next/server/static/${buildId}/pages/_app.js`]: downloadedFiles[
+        [`.next/server/static/${buildId}/pages/_app.js`]: filesAfterBuild[
           `.next/server/static/${buildId}/pages/_app.js`
         ],
-        [`.next/server/static/${buildId}/pages/_error.js`]: downloadedFiles[
+        [`.next/server/static/${buildId}/pages/_error.js`]: filesAfterBuild[
           `.next/server/static/${buildId}/pages/_error.js`
         ],
-        [`.next/server/static/${buildId}/pages/${page}`]: downloadedFiles[
+        [`.next/server/static/${buildId}/pages/${page}`]: filesAfterBuild[
           `.next/server/static/${buildId}/pages/${page}`
         ],
       };
@@ -202,12 +208,36 @@ exports.build = async ({ files, workPath, entrypoint }) => {
     {},
   );
 
-  return { ...lambdas, ...staticFiles };
+  const nextStaticDirectory = onlyStaticDirectory(filesWithoutLockfiles);
+  const staticDirectoryFiles = Object.keys(nextStaticDirectory).reduce(
+    (mappedFiles, file) => ({
+      ...mappedFiles,
+      [path.join(entryDirectory, file)]: nextStaticDirectory[file],
+    }),
+    {},
+  );
+
+  return { ...lambdas, ...staticFiles, ...staticDirectoryFiles };
 };
 
-exports.prepareCache = async ({ files, cachePath, workPath }) => {
+exports.prepareCache = async ({
+  files, entrypoint, cachePath, workPath,
+}) => {
   console.log('downloading user files...');
-  await download(files, cachePath);
+  const entryDirectory = path.dirname(entrypoint);
+  const filesOnlyEntryDirectory = includeOnlyEntryDirectory(
+    files,
+    entryDirectory,
+  );
+  const filesWithEntryDirectoryRoot = moveEntryDirectoryToRoot(
+    filesOnlyEntryDirectory,
+    entryDirectory,
+  );
+  const filesWithoutLockfiles = excludeLockFiles(filesWithEntryDirectoryRoot);
+  const filesWithoutStaticDirectory = excludeStaticDirectory(
+    filesWithoutLockfiles,
+  );
+  await download(filesWithoutStaticDirectory, workPath);
   await download(await glob('.next/**', workPath), cachePath);
   await download(await glob('node_modules/**', workPath), cachePath);
 

packages/now-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/next",
-  "version": "0.0.78",
+  "version": "0.0.81-canary.1",
   "dependencies": {
     "@now/node-bridge": "0.1.4",
     "execa": "^1.0.0",

packages/now-next/utils.js

@@ -111,31 +111,60 @@ function excludeStaticDirectory(files) {
   return excludeFiles(files, matcher);
 }
 
+/**
+ * Exclude the static directory from files
+ * @param {Files} files
+ * @returns {Files}
+ */
+function onlyStaticDirectory(files) {
+  function matcher(filePath) {
+    return !filePath.startsWith('static');
+  }
+
+  return excludeFiles(files, matcher);
+}
+
 /**
  * Enforce specific package.json configuration for smallest possible lambda
- * @param {Object} defaultPackageJson
+ * @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',
-      ...defaultPackageJson.dependencies,
+      ...dependencies, // override react if user provided it
       // next-server is forced to canary
       'next-server': 'canary',
-      next: undefined,
     },
     devDependencies: {
-      ...defaultPackageJson.devDependencies,
+      ...devDependencies,
       // next is forced to canary
       next: 'canary',
+      // next-server is a dependency here
       'next-server': undefined,
     },
     scripts: {
       ...defaultPackageJson.scripts,
-      'now-build': 'next build',
+      'now-build': 'next build --lambdas',
     },
   };
 }
@@ -148,4 +177,5 @@ module.exports = {
   excludeLockFiles,
   normalizePackageJson,
   excludeStaticDirectory,
+  onlyStaticDirectory,
 };

packages/now-node-bridge/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/node-bridge",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "peerDependencies": {
     "@now/build-utils": ">=0.0.1"
   }

packages/now-node-server/.npmignore

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

packages/now-node-server/index.js

@@ -5,31 +5,41 @@ const FileFsRef = require('@now/build-utils/file-fs-ref.js');
 const fs = require('fs-extra');
 const glob = require('@now/build-utils/fs/glob.js');
 const path = require('path');
-const { promisify } = require('util');
+const rename = require('@now/build-utils/fs/rename.js');
 const {
   runNpmInstall,
   runPackageJsonScript,
 } = require('@now/build-utils/fs/run-user-scripts.js');
 
-const fsp = {
-  readFile: promisify(fs.readFile),
-};
+/** @typedef { import('@now/build-utils/file-ref') } FileRef */
+/** @typedef {{[filePath: string]: FileRef}} Files */
 
-async function commonForTwo({
-  files, entrypoint, workPath, cachePath,
-}) {
-  const xPath = workPath || cachePath;
-  const preferOfflineArgument = workPath ? ['--prefer-offline'] : [];
+/**
+ * @typedef {Object} BuildParamsType
+ * @property {Files} files - Files object
+ * @property {string} entrypoint - Entrypoint specified for the builder
+ * @property {Object} config - User-passed config from now.json
+ * @property {string} workPath - Working directory for this build
+ */
 
-  const xUserPath = path.join(xPath, 'user');
-  const xNccPath = path.join(xPath, 'ncc');
+/**
+ * @param {BuildParamsType} buildParams
+ * @param {Object} [options]
+ * @param {string[]} [options.npmArguments]
+ */
+async function downloadInstallAndBundle(
+  { files, entrypoint, workPath },
+  { npmArguments = [] } = {},
+) {
+  const userPath = path.join(workPath, 'user');
+  const nccPath = path.join(workPath, 'ncc');
 
   console.log('downloading user files...');
-  const filesOnDisk = await download(files, xUserPath);
+  const downloadedFiles = await download(files, userPath);
 
   console.log('running npm install for user...');
-  const entrypointFsDirname = path.join(xUserPath, path.dirname(entrypoint));
-  await runNpmInstall(entrypointFsDirname, preferOfflineArgument);
+  const entrypointFsDirname = path.join(userPath, path.dirname(entrypoint));
+  await runNpmInstall(entrypointFsDirname, npmArguments);
 
   console.log('writing ncc package.json...');
   await download(
@@ -37,48 +47,77 @@ async function commonForTwo({
       'package.json': new FileBlob({
         data: JSON.stringify({
           dependencies: {
-            '@zeit/ncc': '0.1.4-webpack',
+            '@zeit/ncc': '0.3.0',
           },
         }),
       }),
     },
-    xNccPath,
+    nccPath,
   );
 
   console.log('running npm install for ncc...');
-  await runNpmInstall(xNccPath, preferOfflineArgument);
-  return [filesOnDisk, xNccPath, entrypointFsDirname];
+  await runNpmInstall(nccPath, npmArguments);
+  return [downloadedFiles, userPath, nccPath, entrypointFsDirname];
 }
 
-async function compile(workNccPath, input) {
+async function compile(workNccPath, downloadedFiles, entrypoint) {
+  const input = downloadedFiles[entrypoint].fsPath;
   const ncc = require(path.join(workNccPath, 'node_modules/@zeit/ncc'));
-  return ncc(input);
+  const { code, assets } = await ncc(input);
+
+  const preparedFiles = {};
+  const blob = new FileBlob({ data: code });
+  // move all user code to 'user' subdirectory
+  preparedFiles[path.join('user', entrypoint)] = blob;
+  // eslint-disable-next-line no-restricted-syntax
+  for (const assetName of Object.keys(assets)) {
+    const blob2 = new FileBlob({ data: assets[assetName] });
+    preparedFiles[
+      path.join('user', path.dirname(entrypoint), assetName)
+    ] = blob2;
+  }
+
+  return preparedFiles;
 }
 
 exports.config = {
   maxLambdaSize: '15mb',
 };
 
-exports.build = async ({ files, entrypoint, workPath }) => {
-  const [filesOnDisk, workNccPath, entrypointFsDirname] = await commonForTwo({
-    files,
-    entrypoint,
-    workPath,
-  });
+/**
+ * @param {BuildParamsType} buildParams
+ * @returns {Promise<Files>}
+ */
+exports.build = async ({
+  files, entrypoint, config, workPath,
+}) => {
+  const [
+    downloadedFiles,
+    workUserPath,
+    workNccPath,
+    entrypointFsDirname,
+  ] = await downloadInstallAndBundle(
+    { files, entrypoint, workPath },
+    { npmArguments: ['--prefer-offline'] },
+  );
 
   console.log('running user script...');
   await runPackageJsonScript(entrypointFsDirname, 'now-build');
 
-  console.log('compiling entrypoint with ncc...');
-  const data = await compile(workNccPath, 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;
 
+  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',
     [
@@ -93,7 +132,7 @@ exports.build = async ({ files, entrypoint, workPath }) => {
   };
 
   const lambda = await createLambda({
-    files: { ...compiledFiles, ...launcherFiles },
+    files: { ...preparedFiles, ...launcherFiles },
     handler: 'launcher.launcher',
     runtime: 'nodejs8.10',
   });
@@ -105,7 +144,7 @@ exports.prepareCache = async ({
   files, entrypoint, workPath, cachePath,
 }) => {
   await fs.remove(workPath);
-  await commonForTwo({ files, entrypoint, cachePath });
+  await downloadInstallAndBundle({ files, entrypoint, workPath: cachePath });
 
   return {
     ...(await glob('user/node_modules/**', cachePath)),

packages/now-node-server/package.json

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

packages/now-node-server/test/fixtures/10-others/apollo/index.js

@@ -0,0 +1,24 @@
+const express = require('express');
+const { ApolloServer, gql } = require('apollo-server-express');
+
+const typeDefs = gql`
+  type Query {
+    hello: String
+  }
+`;
+
+const resolvers = {
+  Query: {
+    hello: () => 'apollo:RANDOMNESS_PLACEHOLDER',
+  },
+};
+
+const server = new ApolloServer({ typeDefs, resolvers, introspection: true });
+
+const app = express();
+server.applyMiddleware({ app });
+app.get('/', (req, resp) => {
+  resp.redirect('/graphql');
+});
+
+app.listen({ port: 4000 });

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

@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+    "apollo-server-express": "^2.2.2",
+    "express": "^4.16.4",
+    "graphql": "^14.0.2"
+  }
+}

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

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

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

@@ -0,0 +1,29 @@
+/* global beforeAll, expect, it, jest */
+const fs = require('fs');
+const path = require('path');
+
+const {
+  packAndDeploy,
+  testDeployment,
+} = require('../../../test/lib/deployment/test-deployment.js');
+
+jest.setTimeout(2 * 60 * 1000);
+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 }, path.join(fixturesPath, fixture)),
+    ).resolves.toBeDefined();
+  });
+}

packages/now-node/.npmignore

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

packages/now-node/index.js

@@ -2,18 +2,14 @@ const { createLambda } = require('@now/build-utils/lambda.js');
 const download = require('@now/build-utils/fs/download.js');
 const FileBlob = require('@now/build-utils/file-blob.js');
 const FileFsRef = require('@now/build-utils/file-fs-ref.js');
-const fsExtra = require('fs-extra');
-const fs = require('fs');
+const fs = require('fs-extra');
 const glob = require('@now/build-utils/fs/glob.js');
 const path = require('path');
-const { promisify } = require('util');
 const {
   runNpmInstall,
   runPackageJsonScript,
 } = require('@now/build-utils/fs/run-user-scripts.js');
 
-const readFile = promisify(fs.readFile);
-
 /** @typedef { import('@now/build-utils/file-ref') } FileRef */
 /** @typedef {{[filePath: string]: FileRef}} Files */
 
@@ -37,7 +33,7 @@ async function downloadInstallAndBundle(
   const nccPath = path.join(workPath, 'ncc');
 
   console.log('downloading user files...');
-  const filesOnDisk = await download(files, userPath);
+  const downloadedFiles = await download(files, userPath);
 
   console.log('running npm install for user...');
   const entrypointFsDirname = path.join(userPath, path.dirname(entrypoint));
@@ -49,7 +45,7 @@ async function downloadInstallAndBundle(
       'package.json': new FileBlob({
         data: JSON.stringify({
           dependencies: {
-            '@zeit/ncc': '0.1.4-webpack',
+            '@zeit/ncc': '0.3.0',
           },
         }),
       }),
@@ -59,12 +55,27 @@ async function downloadInstallAndBundle(
 
   console.log('running npm install for ncc...');
   await runNpmInstall(nccPath, npmArguments);
-  return [filesOnDisk, nccPath, entrypointFsDirname];
+  return [downloadedFiles, nccPath, entrypointFsDirname];
 }
 
-async function compile(workNccPath, input) {
+async function compile(workNccPath, downloadedFiles, entrypoint) {
+  const input = downloadedFiles[entrypoint].fsPath;
   const ncc = require(path.join(workNccPath, 'node_modules/@zeit/ncc'));
-  return ncc(input);
+  const { code, assets } = await ncc(input);
+
+  const preparedFiles = {};
+  const blob = new FileBlob({ data: code });
+  // move all user code to 'user' subdirectory
+  preparedFiles[path.join('user', entrypoint)] = blob;
+  // eslint-disable-next-line no-restricted-syntax
+  for (const assetName of Object.keys(assets)) {
+    const blob2 = new FileBlob({ data: assets[assetName] });
+    preparedFiles[
+      path.join('user', path.dirname(entrypoint), assetName)
+    ] = blob2;
+  }
+
+  return preparedFiles;
 }
 
 exports.config = {
@@ -77,7 +88,7 @@ exports.config = {
  */
 exports.build = async ({ files, entrypoint, workPath }) => {
   const [
-    filesOnDisk,
+    downloadedFiles,
     workNccPath,
     entrypointFsDirname,
   ] = await downloadInstallAndBundle(
@@ -89,20 +100,16 @@ exports.build = async ({ files, entrypoint, workPath }) => {
   await runPackageJsonScript(entrypointFsDirname, 'now-build');
 
   console.log('compiling entrypoint with ncc...');
-  const data = await compile(workNccPath, 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 preparedFiles = await compile(workNccPath, downloadedFiles, entrypoint);
   const launcherPath = path.join(__dirname, 'launcher.js');
-  let launcherData = await readFile(launcherPath, 'utf8');
+  let launcherData = await fs.readFile(launcherPath, 'utf8');
 
   launcherData = launcherData.replace(
     '// PLACEHOLDER',
     [
       'process.chdir("./user");',
       `listener = require("./${path.join('user', entrypoint)}");`,
+      'if (listener.default) listener = listener.default;',
     ].join(' '),
   );
 
@@ -112,7 +119,7 @@ exports.build = async ({ files, entrypoint, workPath }) => {
   };
 
   const lambda = await createLambda({
-    files: { ...compiledFiles, ...launcherFiles },
+    files: { ...preparedFiles, ...launcherFiles },
     handler: 'launcher.launcher',
     runtime: 'nodejs8.10',
   });
@@ -123,7 +130,7 @@ exports.build = async ({ files, entrypoint, workPath }) => {
 exports.prepareCache = async ({
   files, entrypoint, workPath, cachePath,
 }) => {
-  await fsExtra.remove(workPath);
+  await fs.remove(workPath);
   await downloadInstallAndBundle({ files, entrypoint, workPath: cachePath });
 
   return {

packages/now-node/package.json

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,7 @@
+const assert = require('assert');
+
+module.exports = (req, resp) => {
+  assert(!process.env.RANDOMNESS_BUILD_ENV_VAR);
+  assert(process.env.RANDOMNESS_ENV_VAR);
+  resp.end('BUILD_TIME_PLACEHOLDER:build-env');
+};

packages/now-node/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/test/fixtures/03-env-vars/build-env/package.json

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

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

@@ -0,0 +1,7 @@
+const assert = require('assert');
+
+module.exports = (req, resp) => {
+  assert(!process.env.RANDOMNESS_BUILD_ENV_VAR);
+  assert(process.env.RANDOMNESS_ENV_VAR);
+  resp.end(`${process.env.RANDOMNESS_ENV_VAR}:env`);
+};

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

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

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

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

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

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

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

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

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

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

packages/now-node/test/test.js

@@ -0,0 +1,29 @@
+/* global beforeAll, expect, it, jest */
+const fs = require('fs');
+const path = require('path');
+
+const {
+  packAndDeploy,
+  testDeployment,
+} = require('../../../test/lib/deployment/test-deployment.js');
+
+jest.setTimeout(2 * 60 * 1000);
+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 }, path.join(fixturesPath, fixture)),
+    ).resolves.toBeDefined();
+  });
+}

packages/now-optipng/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/optipng",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "dependencies": {
     "multipipe": "2.0.3",
     "optipng": "1.1.0"

packages/now-php/.npmignore

@@ -1 +1,2 @@
 /launcher
+/test

packages/now-php/launcher/launcher.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/base64"
 	"encoding/json"
-	"fmt"
 	"net/http"
 	"os"
 	"path"
@@ -26,10 +25,17 @@ type Request struct {
 	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"`
+}
+
 var phpScript = ""
 var phpScriptFull = ""
 
-func handler(ctx context.Context, event events.APIGatewayProxyRequest) (events.APIGatewayProxyResponse, error) {
+func handler(ctx context.Context, event events.APIGatewayProxyRequest) (Response, error) {
 	engine, _ := php.New()
 	context, _ := engine.NewContext()
 
@@ -79,11 +85,15 @@ func handler(ctx context.Context, event events.APIGatewayProxyRequest) (events.A
 	context.Eval("$_SERVER[\"SERVER_NAME\"]=\"" + req.Host + "\";")
 	context.Eval("$_SERVER[\"SERVER_PORT\"]=\"443\";")
 	context.Eval("$_SERVER[\"HTTPS\"]=\"on\";")
+	context.Eval("http_response_code(200);")
 
 	var stdout bytes.Buffer
 	context.Output = &stdout
 	context.Exec(phpScriptFull)
 
+	statusCodeVal, _ := context.Eval("return http_response_code();")
+	statusCode := int(statusCodeVal.Int())
+
 	headers := make(map[string]string)
 	headers["content-type"] = "text/html"
 	for k, v := range context.Header {
@@ -92,14 +102,20 @@ func handler(ctx context.Context, event events.APIGatewayProxyRequest) (events.A
 		}
 	}
 
+	resBody := base64.StdEncoding.EncodeToString(stdout.Bytes())
+
 	engine.Destroy()
-	return events.APIGatewayProxyResponse{StatusCode: 200, Headers: headers, Body: stdout.String()}, nil
+	return Response{
+		StatusCode: statusCode,
+		Headers:    headers,
+		Encoding:   "base64",
+		Body:       resBody,
+	}, nil
 }
 
 func main() {
 	ex, _ := os.Executable()
 	phpScript = os.Getenv("NOW_PHP_SCRIPT")
 	phpScriptFull = path.Join(filepath.Dir(ex), phpScript)
-	fmt.Printf("phpScriptFull %s\n", phpScriptFull)
 	lambda.Start(handler)
 }

packages/now-php/package.json

@@ -1,7 +1,10 @@
 {
   "name": "@now/php",
-  "version": "0.4.10",
+  "version": "0.4.12-canary.2",
   "peerDependencies": {
     "@now/build-utils": ">=0.0.1"
+  },
+  "scripts": {
+    "test": "jest"
   }
 }

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

@@ -0,0 +1,3 @@
+<?php
+  print "cow:RANDOMNESS_PLACEHOLDER";
+?>

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

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