Publish Stable

- @now/next@2.3.3

packages/frameworks/frameworks.json

@@ -351,6 +351,7 @@
   {
     "name": "mdx-deck",
     "slug": "mdx-deck",
+    "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/mdx-deck.svg",
     "tagline": "MDX Deck allows you to swiftly create React MDX-based presentation decks.",
     "website": "https://github.com/jxnblk/mdx-deck"
   },
@@ -363,6 +364,7 @@
   {
     "name": "VuePress",
     "slug": "vuepress",
+    "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/vuepress.png",
     "tagline": "VuePress is the performant way to create static sites with Vue.js."
   },
   {
@@ -374,11 +376,13 @@
   {
     "name": "Riot.js",
     "slug": "riot",
+    "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/riot.svg",
     "tagline": "Riot.js lets you build user interfaces with custom tags using simple and enjoyable syntax."
   },
   {
     "name": "Marko.js",
     "slug": "marko",
+    "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/marko.png",
     "tagline": "Marko is a super fast UI library that makes building web apps fun."
   },
   {
@@ -390,6 +394,7 @@
   {
     "name": "Metalsmith",
     "slug": "metalsmith",
+    "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/metalsmith.png",
     "tagline": "Metalsmith is an extremely simple, extendable static site generator."
   },
   {
@@ -407,6 +412,7 @@
   {
     "name": "Pelican",
     "slug": "pelican",
+    "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/pelican.png",
     "tagline": "Pelican is a versatile static site generator, written in Python."
   },
   {
@@ -430,6 +436,7 @@
   {
     "name": "Foundation",
     "slug": "foundation",
+    "logo": "https://raw.githubusercontent.com/zeit/now/master/packages/frameworks/logos/foundation.svg",
     "tagline": "Foundation is the most advanced responsive front-end framework in the world."
   }
 ]

packages/frameworks/logos/foundation.svg

@@ -0,0 +1,73 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="483" height="400">
+  <path fill="#EAF7FE" d="M316 92l15-18c-10-11-30-9-30-9l12-14-20-8c3-9 13-17 13-17-37-14-64 3-64 3 2-9 14-22 14-22-37 2-65 32-65 32 0-5 4-19 4-19s-20 14-31 35c-4 7-19 61-21 73 0 0-5-2-10-1 0 0 7 10 8 14s-7 33-10 38-7 7-9 8c0 0 3 5 6 6 0 0-1 16-3 20s-8 9-10 11c0 0 6 7 10 7l-6 10c-2 2-5-2-5-2l1 8c1 3 0 7-1 9s-5 15-6 21 1 11 1 11 2-3 4-4c0 0 0 13 3 19l9 13s-1-4 1-6c0 0 3 11 18 13 33 5 56 11 94-11 35-21 31-96 42-144 5-23 17-45 27-62 7-8 18-14 18-14h-9z"/>
+  <ellipse cx="248" cy="377" fill="#E5E5E5" rx="230" ry="17"/>
+  <path fill="#A1D4E9" d="M83 369l1-5c0-5 1-11 5-16l-3 1c5-6 10-10 13-11l-3-1c3-2 11-3 18-4l-3-2 13 1 21-4-2-6c8 0 20 2 23 3 2 0 3 5 4 5 0 0 20-11 20 8l-1 36-16-1h-28l-43 1v-2H92v-2-2l-9 1z"/>
+  <path fill="#85C1CE" d="M92 368h-4c0-24 24-30 24-30-21 8-20 27-20 30zM97 363l6-9c8-11 22-12 22-12-25 5-23 30-23 30h-4l1-9h-2z"/>
+  <path fill="#4F4E51" d="M162 82c-22-8-34-30-34-30s-6 16 1 33c6 12 19 20 26 24l7-27z"/>
+  <path fill="#5C5B5D" d="M162 82c-22-8-34-30-34-30s2 30 30 43l4-13z"/>
+  <g fill="#A1D4E9">
+    <path d="M128 208l-8-8c-4-7-5-15-5-15-2 2-2 6-2 7a55 55 0 00-13-9l-8 1 3 61 21 10s20-31 12-47zM95 181l-12-5s4 3 3 6c0 2 3 2 6 2v-4l3 1z"/>
+    <path d="M95 181l-4-1 1 4 8-1-5-2z"/>
+  </g>
+  <path fill="#CDEAF5" d="M183 64c13-22 56-42 64-45l9-12c-37 2-65 32-65 32 0-5 4-19 4-19s-20 14-31 35c-4 7-19 61-21 73 0 0-5-2-10-1 0 0 7 10 8 14s-7 33-10 38-7 7-9 8c0 0 3 5 6 6 0 0-1 16-3 20s-8 9-10 11c0 0 5 7 9 8l-5 9c-2 2-5-2-5-2l1 8c1 3 0 7-1 9s-5 15-6 21 1 11 1 11 2-3 4-4c0 0 0 13 3 19l9 13s-1-2 1-4c0 0 4 9 19 14 12 4 22 5 36 1 9-3 15-13 15-13-62 20-80-22-73-49 4-13 19-35 19-35-7 2-11-5-11-5s3 0 9-6c5-5 4-34 4-34l-6 1c1 0 2-1 6-10l-3-1v-1c2-6 1-13 3-19l2-5h6l4-17c12-54 25-85 25-85-2 6 2 16 2 16z"/>
+  <path fill="#5D5C5E" d="M120 235c1 2 1 5-1 6l-38 28c-2 2-5 2-6 0l-56-74c-1-2-1-5 1-6l38-29c2-1 5-1 6 1l56 74z"/>
+  <path fill="none" stroke="#738083" stroke-miterlimit="10" stroke-width="2" d="M120 235c1 2 1 5-1 6l-38 28c-2 2-5 2-6 0l-56-74c-1-2-1-5 1-6l38-29c2-1 5-1 6 1l56 74z"/>
+  <path fill="#747F84" d="M109 229l-38 28-41-54 38-29z"/>
+  <path fill="#414141" d="M98 247c2 2 1 4 0 5-2 1-4 1-5-1v-5c2-1 4 0 5 1z"/>
+  <path fill="none" stroke="#414141" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2" d="M39 187l12-9"/>
+  <g fill="#E9F7FE" opacity=".5">
+    <path d="M91 208l-33 26-18-25 33-25zM75 236l-10 7-5-6 10-7zM95 214l-21 16-2-2 21-16zM99 218l-22 16-2-2 22-16z"/>
+    <g>
+      <path d="M82 245l-10 8-5-7 10-7zM102 223l-21 17-2-3 21-16zM105 227l-21 16-2-3 21-16z"/>
+    </g>
+    <path d="M70 182l-33 25-3-3 34-26z"/>
+  </g>
+  <path fill="#A1D4E9" d="M99 207c-19 15-41 3-41 3 3-6 21-30 34-30 0 0 19 8 7 27zM87 224c-25-7-47-1-47-1-10 2-7 14-2 23l4 14 3-3c5 7 15 12 28 4 16-10 14-37 14-37z"/>
+  <ellipse cx="214.2" cy="174" fill="#CDEAF5" rx="10.8" ry="13.7"/>
+  <ellipse cx="160.3" cy="165.8" fill="#CDEAF5" rx="10.8" ry="13.7"/>
+  <ellipse cx="213.2" cy="170.2" fill="#FFF" rx="10.7" ry="13.5"/>
+  <ellipse cx="160.2" cy="162.2" fill="#FFF" rx="10.7" ry="13.5"/>
+  <path fill="#4F4E51" d="M166 156v1c0 2-1 4-3 4l-2-3-2 4c0 4 3 7 5 7 3 0 6-3 6-7 0-3-2-5-4-6z"/>
+  <path fill="#5C5B5D" d="M255 165c-4-3-9-4-9-4-4-2-13-4-23-5l-31-1h-12a38 38 0 01-4-2l-9-4-13-2-20-1-2 1-2 4v4l2 4 1 2v11c1 3 3 6 10 8l5 1c12 3 17 2 21 0s6-10 8-14v-2l1-1 1-1 3 1 2 1v4l1 4v1c0 3 1 9 4 11 1 2 6 4 11 6l11 2h21c4-1 5-3 7-7l1-1v-1l5-17 9 3 1-5zm-82-4l-4 11c-2 5-2 5-4 6-2 0-9 0-17-2-6-1-10-4-10-6v-18-1h8c6 0 14 3 17 4h2c5 2 8 4 8 6zm66 8l-5 17c-1 2-3 2-10 3h-1a91 91 0 01-24-4c-6-2-7-3-8-6l-1-15c0-2 0-3 2-3h25a143 143 0 0120 4c1 0 3 2 2 4z"/>
+  <path fill="#4F4E51" d="M216 163v1c0 2-1 4-3 4l-2-3-2 4c0 4 3 7 5 7 3 0 6-3 6-7 0-3-2-5-4-6z"/>
+  <path fill="#A1D4E9" d="M207 121s19-8 28 1c0 0 0-9-12-9-8 0-12 4-16 8zM211 111s6-6 17-4c0 0-4-4-9-3-4 1-6 3-8 7zM154 127s10 3 14 10c0 0 1-6-4-9-5-2-6-2-10-1zM171 126s-2-4-7-4c0 0 4-2 6 0 0 0 2 2 1 4z"/>
+  <path fill="#5C5B5D" d="M176 198l25 5 2-4v5s-7 2-13 1l10-1s-13-1-24-6zM280 102l3 2c26 10 52-4 52-4s-4 16-20 27c-15 10-39 5-39 5-2 3-3 10-3 10s-4-9-1-24c2-10 7-16 8-16"/>
+  <path fill="#747F83" d="M280 102l3 2c26 10 52-4 52-4s-23 31-62 15c0 0 1-7 7-13"/>
+  <path fill="#CDEAF5" d="M125 231s10 2 16-2c0 0 2 9 10 15 0 0 7-12 14-14l1 11s13 1 25-9c0 0-3 14-30 15v-8s-6 7-10 16c0 0-14-10-16-19h-12l2-5z"/>
+  <path fill="#85C1CE" d="M76 222s-13 10-22 13c0 0 22-5 29-8 0 0-6 15-24 21 0 0 17-2 24-8 0 0-8 23-25 25 0 0 10 1 19-7 9-9 11-27 10-34l-11-2zM100 207l7-5s0 5-5 8l-2-3z"/>
+  <path fill="#EAF7FE" d="M331 263c3-2 5-1 4-10-1-8-6-17-6-17M279 221l-5 2 6 2zM334 228s12-3 16-10"/>
+  <path fill="#85C1CE" d="M130 330s16 10 39 7v-8s-13 1-26-4v3l-4-2v3l-9 1z"/>
+  <path fill="#CDEAF5" d="M222 347h-3c-11 0-19-2-30-1l-22 1 10-10 1 3 6-10 11-15-17 6-4 6v1c-2-2-4-3-4-1l-1 2c-3 5-17 14-17 14l-2 1 3 1v2l-1 1v5l-1 10c0 2-2 4-4 4 0 0 2 2 3 1v1s-1 8 6 9h21l21 1v-3l12 1 2-4 18 1c3-19-2-26-8-27z"/>
+  <path fill="#EAF7FE" d="M233 367v-6l1 1-3-8c-2-4-5-7-10-7l1-2c-4-1-7-2-14-1 4-1 8-4 12-7l2 1 2-5h-1l7-8 2 3 6-16-28 9-3 3-11-11-14 19-3 7c-1-1-1-3-2-2-4 4-8 8-12 10h8l-4 2 12-1c12-1 19 4 19 4v-1c1 1 4 3 6 8 0 1 2 8 1 10l2-1v9h8s1-10-1-18h2c-1-4-4-7-7-8l-1-1s16-2 16 23h3l7 1-1-1-2-6zm-27-8l2 4-2-4z"/>
+  <path fill="#EAF7FE" d="M194 358l2-1c-3-2-7-2-9-2h-2s7 6 6 24h7s3-14-4-21z"/>
+  <g>
+    <path fill="#5D5C5E" d="M452 372c0 5-5 9-10 9H237c-6 0-10-4-10-9V227c0-5 4-10 10-10h205c5 0 10 5 10 10v145z"/>
+    <path fill="none" stroke="#738083" stroke-miterlimit="10" stroke-width="2" d="M452 372c0 5-5 9-10 9H237c-6 0-10-4-10-9V227c0-5 4-10 10-10h205c5 0 10 5 10 10v145h0z"/>
+    <path fill="#747F84" d="M247 231h185v136H247z"/>
+    <path fill="#414141" d="M243 299c0 3-2 5-5 5-2 0-4-2-4-5 0-2 2-4 4-4 3 0 5 2 5 4z"/>
+    <path fill="none" stroke="#414141" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2" d="M440 290v18"/>
+    <g fill="#E9F7FE" opacity=".5">
+      <path d="M252 237h176v12H252zM252 252h176v58H252zM252 317h28v20h-28zM284 317h53v5h-53zM284 324h53v5h-53zM284 332h53v5h-53z"/>
+      <g>
+        <path d="M342 317h28v20h-28zM374 317h53v5h-53zM374 324h53v5h-53zM374 332h53v5h-53z"/>
+      </g>
+      <g>
+        <path d="M252 343h28v20h-28zM284 343h53v5h-53zM284 351h53v5h-53zM284 358h53v5h-53z"/>
+      </g>
+      <g>
+        <path d="M342 343h28v20h-28zM374 343h53v5h-53zM374 351h53v5h-53zM374 358h53v5h-53z"/>
+      </g>
+    </g>
+  </g>
+  <g>
+    <path fill="#EAF7FE" d="M382 187l8 3-10-11-15-7 2-2h-10l-30-4 2-3-39 2 1-4-6 3c0-3 5-9 5-9-6 1-11 9-11 9l-1 5-7 47h112c1-9 0-21-2-29h1zm-94-20z"/>
+    <path fill="#4F4E51" d="M330 260l-4 5-8-7-12 9-7-10c-2-3-2-14-2-14l-3 2 5-15s30-6 31 30z" opacity=".3"/>
+    <path fill="#EAF7FE" d="M333 246c1-4-1-8-1-12l2-5c1-2 3-2 5-3a385 385 0 017-4c10-5 37-8 37-8-39-15-95 0-95 0-11 7-17 30-17 30 9-7 35-22 35-22-1 11-16 11 25 41 0-6 2-11 3-17h-1z"/>
+    <path fill="#CDEAF5" d="M289 197c-7 5-13 12-18 19h15l13-10-15-1s21-5 29-9c10-8 17-13 26-16 0 0 1-1-1-1l4-1 10-3s-20-2-63 22z"/>
+    <path fill="#4F4E51" d="M285 229h-19l-2 6-1 9 22-15z" opacity=".3"/>
+    <path fill="#EAF7FE" d="M299 206s-26 15-27 29l-1 9 28-21v-17zM305 224c-5 16-5 16-4 24l2 8 11 11s10-7 9-14c-3-23-18-29-18-29z"/>
+    <path fill="#EAF7FE" d="M293 230s4-5 14-6c7 0 0-5 0-5l-13 1"/>
+    <path fill="#EAF7FE" d="M302 252l-2-12-2 2c3-15 2-15 5-19 3-7 3 21 3 21"/>
+    <path fill="#CDEAF5" d="M317 240c1-5 1-13 3-18l-2 3c-2 4-4 10-4 17 0 8 7 17 7 17l2-2-4-8s-2-3-2-9z"/>
+  </g>
+</svg>

packages/frameworks/logos/mdx-deck.svg

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="138" height="57">
+  <g fill="none" fill-rule="evenodd">
+    <rect width="136.5" height="55.5" x=".8" y=".8" fill="#FFF" stroke="#EAEAEA" stroke-width="1.5" rx="4.5"/>
+    <g stroke="#000" stroke-width="6">
+      <path stroke-linecap="square" d="M70.5 36V13.8"/>
+      <path d="M57 27.2L70.6 41 84 27.4"/>
+    </g>
+    <path stroke="#000" stroke-width="6" d="M16.4 44V19l13.9 13.8 14-14v25"/>
+    <path stroke="#F9AC00" stroke-width="6" d="M122.4 41.3L93.2 12m.4 29.3L122.8 12"/>
+  </g>
+</svg>

packages/frameworks/logos/riot.svg

@@ -0,0 +1,4 @@
+<svg width="111" height="116" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M0 2l2-2h73c20 0 36 16 36 36v6l-2 2H89l-2-2v-6c0-7-5-12-12-12H25l-1 2v80l-2 1C10 106 0 96 0 84V2z" fill="#ED1846"/>
+  <path d="M45 48l-1 1c1 13 11 23 23 23h16c2 0 4 1 4 4v30l2 1c12-1 22-11 22-23v-8c0-16-12-28-28-28H45z" fill="#ED1846"/>
+</svg>

packages/frameworks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/frameworks",
-  "version": "0.0.2-canary.1",
+  "version": "0.0.2-canary.2",
   "main": "frameworks.json",
   "license": "UNLICENSED"
 }

packages/now-build-utils/package.json

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

packages/now-build-utils/src/detect-builders.ts

@@ -10,6 +10,7 @@ interface ErrorResponse {
 interface Options {
   tag?: 'canary' | 'latest' | string;
   functions?: BuilderFunctions;
+  ignoreBuildScript?: boolean;
   projectSettings?: {
     framework?: string | null;
     devCommand?: string | null;
@@ -407,7 +408,7 @@ export async function detectBuilders(
       };
     }
   } else {
-    if (pkg && builders.length === 0) {
+    if (!options.ignoreBuildScript && pkg && builders.length === 0) {
       // We only show this error when there are no api builders
       // since the dependencies of the pkg could be used for those
       errors.push({

packages/now-build-utils/src/detect-routes.ts

@@ -1,5 +1,5 @@
 import { parse as parsePath } from 'path';
-import { Route } from '@now/routing-utils';
+import { Route, isHandler } from '@now/routing-utils';
 import { Builder } from './types';
 import { getIgnoreApiFilter, sortFiles } from './detect-builders';
 
@@ -281,7 +281,12 @@ async function detectApiRoutes(
           continue: true,
         },
       ];
-    } else {
+    } else if (
+      defaultRoutes.some(
+        route =>
+          !isHandler(route) && route.dest && route.dest.startsWith('/api/')
+      )
+    ) {
       defaultRoutes.push({
         status: 404,
         src: '/api(/.*)?$',

packages/now-build-utils/src/fs/node-version.ts

@@ -16,17 +16,19 @@ const allOptions: NodeVersion[] = [
 
 const supportedOptions = allOptions.filter(o => !isDiscontinued(o));
 
-// This version should match Fargate's default in the PATH
-// Today that is Node 8
-export const defaultSelection = supportedOptions.find(
-  o => o.major === 8
-) as NodeVersion;
+export function getOldestNodeVersion(): NodeVersion {
+  return allOptions[allOptions.length - 1];
+}
+
+export function getLatestNodeVersion(): NodeVersion {
+  return allOptions[0];
+}
 
 export async function getSupportedNodeVersion(
   engineRange?: string,
   silent?: boolean
 ): Promise<NodeVersion> {
-  let selection = defaultSelection;
+  let selection = getOldestNodeVersion();
 
   if (!engineRange) {
     if (!silent) {

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

@@ -150,8 +150,10 @@ export async function getNodeVersion(
   } else if (minNodeVersion) {
     range = minNodeVersion;
     silent = true;
+  } else if (config && config.nodeVersion) {
+    range = config.nodeVersion;
+    silent = true;
   } else if (config && config.zeroConfig) {
-    // Use latest node version zero config detected
     range = '10.x';
     silent = true;
   }

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

@@ -21,6 +21,7 @@ import {
   getNodeVersion,
   getSpawnOptions,
 } from './fs/run-user-scripts';
+import { getLatestNodeVersion } from './fs/node-version';
 import streamToBuffer from './fs/stream-to-buffer';
 import shouldServe from './should-serve';
 import debug from './debug';
@@ -48,6 +49,7 @@ export {
   runPipInstall,
   runShellScript,
   getNodeVersion,
+  getLatestNodeVersion,
   getSpawnOptions,
   streamToBuffer,
   shouldServe,

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

@@ -43,6 +43,7 @@ export interface Config {
   buildCommand?: string;
   devCommand?: string;
   framework?: string;
+  nodeVersion?: string;
 }
 
 export interface Meta {

packages/now-build-utils/test/unit.builds-and-routes-detector.test.ts

@@ -700,7 +700,7 @@ describe('Test `detectBuilders`', () => {
 
     const { defaultRoutes } = await detectRoutes(files, builders!);
 
-    expect(defaultRoutes!.length).toBe(3);
+    expect(defaultRoutes!.length).toBe(2);
     expect((defaultRoutes![0] as any).dest).toBe('/server/team.ts');
     expect((defaultRoutes![0] as any).src).toBe(
       '^/server/(team\\/|team|team\\.ts)$'
@@ -709,7 +709,6 @@ describe('Test `detectBuilders`', () => {
     expect((defaultRoutes![1] as any).src).toBe(
       '^/server/(user\\/|user|user\\.ts)$'
     );
-    expect((defaultRoutes![2] as any).status).toBe(404);
   });
 
   it('Custom directory for Serverless Functions + Next.js', async () => {
@@ -755,12 +754,11 @@ describe('Test `detectBuilders`', () => {
 
     const { defaultRoutes } = await detectRoutes(files, builders!);
 
-    expect(defaultRoutes!.length).toBe(2);
+    expect(defaultRoutes!.length).toBe(1);
     expect((defaultRoutes![0] as any).dest).toBe('/server/user.ts');
     expect((defaultRoutes![0] as any).src).toBe(
       '^/server/(user\\/|user|user\\.ts)$'
     );
-    expect((defaultRoutes![1] as any).status).toBe(404);
   });
 
   it('Framework with non-package.json entrypoint', async () => {

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

@@ -3,10 +3,8 @@ const fs = require('fs-extra');
 const assert = require('assert');
 const { createZip } = require('../dist/lambda');
 const { glob, spawnAsync, download } = require('../');
-const {
-  getSupportedNodeVersion,
-  defaultSelection,
-} = require('../dist/fs/node-version');
+const { getSupportedNodeVersion } = require('../dist/fs/node-version');
+const { getNodeVersion, getLatestNodeVersion } = require('../dist');
 
 it('should re-create symlinks properly', async () => {
   const files = await glob('**', path.join(__dirname, 'symlinks'));
@@ -50,14 +48,11 @@ it('should create zip files with symlinks properly', async () => {
 
 it('should only match supported node versions', async () => {
   expect(await getSupportedNodeVersion('10.x')).toHaveProperty('major', 10);
-  expect(await getSupportedNodeVersion('8.10.x')).toHaveProperty('major', 8);
+  expect(await getSupportedNodeVersion('12.x')).toHaveProperty('major', 12);
   expect(getSupportedNodeVersion('8.11.x')).rejects.toThrow();
   expect(getSupportedNodeVersion('6.x')).rejects.toThrow();
   expect(getSupportedNodeVersion('999.x')).rejects.toThrow();
   expect(getSupportedNodeVersion('foo')).rejects.toThrow();
-  expect(await getSupportedNodeVersion('')).toBe(defaultSelection);
-  expect(await getSupportedNodeVersion(null)).toBe(defaultSelection);
-  expect(await getSupportedNodeVersion(undefined)).toBe(defaultSelection);
 });
 
 it('should match all semver ranges', async () => {
@@ -78,6 +73,22 @@ it('should match all semver ranges', async () => {
   expect(await getSupportedNodeVersion('^10.5.0')).toHaveProperty('major', 10);
 });
 
+it('should select correct node version in getNodeVersion()', async () => {
+  expect(
+    await getNodeVersion('/tmp', undefined, { nodeVersion: '12.x' })
+  ).toHaveProperty('major', 12);
+  expect(
+    await getNodeVersion('/tmp', undefined, { nodeVersion: '10.x' })
+  ).toHaveProperty('major', 10);
+  expect(
+    await getNodeVersion('/tmp', '10.x', { nodeVersion: '12.x' })
+  ).toHaveProperty('major', 10);
+});
+
+it('should get latest node version', async () => {
+  expect(await getLatestNodeVersion()).toHaveProperty('major', 12);
+});
+
 it('should support require by path for legacy builders', () => {
   const index = require('@now/build-utils');
 

packages/now-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "now",
-  "version": "16.7.1-canary.3",
+  "version": "16.7.1-canary.4",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Now",

packages/now-cli/test/helpers/prepare.js

@@ -311,6 +311,13 @@ CMD ["node", "index.js"]`,
         files: ['.gitignore', 'folder', 'index.js', 'test.html'],
       }),
     },
+    'redirects-v2': {
+      'now.json': JSON.stringify({
+        version: 2,
+        name: 'redirects-v2',
+        redirects: [{ source: `/(.*)`, destination: 'https://example.com/$1' }],
+      }),
+    },
     'local-config-v2': {
       [`main-${session}.html`]: '<h1>hello main</h1>',
       [`test-${session}.html`]: '<h1>hello test</h1>',

packages/now-cli/test/integration.js

@@ -211,6 +211,26 @@ test('login', async t => {
   t.is(typeof token, 'string');
 });
 
+test('deploy using only now.json with `redirects` defined', async t => {
+  const target = fixture('redirects-v2');
+
+  const { exitCode, stderr, stdout } = await execa(
+    binaryPath,
+    [target, ...defaultArgs],
+    {
+      reject: false,
+    }
+  );
+
+  t.is(exitCode, 0, formatOutput({ stderr, stdout }));
+
+  const i = stdout.lastIndexOf('https://');
+  const url = stdout.slice(i);
+  const res = await fetch(`${url}/foo/bar`, { redirect: 'manual' });
+  const location = res.headers.get('location');
+  t.is(location, 'https://example.com/foo/bar');
+});
+
 test('deploy using --local-config flag v2', async t => {
   const target = fixture('local-config-v2');
   const configPath = path.join(target, 'now-test.json');

packages/now-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "now-client",
-  "version": "6.0.1-canary.0",
+  "version": "6.0.1-canary.1",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "homepage": "https://zeit.co",

packages/now-client/src/deploy.ts

@@ -115,8 +115,13 @@ export async function* deploy(
 
   if (
     files.size === 1 &&
-    !deploymentOptions.builds &&
-    !deploymentOptions.routes
+    deploymentOptions.builds === undefined &&
+    deploymentOptions.routes === undefined &&
+    deploymentOptions.cleanUrls === undefined &&
+    deploymentOptions.rewrites === undefined &&
+    deploymentOptions.redirects === undefined &&
+    deploymentOptions.headers === undefined &&
+    deploymentOptions.trailingSlash === undefined
   ) {
     debug(`Assigning '/' route for single file deployment`);
     const filePath = Array.from(files.values())[0].names[0];

packages/now-client/src/types.ts

@@ -153,6 +153,11 @@ export interface DeploymentOptions extends LegacyDeploymentOptions {
   version?: number;
   regions?: string[];
   routes?: Route[];
+  cleanUrls?: boolean;
+  rewrites?: NowRewrite[];
+  redirects?: NowRedirect[];
+  headers?: NowHeader[];
+  trailingSlash?: boolean;
   builds?: Builder[];
   functions?: BuilderFunctions;
   env?: Dictionary<string>;

packages/now-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/next",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://zeit.co/docs/runtimes#official-runtimes/next-js",
@@ -25,7 +25,7 @@
     "@types/resolve-from": "5.0.1",
     "@types/semver": "6.0.0",
     "@types/yazl": "2.4.1",
-    "@zeit/node-file-trace": "0.4.0",
+    "@zeit/node-file-trace": "0.4.1",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",
     "execa": "2.0.4",

packages/now-next/src/index.ts

@@ -339,7 +339,8 @@ export const build = async ({
 
   if (routesManifest) {
     switch (routesManifest.version) {
-      case 1: {
+      case 1:
+      case 2: {
         redirects.push(...convertRedirects(routesManifest.redirects));
         rewrites.push(...convertRewrites(routesManifest.rewrites));
         break;

packages/now-next/src/utils.ts

@@ -360,7 +360,8 @@ export async function getDynamicRoutes(
 
   if (routesManifest) {
     switch (routesManifest.version) {
-      case 1: {
+      case 1:
+      case 2: {
         return routesManifest.dynamicRoutes.map(
           ({ page, regex }: { page: string; regex: string }) => {
             return {

packages/now-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/node",
-  "version": "1.3.0",
+  "version": "1.3.1-canary.1",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://zeit.co/docs/runtimes#official-runtimes/node-js",
@@ -30,7 +30,7 @@
     "@types/etag": "1.8.0",
     "@types/test-listen": "1.1.0",
     "@zeit/ncc": "0.20.4",
-    "@zeit/node-file-trace": "0.4.0",
+    "@zeit/node-file-trace": "0.4.1",
     "content-type": "1.0.4",
     "cookie": "0.4.0",
     "etag": "1.8.1",

packages/now-node/test/fixtures/35-puppeteer/package.json

@@ -1,7 +1,10 @@
 {
+  "engines": {
+    "node": "10.x"
+  },
   "dependencies": {
-    "chrome-aws-lambda": "1.11.1",
-    "lighthouse": "4.3.1",
-    "puppeteer-core": "1.11.0"
+    "chrome-aws-lambda": "1.20.4",
+    "lighthouse": "5.6.0",
+    "puppeteer-core": "1.20.0"
   }
 }

packages/now-routing-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/routing-utils",
-  "version": "1.4.1-canary.2",
+  "version": "1.4.1-canary.3",
   "description": "ZEIT Now routing utilities",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

packages/now-routing-utils/src/superstatic.ts

@@ -2,6 +2,7 @@
  * This converts Superstatic configuration to Now.json Routes
  * See https://github.com/firebase/superstatic#configuration
  */
+import { isString } from 'util';
 import { parse as parseUrl, format as formatUrl } from 'url';
 import { pathToRegexp, compile, Key } from 'path-to-regexp';
 import { Route, NowRedirect, NowRewrite, NowHeader } from './types';
@@ -22,7 +23,8 @@ export function getCleanUrls(
 
 export function convertCleanUrls(
   cleanUrls: boolean,
-  trailingSlash: boolean | undefined
+  trailingSlash?: boolean,
+  status = 308
 ): Route[] {
   const routes: Route[] = [];
   if (cleanUrls) {
@@ -30,25 +32,28 @@ export function convertCleanUrls(
     routes.push({
       src: '^/(?:(.+)/)?index(?:\\.html)?/?$',
       headers: { Location: loc },
-      status: 308,
+      status,
     });
     routes.push({
       src: '^/(.*)\\.html/?$',
       headers: { Location: loc },
-      status: 308,
+      status,
     });
   }
   return routes;
 }
 
-export function convertRedirects(redirects: NowRedirect[]): Route[] {
+export function convertRedirects(
+  redirects: NowRedirect[],
+  defaultStatus = 308
+): Route[] {
   return redirects.map(r => {
     const { src, segments } = sourceToRegex(r.source);
     const loc = replaceSegments(segments, r.destination);
     const route: Route = {
       src,
       headers: { Location: loc },
-      status: r.statusCode || 308,
+      status: r.statusCode || defaultStatus,
     };
     return route;
   });
@@ -78,19 +83,19 @@ export function convertHeaders(headers: NowHeader[]): Route[] {
   });
 }
 
-export function convertTrailingSlash(enable: boolean): Route[] {
+export function convertTrailingSlash(enable: boolean, status = 308): Route[] {
   const routes: Route[] = [];
   if (enable) {
     routes.push({
       src: '^/(.*[^\\/])$',
       headers: { Location: '/$1/' },
-      status: 308,
+      status,
     });
   } else {
     routes.push({
       src: '^/(.*)\\/$',
       headers: { Location: '/$1' },
-      status: 308,
+      status,
     });
   }
   return routes;
@@ -103,10 +108,6 @@ function sourceToRegex(source: string): { src: string; segments: string[] } {
   return { src: r.source, segments };
 }
 
-function isString(key: any): key is string {
-  return typeof key === 'string';
-}
-
 function replaceSegments(segments: string[], destination: string): string {
   const parsedDestination = parseUrl(destination, true);
   let { pathname } = parsedDestination;

packages/now-static-build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/static-build",
-  "version": "0.14.1-canary.3",
+  "version": "0.14.1-canary.7",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://zeit.co/docs/runtimes#official-runtimes/static-builds",

packages/now-static-build/src/frameworks.ts

@@ -328,7 +328,8 @@ export const frameworks: Framework[] = [
     name: 'Nuxt.js',
     slug: 'nuxtjs',
     dependency: 'nuxt',
-    getOutputDirName: async () => 'public',
+    buildCommand: 'nuxt generate',
+    getOutputDirName: async () => 'dist',
   },
   {
     name: 'Hugo',
@@ -342,9 +343,6 @@ export const frameworks: Framework[] = [
         })
       );
 
-      console.log(`trying to read file at ${dirPrefix}`);
-      console.log('got config', config);
-
       return (config && config.publishDir) || 'public';
     },
   },
@@ -358,6 +356,18 @@ export const frameworks: Framework[] = [
       return (config && config.destination) || '_site';
     },
   },
+  {
+    name: 'Brunch',
+    slug: 'brunch',
+    getOutputDirName: async () => 'public',
+  },
+  {
+    name: 'Middleman',
+    slug: 'middleman',
+    buildCommand: 'bundle exec middleman build',
+    devCommand: 'bundle exec middleman server -p $PORT',
+    getOutputDirName: async () => 'build',
+  },
 ];
 
 export interface Framework {

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

@@ -163,22 +163,12 @@ function getPkg(entrypoint: string, workPath: string) {
 }
 
 function getFramework(config: Config | null, pkg?: PackageJson | null) {
-  const { framework: configFramework = null, outputDirectory = null } =
-    config || {};
+  const { framework: configFramework = null } = config || {};
 
   if (configFramework) {
     const framework = frameworks.find(({ slug }) => slug === configFramework);
 
     if (framework) {
-      if (!framework.getOutputDirName && outputDirectory) {
-        return {
-          ...framework,
-          getOutputDirName(prefix: string) {
-            return Promise.resolve(path.join(prefix, outputDirectory));
-          },
-        };
-      }
-
       return framework;
     }
   }
@@ -420,7 +410,9 @@ export async function build({
       const outputDirPrefix = path.join(workPath, path.dirname(entrypoint));
 
       if (framework) {
-        const outputDirName = await framework.getOutputDirName(outputDirPrefix);
+        const outputDirName = config.outputDirectory
+          ? config.outputDirectory
+          : await framework.getOutputDirName(outputDirPrefix);
 
         distPath = path.join(outputDirPrefix, outputDirName);
       } else if (!config || !config.distDir) {

packages/now-static-build/test/fixtures/47-nuxt-with-custom-output/.gitignore

@@ -0,0 +1,5 @@
+node_modules
+dist
+custom-output
+yarn.lock
+node_modules

packages/now-static-build/test/fixtures/47-nuxt-with-custom-output/.nowignore

@@ -0,0 +1,5 @@
+node_modules
+dist
+custom-output
+yarn.lock
+node_modules

packages/now-static-build/test/fixtures/47-nuxt-with-custom-output/now.json

@@ -0,0 +1,14 @@
+{
+  "builds": [
+    {
+      "use": "@now/static-build",
+      "src": "package.json",
+      "config": {
+        "zeroConfig": true,
+        "framework": "nuxtjs",
+        "buildCommand": "yarn generate && mv dist custom-output",
+        "outputDirectory": "custom-output"
+      }
+    }
+  ]
+}

packages/now-static-build/test/fixtures/47-nuxt-with-custom-output/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "47-nuxt-with-custom-output",
+  "version": "1.0.0",
+  "main": "pages/index.js",
+  "scripts": {
+    "dev": "nuxt dev",
+    "generate": "nuxt generate"
+  },
+  "keywords": [],
+  "private": true,
+  "dependencies": {
+    "nuxt": "2.11.0"
+  }
+}

packages/now-static-build/test/fixtures/47-nuxt-with-custom-output/pages/index.js

@@ -0,0 +1 @@
+export default () => <h1>hello nuxt</h1>;

packages/now-static-build/test/fixtures/48-nuxt-without-framework/.gitignore

@@ -0,0 +1,5 @@
+node_modules
+dist
+custom-output
+yarn.lock
+node_modules

packages/now-static-build/test/fixtures/48-nuxt-without-framework/.nowignore

@@ -0,0 +1,5 @@
+node_modules
+dist
+custom-output
+yarn.lock
+node_modules

packages/now-static-build/test/fixtures/48-nuxt-without-framework/now.json

@@ -0,0 +1,13 @@
+{
+  "builds": [
+    {
+      "use": "@now/static-build",
+      "src": "package.json",
+      "config": {
+        "zeroConfig": true,
+        "buildCommand": "yarn generate && mv dist custom-output",
+        "outputDirectory": "custom-output"
+      }
+    }
+  ]
+}

packages/now-static-build/test/fixtures/48-nuxt-without-framework/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "47-nuxt-with-custom-output",
+  "version": "1.0.0",
+  "main": "pages/index.js",
+  "scripts": {
+    "dev": "nuxt dev",
+    "generate": "nuxt generate"
+  },
+  "keywords": [],
+  "private": true,
+  "dependencies": {
+    "nuxt": "2.11.0"
+  }
+}

packages/now-static-build/test/fixtures/48-nuxt-without-framework/pages/index.js

@@ -0,0 +1 @@
+export default () => <h1>hello nuxt</h1>;

yarn.lock

@@ -2076,10 +2076,10 @@
   resolved "https://registry.yarnpkg.com/@zeit/ncc/-/ncc-0.20.4.tgz#00f0a25a88cac3712af4ba66561d9e281c6f05c9"
   integrity sha512-fmq+F/QxPec+k/zvT7HiVpk7oiGFseS6brfT/AYqmCUp6QFRK7vZf2Ref46MImsg/g2W3g5X6SRvGRmOAvEfdA==
 
-"@zeit/node-file-trace@0.4.0":
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/@zeit/node-file-trace/-/node-file-trace-0.4.0.tgz#67dbd5d523cf05e7bc5bad017b8c7bab163e256c"
-  integrity sha512-XBpMaxmgQr27Vt1Xfpd+pOg6zNHxc6+7/tOnOkSl78EpMeKTcPhARllcjdbN1ItCSskfxkfh/zHDnaPWG7Wc8Q==
+"@zeit/node-file-trace@0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@zeit/node-file-trace/-/node-file-trace-0.4.1.tgz#37cb1382fa0d31c2083b634201fdad7a01849dda"
+  integrity sha512-jrRdmyYzMZ9w00EoNM3dLgFD+AvERlM37QGtXn9wZ6WZMPfVa/VSd2HrdVaYUI5gg2cTcwtkJenz51UHUPfmOg==
   dependencies:
     acorn "^6.1.1"
     acorn-stage3 "^2.0.0"
@@ -3468,11 +3468,16 @@ commander@2.15.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
   integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
 
-commander@^2.20.0, commander@~2.20.0:
+commander@^2.20.0:
   version "2.20.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
   integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
 
+commander@~2.20.3:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
 commander@~2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
@@ -5497,9 +5502,9 @@ growly@^1.3.0:
   integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
 handlebars@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
-  integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
+  version "4.5.3"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482"
+  integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==
   dependencies:
     neo-async "^2.6.0"
     optimist "^0.6.1"
@@ -10759,11 +10764,11 @@ typescript@3.6.4:
   integrity sha512-unoCll1+l+YK4i4F8f22TaNVPRHcD9PA3yCuZ8g5e0qGqlVlJ/8FSateOLLSagn+Yg5+ZwuPkL8LFUc0Jcvksg==
 
 uglify-js@^3.1.4:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5"
-  integrity sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.3.tgz#f918fce9182f466d5140f24bb0ff35c2d32dcc6a"
+  integrity sha512-7tINm46/3puUA4hCkKYo4Xdts+JDaVC9ZPRcG8Xw9R4nhO/gZgUM3TENq8IF4Vatk8qCig4MzP/c8G4u2BkVQg==
   dependencies:
-    commander "~2.20.0"
+    commander "~2.20.3"
     source-map "~0.6.1"
 
 uid-number@0.0.6: