Publish Stable

- @now/build-utils@1.1.0
 - now@16.6.0
 - now-client@5.2.4
 - @now/next@2.1.0
 - @now/node@1.2.0
 - @now/static-build@0.13.0

packages/now-build-utils/package.json

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

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

@@ -247,7 +247,11 @@ export async function runPackageJsonScript(
     await spawnAsync('npm', ['run', scriptName], opts);
   } else {
     console.log(`Running "yarn run ${scriptName}"`);
-    await spawnAsync('yarn', ['--cwd', destPath, 'run', scriptName], opts);
+    await spawnAsync(
+      'yarn',
+      ['--ignore-engines', '--cwd', destPath, 'run', scriptName],
+      opts
+    );
   }
 
   return true;

packages/now-cli/package.json

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

packages/now-cli/src/util/dev/builder.ts

@@ -29,11 +29,10 @@ import {
   BuilderInputs,
   BuilderOutput,
   BuildResultV3,
-  BuildResultV4,
   BuilderOutputs,
-  RouteConfig,
 } from './types';
-import { normalizeRoutes, getTransformedRoutes } from '@now/routing-utils';
+import { normalizeRoutes } from '@now/routing-utils';
+import getUpdateCommand from '../get-update-command';
 
 interface BuildMessage {
   type: string;
@@ -176,11 +175,7 @@ export async function executeBuild(
     },
   };
 
-  let buildResultOrOutputs:
-    | BuilderOutputs
-    | BuildResult
-    | BuildResultV3
-    | BuildResultV4;
+  let buildResultOrOutputs: BuilderOutputs | BuildResult | BuildResultV3;
   if (buildProcess) {
     buildProcess.send({
       type: 'build',
@@ -233,10 +228,8 @@ export async function executeBuild(
     };
   } else if (builder.version === 2) {
     result = buildResultOrOutputs as BuildResult;
-  } else if (builder.version === 3 || builder.version === 4) {
-    const { output, ...rest } = buildResultOrOutputs as (
-      | BuildResultV3
-      | BuildResultV4);
+  } else if (builder.version === 3) {
+    const { output, ...rest } = buildResultOrOutputs as BuildResultV3;
 
     if (!output || (output as BuilderOutput).type !== 'Lambda') {
       throw new Error('The result of "builder.build()" must be a `Lambda`');
@@ -268,27 +261,18 @@ export async function executeBuild(
       }
     }
 
-    let routes: RouteConfig[] = [];
-    if (builder.version === 4) {
-      const { error, routes: buildRoutes } = getTransformedRoutes({
-        nowConfig: rest,
-        builderVersion: builder.version,
-      });
-      if (error) {
-        throw new Error(error.message);
-      }
-      routes = buildRoutes || [];
-    }
-
     result = {
       ...rest,
-      routes,
       output: {
         [entrypoint]: output,
       },
     } as BuildResult;
   } else {
-    result = buildResultOrOutputs as BuildResult;
+    throw new Error(
+      `Now CLI does not support builder version ${
+        builder.version
+      }.\nPlease run \`${await getUpdateCommand()}\` to update Now CLI.`
+    );
   }
 
   // Normalize Builder Routes

packages/now-cli/src/util/dev/types.ts

@@ -130,14 +130,10 @@ export interface BuildResultV3 {
 }
 
 export interface BuildResultV4 {
-  output: Lambda;
+  output: { [filePath: string]: Lambda };
+  routes: RouteConfig[];
   watch: string[];
   distPath?: string;
-  cleanUrls?: boolean;
-  rewrites?: NowRewrite[];
-  redirects?: NowRedirect[];
-  headers?: NowHeader[];
-  trailingSlash?: boolean;
 }
 
 export interface ShouldServeParams {

packages/now-client/package.json

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

packages/now-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/next",
-  "version": "2.0.1-canary.1",
+  "version": "2.1.0",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://zeit.co/docs/runtimes#official-runtimes/next-js",

packages/now-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/node",
-  "version": "1.1.3-canary.2",
+  "version": "1.2.0",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://zeit.co/docs/runtimes#official-runtimes/node-js",

packages/now-routing-utils/package.json

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

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

@@ -127,25 +127,11 @@ function notEmpty<T>(value: T | null | undefined): value is T {
 
 export function getTransformedRoutes({
   nowConfig,
-  builderVersion,
 }: GetRoutesProps): NormalizedRoutes {
   const { cleanUrls, rewrites, redirects, headers, trailingSlash } = nowConfig;
   let { routes = null } = nowConfig;
   const errors: NowErrorNested[] = [];
   if (routes) {
-    if (typeof builderVersion === 'number' && builderVersion >= 4) {
-      const error = createNowError(
-        'invalid_builder_result',
-        'Invalid builder result',
-        [
-          {
-            message:
-              'Cannot define `routes` when builder.version is 4 or newer',
-          },
-        ]
-      );
-      return { routes, error };
-    }
     if (typeof cleanUrls !== 'undefined') {
       errors.push({
         message: 'Cannot define both `routes` and `cleanUrls`',

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

@@ -33,7 +33,6 @@ export type NormalizedRoutes = {
 
 export interface GetRoutesProps {
   nowConfig: NowConfig;
-  builderVersion?: number;
 }
 
 export interface NowConfig {

packages/now-routing-utils/test/index.spec.js

@@ -548,21 +548,4 @@ describe('getTransformedRoutes', () => {
     const actual = getTransformedRoutes({ nowConfig });
     assert.equal(actual.routes, null);
   });
-
-  test('should error when builder version 4 uses routes', () => {
-    const nowConfig = { routes: [{ src: '/page', dest: '/another' }] };
-    const actual = getTransformedRoutes({ nowConfig, builderVersion: 4 });
-    assert.notEqual(actual.error, null);
-    assert.equal(actual.error.code, 'invalid_builder_result');
-  });
-
-  test('should not error when builder version 4 uses rewrites', () => {
-    const nowConfig = {
-      rewrites: [{ source: '/page', destination: '/another' }],
-    };
-    const actual = getTransformedRoutes({ nowConfig, builderVersion: 4 });
-    assert.equal(actual.error, null);
-    assert.notEqual(actual.routes, null);
-    assertValid(actual.routes);
-  });
 });

packages/now-static-build/package.json

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