Publish

- @now/next@0.2.0-canary.40
 - @now/node-server@0.5.4-canary.5
 - @now/node@0.5.4-canary.6

.eslintignore

@@ -4,5 +4,7 @@
 /packages/now-go/go/*
 /packages/now-build-utils/dist/*
 /packages/now-node/dist/*
+/packages/now-next/dist/*
 /packages/now-node-bridge/*
 /packages/now-python/*
+/packages/now-optipng/dist/*

.eslintrc

@@ -8,7 +8,7 @@
   },
   "overrides": [
     {
-      "files": ["test/**"],
+      "files": ["**/test/**"],
       "rules": {
         "import/no-extraneous-dependencies": 0
       },

jest.config.js

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

packages/now-build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/build-utils",
-  "version": "0.4.41-canary.5",
+  "version": "0.4.41-canary.7",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",

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

@@ -1,7 +1,7 @@
 import FileBlob from './file-blob';
 import FileFsRef from './file-fs-ref';
 import FileRef from './file-ref';
-import { File, Files, AnalyzeOptions, BuildOptions, PrepareCacheOptions, ShouldServeOptions } from './types';
+import { File, Files, AnalyzeOptions, BuildOptions, PrepareCacheOptions, ShouldServeOptions, Meta } from './types';
 import { Lambda, createLambda } from './lambda';
 import download from './fs/download';
 import getWriteableDirectory from './fs/get-writable-directory'
@@ -17,6 +17,7 @@ export {
     FileRef,
     Files,
     File,
+    Meta,
     Lambda,
     createLambda,
     download,

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

@@ -1,9 +1,11 @@
+import FileRef from "./file-ref";
 import FileFsRef from './file-fs-ref';
 
 export interface File {
   type: string;
   mode: number;
   toStream: () => NodeJS.ReadableStream;
+  fsPath?: string;
 }
 
 export interface Files {
@@ -14,11 +16,20 @@ export interface Config {
   [key: string]: string
 }
 
+export interface Meta {
+  isDev?: boolean;
+  requestPath?: string;
+  filesChanged?: string[];
+  filesRemoved?: string[];
+}
+
 export interface AnalyzeOptions {
   /**
    * All source files of the project
    */
-  files: Files;
+  files: {
+    [filePath: string]: FileRef;
+  }
 
   /**
    * Name of entrypoint file for this particular build job. Value
@@ -67,6 +78,13 @@ export interface BuildOptions {
    * in `now.json`.
    */
   config: Config;
+
+  /**
+   * Metadata related to the invoker of the builder, used by `now dev`.
+   * Builders may use the properties on this object to change behavior based
+   * on the build environment.
+   */
+  meta?: Meta;
 }
 
 export interface PrepareCacheOptions {
@@ -107,6 +125,7 @@ export interface ShouldServeOptions {
    * A path string from a request.
    */
   requestPath: string;
+
   /**
    * Name of entrypoint file for this particular build job. Value
    * `files[entrypoint]` is guaranteed to exist and be a valid File reference.
@@ -114,12 +133,14 @@ export interface ShouldServeOptions {
    * expanded into separate builds at deployment time.
    */
   entrypoint: string;
+
   /**
    * All source files of the project
    */
   files: {
     [path: string]: FileFsRef
   };
+
   /**
    * An arbitrary object passed by the user in the build definition defined
    * in `now.json`.

packages/now-next/.gitignore

@@ -0,0 +1,2 @@
+/dist
+/src/now__bridge.d.ts

packages/now-next/getBridgeTypes.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -euo pipefail
+
+bridge_entrypoint="$(node -p 'require.resolve("@now/node-bridge")')"
+bridge_defs="$(dirname "$bridge_entrypoint")/bridge.d.ts"
+
+if [ ! -e "$bridge_defs" ]; then
+  yarn install --cwd "$bridge_entrypoint"
+fi
+
+cp -v "$bridge_defs" src/now__bridge.d.ts

packages/now-next/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@now/next",
-  "version": "0.1.3-canary.15",
+  "version": "0.2.0-canary.40",
   "license": "MIT",
+  "main": "./dist/index",
   "scripts": {
-    "build": "tsc"
+    "build": "./getBridgeTypes.sh && tsc",
+    "test": "npm run build && jest",
+    "prepublish": "yarn run build"
   },
   "repository": {
     "type": "git",
@@ -12,9 +15,19 @@
   },
   "dependencies": {
     "@now/node-bridge": "^1.0.2-canary.2",
-    "execa": "^1.0.0",
     "fs-extra": "^7.0.0",
+    "get-port": "^5.0.0",
     "resolve-from": "^4.0.0",
     "semver": "^5.6.0"
+  },
+  "files": [
+    "dist"
+  ],
+  "devDependencies": {
+    "@types/next-server": "^8.0.0",
+    "@types/resolve-from": "^4.0.0",
+    "@types/semver": "^6.0.0",
+    "jest": "^24.7.1",
+    "typescript": "^3.4.3"
   }
 }

packages/now-next/src/dev-server.ts

@@ -0,0 +1,50 @@
+import resolveFrom from 'resolve-from';
+import { parse } from 'url';
+import getPort from 'get-port';
+import { createServer } from 'http';
+
+export interface ProcessEnv {
+  [key: string]: string;
+}
+
+async function main(env: ProcessEnv) {
+  const { ENTRY_PATH } = env;
+
+  if (!ENTRY_PATH) {
+    console.error('No ENTRY_PATH defined');
+    process.exit(1);
+
+    return;
+  }
+
+  const next = require(resolveFrom(ENTRY_PATH, 'next'));
+  const app = next({ dev: true, dir: ENTRY_PATH });
+  const handler = app.getRequestHandler();
+
+  const openPort = await getPort({
+    port: [ 5000, 4000 ]
+  });
+
+  const url = `http://localhost:${openPort}`;
+
+  // Prepare for incoming requests
+  await app.prepare();
+
+  createServer((req, res) => {
+    const parsedUrl = parse(req.url || '', true);
+    handler(req, res, parsedUrl);
+  }).listen(openPort, (error: NodeJS.ErrnoException) => {
+    if (error) {
+      console.error(error);
+      process.exit(1);
+
+      return;
+    }
+
+    if (process.send) {
+      process.send(url);
+    }
+  });
+}
+
+main(process.env as ProcessEnv);

packages/now-next/src/index.ts

@@ -1,55 +1,58 @@
-const { createLambda } = require('@now/build-utils/lambda'); // eslint-disable-line import/no-extraneous-dependencies
-const download = require('@now/build-utils/fs/download'); // eslint-disable-line import/no-extraneous-dependencies
-const FileFsRef = require('@now/build-utils/file-fs-ref'); // eslint-disable-line import/no-extraneous-dependencies
-const FileBlob = require('@now/build-utils/file-blob'); // eslint-disable-line import/no-extraneous-dependencies
-const resolveFrom = require('resolve-from');
-const path = require('path');
-const url = require('url');
-const {
+import {
+  createLambda,
+  download,
+  FileFsRef,
+  FileBlob,
+  glob,
   runNpmInstall,
   runPackageJsonScript,
-} = require('@now/build-utils/fs/run-user-scripts'); // eslint-disable-line import/no-extraneous-dependencies
-const glob = require('@now/build-utils/fs/glob'); // eslint-disable-line import/no-extraneous-dependencies
-const {
+  Lambda,
+  Files,
+  BuildOptions,
+  PrepareCacheOptions,
+} from '@now/build-utils';
+import resolveFrom from 'resolve-from';
+import path from 'path';
+import { fork } from 'child_process';
+import {
   readFile,
   writeFile,
-  unlink: unlinkFile,
-  remove: removePath,
+  unlink as unlinkFile,
+  remove as removePath,
   pathExists,
-} = require('fs-extra');
-const semver = require('semver');
-const nextLegacyVersions = require('./legacy-versions');
-const {
+} from 'fs-extra';
+import semver from 'semver';
+import nextLegacyVersions from './legacy-versions';
+import {
   excludeFiles,
   validateEntrypoint,
   includeOnlyEntryDirectory,
   normalizePackageJson,
   onlyStaticDirectory,
   getNextConfig,
-} = require('./utils');
+  getPathsInside,
+  getRoutes,
+  stringMap,
+} from './utils';
 
-/** @typedef { import('@now/build-utils/file-ref').Files } Files */
-/** @typedef { import('@now/build-utils/fs/download').DownloadedFiles } DownloadedFiles */
+interface BuildParamsMeta {
+  isDev: boolean | undefined,
+  requestPath: string | undefined,
+};
 
-/**
- * @typedef {Object} BuildParamsMeta
- * @property {boolean} [isDev] - Files object
- * @property {?string} [requestPath] - Entrypoint specified for the builder
- */
+interface BuildParamsType extends BuildOptions {
+  files: Files,
+  entrypoint: string,
+  workPath: string,
+  meta: BuildParamsMeta,
+};
 
-/**
- * @typedef {Object} BuildParamsType
- * @property {Files} files - Files object
- * @property {string} entrypoint - Entrypoint specified for the builder
- * @property {string} workPath - Working directory for this build
- * @property {BuildParamsMeta} [meta] - Various meta settings
- */
+export const version = 2;
 
 /**
  * Read package.json from files
- * @param {string} entryPath
  */
-async function readPackageJson(entryPath) {
+async function readPackageJson(entryPath: string) {
   const packagePath = path.join(entryPath, 'package.json');
 
   try {
@@ -62,10 +65,8 @@ async function readPackageJson(entryPath) {
 
 /**
  * Write package.json
- * @param {string} workPath
- * @param {Object} packageJson
  */
-async function writePackageJson(workPath, packageJson) {
+async function writePackageJson(workPath: string, packageJson: Object) {
   await writeFile(
     path.join(workPath, 'package.json'),
     JSON.stringify(packageJson, null, 2),
@@ -74,17 +75,15 @@ async function writePackageJson(workPath, packageJson) {
 
 /**
  * Write .npmrc with npm auth token
- * @param {string} workPath
- * @param {string} token
  */
-async function writeNpmRc(workPath, token) {
+async function writeNpmRc(workPath: string, token: string) {
   await writeFile(
     path.join(workPath, '.npmrc'),
     `//registry.npmjs.org/:_authToken=${token}`,
   );
 }
 
-function getNextVersion(packageJson) {
+function getNextVersion(packageJson: {dependencies?: {[key: string]: string},devDependencies?: {[key:string]:string}}) {
   let nextVersion;
   if (packageJson.dependencies && packageJson.dependencies.next) {
     nextVersion = packageJson.dependencies.next;
@@ -94,7 +93,7 @@ function getNextVersion(packageJson) {
   return nextVersion;
 }
 
-function isLegacyNext(nextVersion) {
+function isLegacyNext(nextVersion: string) {
   // If version is using the dist-tag instead of a version range
   if (nextVersion === 'canary' || nextVersion === 'latest') {
     return false;
@@ -114,73 +113,80 @@ function isLegacyNext(nextVersion) {
   return true;
 }
 
-function setNextExperimentalPage(files, entry, meta) {
-  if (meta.requestPath) {
-    if (meta.requestPath.startsWith(path.join(entry, 'static'))) {
-      return onlyStaticDirectory(
-        includeOnlyEntryDirectory(files, entry),
-        entry,
-      );
-    }
+const name = '[@now/next]';
+const urls: stringMap = {};
 
-    const { pathname } = url.parse(meta.requestPath);
-    const assetPath = pathname.match(
-      /^\/?_next\/static\/[^/]+\/pages\/(.+)\.js$/,
+async function startDevServer(entryPath: string): Promise<string> {
+  const forked = fork(path.join(__dirname, 'dev-server.js'), [], {
+    cwd: entryPath,
+    env: {
+      ENTRY_PATH: entryPath,
+      NOW_REGION: 'dev1'
+    },
+    silent: true
+  });
+
+  return new Promise(resolve => {
+    forked.on('message', resolve);
+  });
+}
+
+export const config = {
+  maxLambdaSize: '5mb',
+};
+
+export const build = async ({
+  files, workPath, entrypoint, meta = {} as BuildParamsMeta,
+}: BuildParamsType): Promise<{routes?: any[], output: Files, watch?: string[]}> => {
+  validateEntrypoint(entrypoint);
+
+  const routes: any[] = [];
+  const entryDirectory = path.dirname(entrypoint);
+  const entryPath = path.join(workPath, entryDirectory);
+  const dotNext = path.join(entryPath, '.next');
+  const uponRequest = typeof meta.requestPath === 'string';
+
+  if ((meta.isDev && !uponRequest) || !meta.isDev) {
+    console.log(`${name} Downloading user files...`);
+    await download(files, workPath);
+  }
+
+  const pkg = await readPackageJson(entryPath);
+  const nextVersion = getNextVersion(pkg);
+
+  if (!nextVersion) {
+    throw new Error(
+      'No Next.js version could be detected in "package.json". Make sure `"next"` is installed in "dependencies" or "devDependencies"',
     );
-    // eslint-disable-next-line no-underscore-dangle
-    process.env.__NEXT_BUILDER_EXPERIMENTAL_PAGE = assetPath
-      ? assetPath[1]
-      : pathname;
   }
 
   if (meta.isDev) {
     // eslint-disable-next-line no-underscore-dangle
     process.env.__NEXT_BUILDER_EXPERIMENTAL_DEBUG = 'true';
+
+    console.log(`${name} Requested ${meta.requestPath || '/'}`);
+
+    // If this is the initial build, we want to start the server
+    if (!urls[entrypoint]) {
+      console.log(`${name} Installing dependencies...`);
+      await runNpmInstall(entryPath, ['--prefer-offline']);
+
+      urls[entrypoint] = await startDevServer(entryPath);
+      console.log(`${name} Development server for ${entrypoint} running at ${urls[entrypoint]}`);
+    }
+
+    const pathsInside = getPathsInside(entryDirectory, files)
+
+    return {
+      output: {},
+      routes: getRoutes(entryDirectory, pathsInside, files, urls[entrypoint]),
+      watch: pathsInside
+    };
   }
 
-  return null;
-}
-
-exports.config = {
-  maxLambdaSize: '5mb',
-};
-
-/**
- * @param {BuildParamsType} buildParams
- * @returns {Promise<Files>}
- */
-exports.build = async ({
-  files, workPath, entrypoint, meta = {},
-}) => {
-  validateEntrypoint(entrypoint);
-
-  const entryDirectory = path.dirname(entrypoint);
-  const maybeStaticFiles = setNextExperimentalPage(files, entryDirectory, meta);
-  if (maybeStaticFiles) return maybeStaticFiles; // return early if requestPath is static file
-
-  console.log('downloading user files...');
-  await download(files, workPath);
-  const entryPath = path.join(workPath, entryDirectory);
-  const dotNext = path.join(entryPath, '.next');
-
   if (await pathExists(dotNext)) {
-    if (meta.isDev) {
-      await removePath(dotNext).catch((e) => {
-        if (e.code !== 'ENOENT') throw e;
-      });
-    } else {
-      console.warn(
-        'WARNING: You should probably not upload the `.next` directory. See https://zeit.co/docs/v2/deployments/official-builders/next-js-now-next/ for more information.',
-      );
-    }
-  }
-
-  const pkg = await readPackageJson(entryPath);
-
-  let nextVersion = getNextVersion(pkg);
-  if (!nextVersion) {
-    throw new Error(
-      'No Next.js version could be detected in "package.json". Make sure `"next"` is installed in "dependencies" or "devDependencies"',
+    console.warn(
+      'WARNING: You should not upload the `.next` directory. See https://zeit.co/docs/v2/deployments/official-builders/next-js-now-next/ for more details.',
     );
   }
 
@@ -229,28 +235,6 @@ exports.build = async ({
   console.log('installing dependencies...');
   await runNpmInstall(entryPath, ['--prefer-offline']);
 
-  nextVersion = JSON.parse(
-    await readFile(resolveFrom(entryPath, 'next/package.json'), 'utf8'),
-  ).version;
-
-  const isUpdated = (v) => {
-    if (v === 'canary') return true;
-
-    try {
-      return semver.satisfies(v, '>=8.0.5-canary.14', {
-        includePrerelease: true,
-      });
-    } catch (e) {
-      return false;
-    }
-  };
-
-  if ((meta.isDev || meta.requestPath) && !isUpdated(nextVersion)) {
-    throw new Error(
-      '`now dev` can only be used with Next.js >=8.0.5-canary.14!',
-    );
-  }
-
   console.log('running user script...');
   await runPackageJsonScript(entryPath, 'now-build');
 
@@ -263,13 +247,13 @@ exports.build = async ({
     await unlinkFile(path.join(entryPath, '.npmrc'));
   }
 
-  const lambdas = {};
+  const lambdas: {[key: string]: Lambda} = {};
 
   if (isLegacy) {
     const filesAfterBuild = await glob('**', entryPath);
 
     console.log('preparing lambda files...');
-    let buildId;
+    let buildId: string;
     try {
       buildId = await readFile(
         path.join(entryPath, '.next', 'BUILD_ID'),
@@ -290,7 +274,7 @@ exports.build = async ({
     const launcherFiles = {
       'now__bridge.js': new FileFsRef({ fsPath: require('@now/node-bridge') }),
     };
-    const nextFiles = {
+    const nextFiles: {[key: string]: FileFsRef} = {
       ...nodeModules,
       ...dotNextRootFiles,
       ...dotNextServerRootFiles,
@@ -429,16 +413,21 @@ exports.build = async ({
     entryDirectory,
   );
 
-  return { ...lambdas, ...staticFiles, ...staticDirectoryFiles };
+  return {
+    output: { ...lambdas, ...staticFiles, ...staticDirectoryFiles },
+    routes: [],
+    watch: []
+  };
 };
 
-exports.prepareCache = async ({ workPath, entrypoint }) => {
+export const prepareCache = async ({ workPath, entrypoint }: PrepareCacheOptions) => {
   console.log('preparing cache ...');
   const entryDirectory = path.dirname(entrypoint);
   const entryPath = path.join(workPath, entryDirectory);
 
   const pkg = await readPackageJson(entryPath);
   const nextVersion = getNextVersion(pkg);
+  if (!nextVersion) throw new Error('Could not parse Next.js version')
   const isLegacy = isLegacyNext(nextVersion);
 
   if (isLegacy) {
@@ -457,22 +446,3 @@ exports.prepareCache = async ({ workPath, entrypoint }) => {
   console.log('cache file manifest produced');
   return cache;
 };
-
-exports.subscribe = async ({ entrypoint, files }) => {
-  const entryDirectory = path.dirname(entrypoint);
-  const pageFiles = includeOnlyEntryDirectory(
-    files,
-    path.join(entryDirectory, 'pages'),
-  );
-
-  return [
-    path.join(entryDirectory, '_next/static/unoptimized-build/pages/**'),
-    path.join(entryDirectory, 'static/**'),
-    // List all pages without their extensions
-    ...Object.keys(pageFiles).map(page => page
-      .replace(/^pages\//i, '')
-      .split('.')
-      .slice(0, -1)
-      .join('.')),
-  ];
-};

packages/now-next/src/legacy-launcher.ts

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

packages/now-next/src/legacy-versions.ts

@@ -1,4 +1,4 @@
-module.exports = [
+export default [
   '0.1.0',
   '0.1.1',
   '0.2.0',

packages/now-next/src/utils.ts

@@ -1,16 +1,13 @@
-const fs = require('fs-extra');
-const path = require('path');
+import fs from 'fs-extra';
+import path from 'path';
+import { Files } from '@now/build-utils';
 
-/** @typedef { import('@now/build-utils/file-ref') } FileRef */
-/** @typedef { import('@now/build-utils/file-fs-ref') } FileFsRef */
-/** @typedef {{[filePath: string]: FileRef|FileFsRef}} Files */
+type stringMap = {[key: string]: string};
 
 /**
  * Validate if the entrypoint is allowed to be used
- * @param {string} entrypoint
- * @throws {Error}
  */
-function validateEntrypoint(entrypoint) {
+function validateEntrypoint(entrypoint: string) {
   if (
     !/package\.json$/.exec(entrypoint)
     && !/next\.config\.js$/.exec(entrypoint)
@@ -21,21 +18,10 @@ function validateEntrypoint(entrypoint) {
   }
 }
 
-/**
- * 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) {
+function excludeFiles(files: Files, matcher: (filePath: string) => boolean): Files {
   return Object.keys(files).reduce((newFiles, filePath) => {
     if (matcher(filePath)) {
       return newFiles;
@@ -49,16 +35,13 @@ function excludeFiles(files, matcher) {
 
 /**
  * Creates a new Files object holding only the entrypoint files
- * @param {Files} files
- * @param {string} entryDirectory
- * @returns {Files}
  */
-function includeOnlyEntryDirectory(files, entryDirectory) {
+function includeOnlyEntryDirectory(files: Files, entryDirectory: string): Files {
   if (entryDirectory === '.') {
     return files;
   }
 
-  function matcher(filePath) {
+  function matcher(filePath: string) {
     return !filePath.startsWith(entryDirectory);
   }
 
@@ -67,10 +50,8 @@ function includeOnlyEntryDirectory(files, entryDirectory) {
 
 /**
  * Exclude package manager lockfiles from files
- * @param {Files} files
- * @returns {Files}
  */
-function excludeLockFiles(files) {
+function excludeLockFiles(files: Files): Files {
   const newFiles = files;
   if (newFiles['package-lock.json']) {
     delete newFiles['package-lock.json'];
@@ -83,11 +64,9 @@ function excludeLockFiles(files) {
 
 /**
  * Include the static directory from files
- * @param {Files} files
- * @returns {Files}
  */
-function onlyStaticDirectory(files, entryDir) {
-  function matcher(filePath) {
+function onlyStaticDirectory(files: Files, entryDir: string): Files {
+  function matcher(filePath: string) {
     return !filePath.startsWith(path.join(entryDir, 'static'));
   }
 
@@ -96,11 +75,10 @@ function onlyStaticDirectory(files, entryDir) {
 
 /**
  * Enforce specific package.json configuration for smallest possible lambda
- * @param {{dependencies?: any, devDependencies?: any, scripts?: any}} defaultPackageJson
  */
-function normalizePackageJson(defaultPackageJson = {}) {
-  const dependencies = {};
-  const devDependencies = {
+function normalizePackageJson(defaultPackageJson: {dependencies?: stringMap, devDependencies?: stringMap, scripts?: stringMap} = {}) {
+  const dependencies: stringMap = {};
+  const devDependencies: stringMap = {
     ...defaultPackageJson.dependencies,
     ...defaultPackageJson.devDependencies,
   };
@@ -139,7 +117,7 @@ function normalizePackageJson(defaultPackageJson = {}) {
   };
 }
 
-async function getNextConfig(workPath, entryPath) {
+async function getNextConfig(workPath: string, entryPath: string) {
   const entryConfig = path.join(entryPath, './next.config.js');
   if (await fs.pathExists(entryConfig)) {
     return fs.readFile(entryConfig, 'utf8');
@@ -153,7 +131,84 @@ async function getNextConfig(workPath, entryPath) {
   return null;
 }
 
-module.exports = {
+function pathIsInside(firstPath: string, secondPath: string) {
+  return !path.relative(firstPath, secondPath).startsWith('..');
+}
+
+function getPathsInside(entryDirectory: string, files: Files) {
+  const watch: string[] = [];
+
+  for (const file of Object.keys(files)) {
+    // If the file is outside of the entrypoint directory, we do
+    // not want to monitor it for changes.
+    if (!pathIsInside(entryDirectory, file)) {
+      continue;
+    }
+
+    watch.push(file);
+  }
+
+  return watch;
+}
+
+function getRoutes(entryDirectory: string, pathsInside: string[], files: Files, url: string): any[] {
+  const filesInside: Files = {};
+  const prefix = entryDirectory === `.` ? `/` : `/${entryDirectory}/`;
+
+  for (const file of Object.keys(files)) {
+    if (!pathsInside.includes(file)) {
+      continue;
+    }
+
+    filesInside[file] = files[file];
+  }
+
+  const routes: any[] = [
+    {
+      src: `${prefix}_next/(.*)`,
+      dest: `${url}/_next/$1`
+    },
+    {
+      src: `${prefix}static/(.*)`,
+      dest: `${url}/static/$1`
+    }
+  ];
+
+  for (const file of Object.keys(filesInside)) {
+    const relativePath = path.relative(entryDirectory, file);
+    const isPage = pathIsInside('pages', relativePath);
+
+    if (!isPage) {
+      continue;
+    }
+
+    const relativeToPages = path.relative('pages', relativePath);
+    const extension = path.extname(relativeToPages);
+    const pageName = relativeToPages.replace(extension, '');
+
+    if (pageName.startsWith('_')) {
+      continue;
+    }
+
+    routes.push({
+      src: `${prefix}${pageName}`,
+      dest: `${url}/${pageName}`
+    });
+
+    if (pageName.endsWith('index')) {
+      const resolvedIndex = pageName.replace('/index', '').replace('index', '');
+
+      routes.push({
+        src: `${prefix}${resolvedIndex}`,
+        dest: `${url}/${resolvedIndex}`
+      });
+    }
+  }
+
+  return routes;
+}
+
+export {
   excludeFiles,
   validateEntrypoint,
   includeOnlyEntryDirectory,
@@ -161,4 +216,7 @@ module.exports = {
   normalizePackageJson,
   onlyStaticDirectory,
   getNextConfig,
+  getPathsInside,
+  getRoutes,
+  stringMap,
 };

packages/now-next/test/integration/index.test.js

@@ -1,17 +1,17 @@
 /* global it, expect */
 const path = require('path');
-const runBuildLambda = require('../../lib/run-build-lambda');
+const runBuildLambda = require('../../../../test/lib/run-build-lambda');
 
 const FOUR_MINUTES = 240000;
 
 it(
   'Should build the standard example',
   async () => {
-    const { buildResult } = await runBuildLambda(
-      path.join(__dirname, 'standard'),
-    );
-    expect(buildResult.index).toBeDefined();
-    const filePaths = Object.keys(buildResult);
+    const {
+      buildResult: { output },
+    } = await runBuildLambda(path.join(__dirname, 'standard'));
+    expect(output.index).toBeDefined();
+    const filePaths = Object.keys(output);
     const hasUnderScoreAppStaticFile = filePaths.some(filePath => filePath.match(/static.*\/pages\/_app\.js$/));
     const hasUnderScoreErrorStaticFile = filePaths.some(filePath => filePath.match(/static.*\/pages\/_error\.js$/));
     expect(hasUnderScoreAppStaticFile).toBeTruthy();
@@ -23,12 +23,12 @@ it(
 it(
   'Should build the monorepo example',
   async () => {
-    const { buildResult } = await runBuildLambda(
-      path.join(__dirname, 'monorepo'),
-    );
-    expect(buildResult['www/index']).toBeDefined();
-    expect(buildResult['www/static/test.txt']).toBeDefined();
-    const filePaths = Object.keys(buildResult);
+    const {
+      buildResult: { output },
+    } = await runBuildLambda(path.join(__dirname, 'monorepo'));
+    expect(output['www/index']).toBeDefined();
+    expect(output['www/static/test.txt']).toBeDefined();
+    const filePaths = Object.keys(output);
     const hasUnderScoreAppStaticFile = filePaths.some(filePath => filePath.match(/static.*\/pages\/_app\.js$/));
     const hasUnderScoreErrorStaticFile = filePaths.some(filePath => filePath.match(/static.*\/pages\/_error\.js$/));
     expect(hasUnderScoreAppStaticFile).toBeTruthy();
@@ -40,11 +40,11 @@ it(
 it(
   'Should build the legacy standard example',
   async () => {
-    const { buildResult } = await runBuildLambda(
-      path.join(__dirname, 'legacy-standard'),
-    );
-    expect(buildResult.index).toBeDefined();
-    const filePaths = Object.keys(buildResult);
+    const {
+      buildResult: { output },
+    } = await runBuildLambda(path.join(__dirname, 'legacy-standard'));
+    expect(output.index).toBeDefined();
+    const filePaths = Object.keys(output);
     const hasUnderScoreAppStaticFile = filePaths.some(filePath => filePath.match(/static.*\/pages\/_app\.js$/));
     const hasUnderScoreErrorStaticFile = filePaths.some(filePath => filePath.match(/static.*\/pages\/_error\.js$/));
     expect(hasUnderScoreAppStaticFile).toBeTruthy();
@@ -56,10 +56,10 @@ it(
 it(
   'Should build the legacy custom dependency test',
   async () => {
-    const { buildResult } = await runBuildLambda(
-      path.join(__dirname, 'legacy-custom-dependency'),
-    );
-    expect(buildResult.index).toBeDefined();
+    const {
+      buildResult: { output },
+    } = await runBuildLambda(path.join(__dirname, 'legacy-custom-dependency'));
+    expect(output.index).toBeDefined();
   },
   FOUR_MINUTES,
 );
@@ -78,10 +78,10 @@ it('Should throw when package.json or next.config.js is not the "src"', async ()
 it(
   'Should build the static-files test on legacy',
   async () => {
-    const { buildResult } = await runBuildLambda(
-      path.join(__dirname, 'legacy-static-files'),
-    );
-    expect(buildResult['static/test.txt']).toBeDefined();
+    const {
+      buildResult: { output },
+    } = await runBuildLambda(path.join(__dirname, 'legacy-static-files'));
+    expect(output['static/test.txt']).toBeDefined();
   },
   FOUR_MINUTES,
 );
@@ -89,10 +89,10 @@ it(
 it(
   'Should build the static-files test',
   async () => {
-    const { buildResult } = await runBuildLambda(
-      path.join(__dirname, 'static-files'),
-    );
-    expect(buildResult['static/test.txt']).toBeDefined();
+    const {
+      buildResult: { output },
+    } = await runBuildLambda(path.join(__dirname, 'static-files'));
+    expect(output['static/test.txt']).toBeDefined();
   },
   FOUR_MINUTES,
 );

packages/now-next/test/unit/utils.test.js

@@ -5,7 +5,7 @@ const {
   includeOnlyEntryDirectory,
   normalizePackageJson,
   getNextConfig,
-} = require('@now/next/utils');
+} = require('@now/next/dist/utils');
 const FileRef = require('@now/build-utils/file-ref'); // eslint-disable-line import/no-extraneous-dependencies
 
 describe('getNextConfig', () => {

packages/now-next/tsconfig.json

@@ -1,20 +1,18 @@
 {
   "compilerOptions": {
-    "target": "ES2017",
+    "strict": true,
+    "esModuleInterop": true,
+    "lib": ["esnext"],
+    "target": "esnext",
     "module": "commonjs",
-    "lib": ["es2017"],
-    "allowJs": true,
-    "checkJs": true,
-    "noEmit": true,
-    "strict": false,
-    "types": ["node"],
-    "esModuleInterop": true
+    "outDir": "dist",
+    "sourceMap": false,
+    "declaration": false
   },
   "include": [
-    "./"
+    "src/**/*"
   ],
   "exclude": [
-    "./launcher.js",
-    "./legacy-launcher.js"
+    "node_modules"
   ]
 }

packages/now-node-server/index.js

@@ -43,7 +43,10 @@ async function compile(workPath, downloadedFiles, entrypoint, config) {
   const input = downloadedFiles[entrypoint].fsPath;
   const inputDir = path.dirname(input);
   const ncc = require('@zeit/ncc');
-  const { code, assets } = await ncc(input, { sourceMap: true });
+  const { code, map, assets } = await ncc(input, {
+    sourceMap: true,
+    sourceMapRegister: true,
+  });
 
   if (config && config.includeFiles) {
     // eslint-disable-next-line no-restricted-syntax
@@ -67,16 +70,16 @@ async function compile(workPath, downloadedFiles, entrypoint, config) {
   }
 
   const preparedFiles = {};
-  const blob = new FileBlob({ data: code });
   // move all user code to 'user' subdirectory
-  preparedFiles[entrypoint] = blob;
+  preparedFiles[entrypoint] = new FileBlob({ data: code });
+  preparedFiles[`${entrypoint.replace('.ts', '.js')}.map`] = new FileBlob({
+    data: map,
+  });
   // 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(path.dirname(entrypoint), assetName)
-    ] = blob2;
+    preparedFiles[path.join(path.dirname(entrypoint), assetName)] = blob2;
   }
 
   return preparedFiles;
@@ -93,10 +96,7 @@ exports.config = {
 exports.build = async ({
   files, entrypoint, config, workPath,
 }) => {
-  const [
-    downloadedFiles,
-    entrypointFsDirname,
-  ] = await downloadInstallAndBundle(
+  const [downloadedFiles, entrypointFsDirname] = await downloadInstallAndBundle(
     { files, entrypoint, workPath },
     { npmArguments: ['--prefer-offline'] },
   );
@@ -123,9 +123,7 @@ exports.build = async ({
   let launcherData = await fs.readFile(launcherPath, 'utf8');
   launcherData = launcherData.replace(
     '// PLACEHOLDER',
-    [
-      `require("./${entrypoint}");`,
-    ].join(' '),
+    [`require("./${entrypoint}");`].join(' '),
   );
 
   const launcherFiles = {

packages/now-node-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/node-server",
-  "version": "0.5.4-canary.3",
+  "version": "0.5.4-canary.5",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@now/node-bridge": "^1.0.2-canary.2",
-    "@zeit/ncc": "0.17.3",
+    "@zeit/ncc": "0.18.1",
     "fs-extra": "7.0.1"
   },
   "scripts": {

packages/now-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/node",
-  "version": "0.5.4-canary.4",
+  "version": "0.5.4-canary.6",
   "license": "MIT",
   "main": "./dist/index",
   "repository": {
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@now/node-bridge": "^1.0.2-canary.2",
-    "@zeit/ncc": "0.17.3",
+    "@zeit/ncc": "0.18.1",
     "fs-extra": "7.0.1"
   },
   "scripts": {

packages/now-node/src/index.ts

@@ -46,7 +46,7 @@ async function compile(entrypointPath: string, entrypoint: string, config: Compi
   const inputDir = dirname(input);
   const rootIncludeFiles = inputDir.split(sep).pop() || '';
   const ncc = require('@zeit/ncc');
-  const { code, assets } = await ncc(input);
+  const { code, map, assets } = await ncc(input, { sourceMap: true, sourceMapRegister: true });
 
   if (config && config.includeFiles) {
     for (const pattern of config.includeFiles) {
@@ -73,9 +73,9 @@ async function compile(entrypointPath: string, entrypoint: string, config: Compi
   }
 
   const preparedFiles: Files = {};
-  const blob = new FileBlob({ data: code });
   // move all user code to 'user' subdirectory
-  preparedFiles[entrypoint] = blob;
+  preparedFiles[entrypoint] = new FileBlob({ data: code });
+  preparedFiles[`${entrypoint.replace('.ts', '.js')}.map`] = new FileBlob({ data: map });
   // eslint-disable-next-line no-restricted-syntax
   for (const assetName of Object.keys(assets)) {
     const { source: data, permissions: mode } = assets[assetName];

packages/now-node/test/fixtures/13-stack-trace/index.js

@@ -0,0 +1,10 @@
+module.exports = (req, res) => {
+  try {
+    if (req) {
+      throw new Error(`Should throw ${process.env.RANDOMNESS_ENV_VAR}`);
+    }
+    res.end(`Should not print ${process.env.RANDOMNESS_ENV_VAR}`);
+  } catch (error) {
+    res.end(error.stack);
+  }
+};

packages/now-node/test/fixtures/13-stack-trace/now.json

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

packages/now-node/test/fixtures/14-stack-trace-ts/index.ts

@@ -0,0 +1,10 @@
+export default function handler (req: any, res: any) {
+  try {
+    if (req) {
+      throw new Error(`Should throw`);
+    }
+    res.end(`Should not print`);
+  } catch (error) {
+    res.end(error.stack);
+  }
+}

packages/now-node/test/fixtures/14-stack-trace-ts/now.json

@@ -0,0 +1,12 @@
+{
+  "version": 2,
+  "builds": [
+    { "src": "index.ts", "use": "@now/node" }
+  ],
+  "probes": [
+    {
+      "path": "/",
+      "mustContain": "index.ts:4"
+    }
+  ]
+}

packages/now-node/test/fixtures/14-stack-trace-ts/tsconfig.json

@@ -0,0 +1,14 @@
+{
+    "compilerOptions": {
+      "strict": true,
+      "esModuleInterop": true,
+      "sourceMap": true,
+      "lib": ["esnext"],
+      "target": "esnext",
+      "module": "commonjs"
+    },
+    "include": [
+      "index.ts"
+    ]
+  }
+  

packages/now-optipng/.gitignore

@@ -0,0 +1,2 @@
+# build output
+/dist

packages/now-optipng/index.js

@@ -1,15 +0,0 @@
-const FileBlob = require('@now/build-utils/file-blob.js'); // eslint-disable-line import/no-extraneous-dependencies
-const OptiPng = require('optipng');
-const pipe = require('multipipe');
-
-exports.analyze = ({ files, entrypoint }) => files[entrypoint].digest;
-
-exports.build = async ({ files, entrypoint }) => {
-  const optimizer = new OptiPng(['-o9']);
-  const stream = pipe(
-    files[entrypoint].toStream(),
-    optimizer,
-  );
-  const result = await FileBlob.fromStream({ stream });
-  return { [entrypoint]: result };
-};

packages/now-optipng/package.json

@@ -1,7 +1,15 @@
 {
   "name": "@now/optipng",
-  "version": "0.4.9-canary.0",
+  "version": "0.4.9-canary.1",
   "license": "MIT",
+  "main": "./dist/index",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "tsc",
+    "test": "tsc && jest"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/zeit/now-builders.git",
@@ -10,5 +18,9 @@
   "dependencies": {
     "multipipe": "2.0.3",
     "optipng": "1.1.0"
+  },
+  "devDependencies": {
+    "@types/node": "11.9.4",
+    "typescript": "3.3.3"
   }
 }

packages/now-optipng/src/index.ts

@@ -0,0 +1,22 @@
+// eslint-disable-line import/no-extraneous-dependencies
+import { 
+  FileBlob,
+  BuildOptions,
+  AnalyzeOptions
+} from '@now/build-utils'
+import OptiPng from 'optipng'
+import pipe from 'multipipe'
+
+export function analyze({ files, entrypoint }: AnalyzeOptions) {
+  return files[entrypoint].digest;
+}
+
+export async function build({ files, entrypoint }: BuildOptions) {
+  const optimizer = new OptiPng(['-o9']);
+  const stream = pipe(
+    files[entrypoint].toStream(),
+    optimizer
+  );
+  const result = await FileBlob.fromStream({ stream });
+  return { [entrypoint]: result };
+}

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

@@ -0,0 +1,11 @@
+{
+    "version": 2,
+    "builds": [
+        { "src": "showcase.png", "use": "@now/optipng" },
+        { "src": "subdirectory/naruto.png", "use": "@now/optipng" }
+    ],
+    "probes": [
+        { "path": "/", "mustContain": "showcase.png" },
+        { "path": "/", "mustContain": "subdirectory" }
+    ]
+}

packages/now-optipng/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-optipng/tsconfig.json

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

packages/now-optipng/types/multipipe.d.ts

@@ -0,0 +1,7 @@
+// Type definitios for [multipipe] [v0.0.1]
+// Project: now-optipng
+// Definitions by: [Markoz Peña Mendez]
+
+export = pipe;
+
+declare function pipe(...streams: any[]): NodeJS.ReadableStream;

packages/now-optipng/types/optipng.d.ts

@@ -0,0 +1,10 @@
+// Type definitios for [optipng] [v0.0.1]
+// Project: now-optipng
+// Definitions by: [Markoz Peña Mendez]
+
+export = OptiPng;
+
+declare class OptiPng {
+    constructor(bindArgs: string[]);
+    bindArgs: string[];
+}

test/lib/deployment/now-deploy.js

@@ -96,6 +96,8 @@ async function deploymentPost (payload) {
     method: 'POST',
     body: JSON.stringify(payload)
   });
+
+  console.log(`fetch status: ${resp.status} ${resp.statusText}`);
   const json = await resp.json();
 
   if (json.error) {
@@ -125,8 +127,7 @@ async function fetchWithAuth (url, opts = {}) {
       if (NOW_TOKEN) {
         token = NOW_TOKEN;
       } else if (NOW_TOKEN_FACTORY_URL) {
-        const resp = await fetch(NOW_TOKEN_FACTORY_URL);
-        token = (await resp.json()).token;
+        token = await fetchTokenWithRetry(NOW_TOKEN_FACTORY_URL);
       } else {
         const authJsonPath = path.join(homedir(), '.now/auth.json');
         token = require(authJsonPath).token;
@@ -139,6 +140,27 @@ async function fetchWithAuth (url, opts = {}) {
   return await fetchApi(url, opts);
 }
 
+function fetchTokenWithRetry (url, retries = 3) {
+  return new Promise(async (resolve, reject) => {
+    try {
+      const res = await fetch(url);
+      const data = await res.json();
+      resolve(data.token);
+    } catch (error) {
+      console.log(`Failed to fetch token. Retries remaining: ${retries}`);
+      if (retries === 0) {
+        reject(error);
+        return;
+      }
+      setTimeout(() => {
+        fetchTokenWithRetry(url, retries - 1)
+          .then(resolve)
+          .catch(reject);
+      }, 500);
+    }
+  });
+}
+
 async function fetchApi (url, opts = {}) {
   const apiHost = process.env.API_HOST || 'api.zeit.co';
   const urlWithHost = `https://${apiHost}${url}`;

test/lib/deployment/test-deployment.js

@@ -77,7 +77,7 @@ async function testDeployment (
   bodies['now.json'] = Buffer.from(JSON.stringify(nowJson));
   delete bodies['probe.js'];
   const { deploymentId, deploymentUrl } = await nowDeploy(bodies, randomness);
-  console.log('deploymentUrl', deploymentUrl);
+  console.log('deploymentUrl', `https://${deploymentUrl}`);
 
   for (const probe of nowJson.probes || []) {
     console.log('testing', JSON.stringify(probe));