Publish Stable

- @vercel/next@2.6.33

.github/CONTRIBUTING.md

@@ -68,13 +68,13 @@ In such cases you can visit the URL of the failed deployment and append `/_logs`
 
 The logs of this deployment will contain the actual error which may help you to understand what went wrong.
 
-### @zeit/node-file-trace
+### @vercel/nft
 
-Some of the Builders use `@zeit/node-file-trace` to tree-shake files before deployment. If you suspect an error with this tree-shaking mechanism, you can create the following script in your project:
+Some of the Builders use `@vercel/nft` to tree-shake files before deployment. If you suspect an error with this tree-shaking mechanism, you can create the following script in your project:
 
 ```js
-const trace = require('@zeit/node-file-trace');
-trace(['path/to/entrypoint.js'], {
+const { nodeFileTrace } = require('@vercel/nft');
+nodeFileTrace(['path/to/entrypoint.js'], {
   ts: true,
   mixedModules: true,
 })
@@ -82,7 +82,7 @@ trace(['path/to/entrypoint.js'], {
   .then(e => console.error(e));
 ```
 
-When you run this script, you'll see all imported files. If anything file is missing, the bug is in [@zeit/node-file-trace](https://github.com/vercel/node-file-trace) and not the Builder.
+When you run this script, you'll see all imported files. If anything file is missing, the bug is in [@vercel/nft](https://github.com/vercel/nft) and not the Builder.
 
 ## Deploy a Builder with existing project
 

.github/workflows/publish.yml

@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@v1
     - uses: actions/setup-node@v1
       with:
-        node-version: 10
+        node-version: 12
     - name: Install
       run: yarn install --check-files --frozen-lockfile
     - name: Build

errors/deploy-invalid-dc.md

@@ -2,8 +2,8 @@
 
 #### Why This Error Occurred
 
-When supplying `regions` or `scale` settings, you
-used an unknown or invalid dc identifier.
+When supplying `regions` configuration, you
+used an unknown or invalid DC identifier.
 
 #### Possible Ways to Fix It
 
@@ -19,7 +19,7 @@ and DCs have to be in _lowercase_.
 - `gru`
 - `iad`
 
-In `now-cli`, they currently are transformed to
+In Vercel CLI, they currently are transformed to
 DC identifiers before being sent to our APIs.
 
 **Valid DC identifiers**:

errors/missing-dotenv-target.md

@@ -1,9 +0,0 @@
-# Missing `--dotenv` Target
-
-#### Why This Error Occurred
-
-You specified a path as the value for the `--dotenv` flag, but the target of the path doesn't exist.
-
-#### Possible Ways to Fix It
-
-Make sure the target file you've specified exists and is readable by Vercel CLI. In addition, please ensure that the filename starts with a dot (example: `.env`) - then it should work.

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

@@ -2,7 +2,7 @@
 
 #### Why This Error Occurred
 
-This error occurs when you have your application is not configured for Serverless Next.js build output.
+This error occurs when your application is not configured for Serverless Next.js build output.
 
 #### Possible Ways to Fix It
 

errors/regions-and-scale-at-once.md

@@ -1,32 +0,0 @@
-# Can't Set `regions` and `scale` Options Simultaneously
-
-#### Why This Error Occurred
-
-Your deployment's configuration contains a `regions` and `scale`
-configuration simultaneously.
-
-#### Possible Ways to Fix It
-
-The `regions` setting is intended to be used to scale the
-deployment to the supplied regions or datacenters identifiers
-with default scale settings.
-
-```json
-{
-  "regions": ["sfo", "bru", "gru", "iad"]
-}
-```
-
-The `scale` object allows you to be more granular: you can decide a
-`min` and `max` number of instances per region:
-
-```json
-{
-  "scale": {
-    "sfo": { "min": 0, "max": 10 }
-  }
-}
-```
-
-To solve this problem, use only one of the two ways of deciding
-where to scale your deployment to.

errors/scale-invalid-dc.md

@@ -1,36 +0,0 @@
-# Invalid Region or DC Identifier
-
-#### Why This Error Occurred
-
-When supplying a region or DC identifier in `vercel scale`,
-we weren't able to recognize the value as valid.
-
-#### Possible Ways to Fix It
-
-Check your `vercel scale` command make sure you are using a
-valid string after the URL. Regions
-and DCs have to be in _lowercase_.
-
-**Valid region identifiers**:
-
-- `all` (special, used to scale to all DCs, can only appear once)
-- `sfo`
-- `bru`
-- `gru`
-- `iad`
-
-In Vercel CLI, they currently are transformed to
-DC identifiers before being sent to our APIs.
-
-**Valid DC identifiers**:
-
-- `sfo1`
-- `bru1`
-- `gru1`
-- `iad1`
-
-To pass multiple ones, use a comma:
-
-```
-vercel scale my-url-123.now.sh sfo,bru,gru 1 5
-```

errors/scale-ls.md

@@ -1,30 +0,0 @@
-# `vercel scale ls` is deprecated
-
-#### Why This Error Occurred
-
-We have stopped supporting this command, in favor of
-better alternatives.
-
-`vercel scale ls` used to list all the scaling rules
-for all your deployments. The output would be too long,
-and it would often be hard to find the information
-you needed in a long list of items.
-
-#### Possible Ways to Fix It
-
-Instead of using `vercel scale ls` to list all your deployments
-and their scaling rules, first use `vercel ls` to find
-your deployment:
-
-```console
-vercel ls
-```
-
-Then, select the URL of your deployment, which uniquely identifies it, and run:
-
-```console
-vercel inspect my-deployment-12345.now.sh
-```
-
-The `inspect` subcommand will give you your deployment's scale information, including what datacenters it's enabled on, the
-current number of instances and minimums/maximums.

errors/scaling-path-alias.md

@@ -1,12 +0,0 @@
-# Scaling path alias
-
-#### Why This Error Occurred
-
-You tried to use `vercel scale` on a path alias (`vercel alias -r rules.json`).
-
-#### Possible Ways to Fix It
-
-Path aliases are routes to instances. Instances can be scaled independent from each other.
-You can view path aliases by running `vercel alias ls <id>`.
-
-Documentation for Path Aliases can be found [here](https://vercel.com/docs/features/path-aliases).

errors/v2-no-min.md

@@ -1,16 +0,0 @@
-# No minimum scale settings on Cloud v2 deployments
-
-#### Why This Error Occurred
-
-An attempt was made at scaling a Cloud v2 deployment with a `min` scale
-setting. This isn't supported yet.
-
-#### Possible Ways to Fix It
-
-Ensure your scale settings (in `vercel.json`, the command you're running
-or from a previous deployment who's alias you're trying to overwrite) has
-the `min` scale setting set to `0`. You can do this by running
-
-```
-vercel scale <deployment> 0 10
-```

errors/verification-timeout.md

@@ -1,29 +0,0 @@
-# Verification Timeout
-
-#### Why This Error Occurred
-
-After the deployment build completed and the deployment state was set to `READY`,
-instances failed to initialize properly.
-
-The CLI attempted to verify that the scale settings of your instances matched,
-but it couldn't do so within the allotted time (defaults to 2 minutes).
-
-#### Possible Ways to Fix It
-
-Instance verification is the process of ensuring that after
-your deployment is ready, we can actually run (instantiate) your code.
-
-If you configured [regions or scale](https://vercel.com/docs/features/scaling),
-we ensure the minimums and maximums are met for the regions you enabled.
-
-If you think your code is taking too long to instantiate, this can be due
-to slow boot up times. You can supply `--no-verify` to skip verification
-if you are confident your code runs properly.
-
-If your application is not listening on a HTTP port, we might be failing to
-instantiate your deployment as well. It might not be showing any errors,
-but the deployment instance is effectively not routable and cannot be
-verified.
-
-If your instances are crashing before an HTTP port is exposed, verification
-will fail as well. Double check your logs (e.g.: by running `vercel logs <url>`)

examples/ember/.gitignore

@@ -27,3 +27,6 @@
 # Environment Variables
 .env
 .env.build
+
+# Vercel
+.vercel

examples/ember/public/robots.txt

@@ -0,0 +1,3 @@
+# http://www.robotstxt.org
+User-agent: *
+Disallow:

examples/gatsby/src/pages/index.js

@@ -31,7 +31,7 @@ function Index() {
       </h2>
       <p>
         <a
-          href="https://github.com/vercel/vercel/blob/master/gatsby"
+          href="https://github.com/vercel/vercel/tree/master/examples/gatsby"
           target="_blank"
           rel="noreferrer noopener"
         >

examples/ionic-angular/src/app/pages/map/map.ts

@@ -27,7 +27,7 @@ export class MapPage implements AfterViewInit {
     }
 
     const googleMaps = await getGoogleMaps(
-      'AIzaSyB8pf6ZdFQj5qw7rc_HSGrhUwQKfIe9ICw'
+      'YOUR_API_KEY_HERE'
     );
 
     let map;

examples/nextjs/package.json

@@ -8,7 +8,7 @@
     "start": "next start"
   },
   "dependencies": {
-    "next": "9.5.1",
+    "next": "9.5.4",
     "react": "16.13.1",
     "react-dom": "16.13.1"
   }

package.json

@@ -27,7 +27,7 @@
     "husky": "3.0.4",
     "json5": "2.1.1",
     "lint-staged": "9.2.5",
-    "node-fetch": "2.6.0",
+    "node-fetch": "2.6.1",
     "npm-package-arg": "6.1.0",
     "prettier": "2.0.5"
   },

packages/frameworks/frameworks.json

@@ -56,7 +56,13 @@
       "outputDirectory": {
         "placeholder": "Next.js default"
       }
-    }
+    },
+    "recommendedIntegrations": [
+      {
+        "id": "oac_5lUsiANun1DEzgLg0NZx5Es3",
+        "dependencies": ["next-plugin-sentry", "next-sentry-source-maps"]
+      }
+    ]
   },
   {
     "name": "Gatsby.js",

packages/frameworks/index.d.ts

@@ -31,4 +31,8 @@ export interface Framework {
     devCommand: Setting;
     outputDirectory: Setting;
   };
+  recommendedIntegrations?: {
+    id: string;
+    dependencies: string[];
+  }[];
 }

packages/frameworks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/frameworks",
-  "version": "0.1.1",
+  "version": "0.1.2-canary.0",
   "main": "frameworks.json",
   "license": "UNLICENSED",
   "scripts": {

packages/frameworks/test/frameworks.unit.test.ts

@@ -97,6 +97,25 @@ const Schema = {
           outputDirectory: SchemaSettings,
         },
       },
+      recommendedIntegrations: {
+        type: 'array',
+        items: {
+          type: 'object',
+          required: ['id', 'dependencies'],
+          additionalProperties: false,
+          properties: {
+            id: {
+              type: 'string',
+            },
+            dependencies: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+            },
+          },
+        },
+      },
     },
   },
 };

packages/now-build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.5.1",
+  "version": "2.5.5-canary.0",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -29,7 +29,7 @@
     "@types/node-fetch": "^2.1.6",
     "@types/semver": "6.0.0",
     "@types/yazl": "^2.4.1",
-    "@vercel/frameworks": "0.1.1",
+    "@vercel/frameworks": "0.1.2-canary.0",
     "@vercel/ncc": "0.24.0",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",
@@ -44,7 +44,7 @@
     "js-yaml": "3.13.1",
     "minimatch": "3.0.4",
     "multistream": "2.1.1",
-    "node-fetch": "2.2.0",
+    "node-fetch": "2.6.1",
     "semver": "6.1.1",
     "ts-jest": "24.1.0",
     "typescript": "3.9.3",

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

@@ -458,7 +458,10 @@ function detectFrontBuilder(
     config.outputDirectory = projectSettings.outputDirectory;
   }
 
-  if (pkg && (framework !== null || createdAt < Date.parse('2020-03-01'))) {
+  if (
+    pkg &&
+    (framework === undefined || createdAt < Date.parse('2020-03-01'))
+  ) {
     const deps: PackageJson['dependencies'] = {
       ...pkg.dependencies,
       ...pkg.devDependencies,

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

@@ -107,6 +107,13 @@ export interface BuildOptions {
    */
   workPath: string;
 
+  /**
+   * The "Root Directory" is assigned to the `workPath` so the `repoRootPath`
+   * is the Git Repository Root. This is only relevant for Monorepos.
+   * See https://vercel.com/blog/monorepos
+   */
+  repoRootPath?: string;
+
   /**
    * An arbitrary object passed by the user in the build definition defined
    * in `vercel.json`.

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

@@ -1080,6 +1080,46 @@ describe('Test `detectBuilders` with `featHandleMiss=true`', () => {
     expect(errorRoutes).toStrictEqual([]);
   });
 
+  it('Using "Create React App" framework with `next` in dependencies should NOT autodetect Next.js for new projects', async () => {
+    const pkg = {
+      scripts: {
+        dev: 'react-scripts start',
+        build: 'react-scripts build',
+      },
+      dependencies: {
+        next: '9.3.5',
+        react: '16.13.1',
+        'react-dom': '16.13.1',
+        'react-scripts': '2.1.1',
+      },
+    };
+    const files = ['package.json', 'src/index.js', 'public/favicon.ico'];
+    const projectSettings = {
+      framework: 'create-react-app',
+      buildCommand: 'react-scripts build',
+      createdAt: Date.parse('2020-07-01'),
+    };
+
+    const { builders, errorRoutes } = await detectBuilders(files, pkg, {
+      projectSettings,
+      featHandleMiss,
+    });
+
+    expect(builders).toEqual([
+      {
+        use: '@vercel/static-build',
+        src: 'package.json',
+        config: {
+          zeroConfig: true,
+          framework: projectSettings.framework,
+          buildCommand: projectSettings.buildCommand,
+        },
+      },
+    ]);
+    expect(errorRoutes!.length).toBe(1);
+    expect((errorRoutes![0] as Source).status).toBe(404);
+  });
+
   it('Using "Other" framework with Storybook should NOT autodetect Next.js for new projects', async () => {
     const pkg = {
       scripts: {

packages/now-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "20.1.0",
+  "version": "20.1.3-canary.0",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -61,9 +61,9 @@
     "node": ">= 10"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.5.1",
+    "@vercel/build-utils": "2.5.5-canary.0",
     "@vercel/go": "1.1.6",
-    "@vercel/node": "1.8.1",
+    "@vercel/node": "1.8.4",
     "@vercel/python": "1.2.3",
     "@vercel/ruby": "1.2.4",
     "update-notifier": "4.1.0"
@@ -100,7 +100,7 @@
     "@types/universal-analytics": "0.4.2",
     "@types/which": "1.3.2",
     "@types/write-json-file": "2.2.1",
-    "@vercel/frameworks": "0.1.1",
+    "@vercel/frameworks": "0.1.2-canary.0",
     "@vercel/ncc": "0.24.0",
     "@zeit/fun": "0.11.2",
     "@zeit/source-map-support": "0.6.2",
@@ -134,7 +134,7 @@
     "fs-extra": "7.0.1",
     "get-port": "5.1.1",
     "glob": "7.1.2",
-    "http-proxy": "1.17.0",
+    "http-proxy": "1.18.1",
     "inquirer": "7.0.4",
     "is-port-reachable": "3.0.0",
     "is-url": "1.2.2",
@@ -147,7 +147,7 @@
     "mri": "1.1.5",
     "ms": "2.1.2",
     "nanoid": "3.0.2",
-    "node-fetch": "2.6.0",
+    "node-fetch": "2.6.1",
     "npm-package-arg": "6.1.0",
     "nyc": "13.2.0",
     "ora": "3.4.0",
@@ -168,7 +168,7 @@
     "text-table": "0.2.0",
     "title": "3.4.1",
     "tmp-promise": "1.0.3",
-    "tree-kill": "1.2.1",
+    "tree-kill": "1.2.2",
     "ts-node": "8.3.0",
     "typescript": "3.9.3",
     "universal-analytics": "0.4.20",

packages/now-cli/src/commands/alias/index.js

@@ -18,7 +18,7 @@ const help = () => {
 
   ${chalk.dim('Commands:')}
 
-    ls    [app]                  Show all aliases (or per app name)
+    ls                           Show all aliases
     set   <deployment> <alias>   Create a new alias
     rm    <alias>                Remove an alias using its hostname
 
@@ -39,19 +39,19 @@ const help = () => {
     -N, --next                          Show next page of results
   ${chalk.dim('Examples:')}
 
-  ${chalk.gray('–')} Add a new alias to ${chalk.underline('my-api.now.sh')}
+  ${chalk.gray('–')} Add a new alias to ${chalk.underline('my-api.vercel.app')}
 
       ${chalk.cyan(
         `$ ${getPkgName()} alias set ${chalk.underline(
-          'api-ownv3nc9f8.now.sh'
-        )} ${chalk.underline('my-api.now.sh')}`
+          'api-ownv3nc9f8.vercel.app'
+        )} ${chalk.underline('my-api.vercel.app')}`
       )}
 
       Custom domains work as alias targets
 
       ${chalk.cyan(
         `$ ${getPkgName()} alias set ${chalk.underline(
-          'api-ownv3nc9f8.now.sh'
+          'api-ownv3nc9f8.vercel.app'
         )} ${chalk.underline('my-api.com')}`
       )}
 

packages/now-cli/src/commands/alias/ls.js

@@ -1,6 +1,5 @@
 import chalk from 'chalk';
 import ms from 'ms';
-import plural from 'pluralize';
 import table from 'text-table';
 import Now from '../../util';
 import Client from '../../util/client.ts';
@@ -52,21 +51,17 @@ export default async function ls(ctx, opts, args, output) {
   const lsStamp = stamp();
   let cancelWait;
 
-  if (args.length > 1) {
+  if (args.length > 0) {
     output.error(
       `Invalid number of arguments. Usage: ${chalk.cyan(
-        `${getCommandName('alias ls [alias]')}`
+        `${getCommandName('alias ls')}`
       )}`
     );
     return 1;
   }
 
   cancelWait = output.spinner(
-    args[0]
-      ? `Fetching alias details for "${args[0]}" under ${chalk.bold(
-          contextName
-        )}`
-      : `Fetching aliases under ${chalk.bold(contextName)}`
+    `Fetching aliases under ${chalk.bold(contextName)}`
   );
 
   const { aliases, pagination } = await getAliases(
@@ -76,32 +71,8 @@ export default async function ls(ctx, opts, args, output) {
   );
   if (cancelWait) cancelWait();
 
-  if (args[0]) {
-    const alias = aliases.find(
-      item => item.uid === args[0] || item.alias === args[0]
-    );
-    if (!alias) {
-      output.error(`Could not match path alias for: ${args[0]}`);
-      now.close();
-      return 1;
-    }
-
-    if (opts['--json']) {
-      console.log(JSON.stringify({ rules: alias.rules }, null, 2));
-    } else {
-      const rules = alias.rules || [];
-      output.log(
-        `${rules.length} path alias ${plural(
-          'rule',
-          rules.length
-        )} found under ${chalk.bold(contextName)} ${lsStamp()}`
-      );
-      output.print(`${printPathAliasTable(rules)}\n`);
-    }
-  } else {
-    output.log(`aliases found under ${chalk.bold(contextName)} ${lsStamp()}`);
-    console.log(printAliasTable(aliases));
-  }
+  output.log(`aliases found under ${chalk.bold(contextName)} ${lsStamp()}`);
+  console.log(printAliasTable(aliases));
 
   if (pagination && pagination.count === 20) {
     const flags = getCommandFlags(opts, ['_', '--next']);
@@ -121,14 +92,10 @@ function printAliasTable(aliases) {
     [
       ['source', 'url', 'age'].map(h => chalk.gray(h)),
       ...aliases.map(a => [
-        a.rules && a.rules.length
-          ? chalk.cyan(`[${plural('rule', a.rules.length, true)}]`)
-          : // for legacy reasons, we might have situations
-          // where the deployment was deleted and the alias
-          // not collected appropriately, and we need to handle it
-          a.deployment && a.deployment.url
-          ? a.deployment.url
-          : chalk.gray('–'),
+        // for legacy reasons, we might have situations
+        // where the deployment was deleted and the alias
+        // not collected appropriately, and we need to handle it
+        a.deployment && a.deployment.url ? a.deployment.url : chalk.gray('–'),
         a.alias,
         ms(Date.now() - new Date(a.createdAt)),
       ]),
@@ -140,21 +107,3 @@ function printAliasTable(aliases) {
     }
   ).replace(/^/gm, '  ')}\n\n`;
 }
-
-function printPathAliasTable(rules) {
-  const header = [['pathname', 'method', 'dest'].map(s => chalk.gray(s))];
-  return `${table(
-    header.concat(
-      rules.map(rule => [
-        rule.pathname ? rule.pathname : chalk.cyan('[fallthrough]'),
-        rule.method ? rule.method : '*',
-        rule.dest,
-      ])
-    ),
-    {
-      align: ['l', 'l', 'l', 'l'],
-      hsep: ' '.repeat(6),
-      stringLength: strlen,
-    }
-  ).replace(/^(.*)/gm, '  $1')}\n`;
-}

packages/now-cli/src/commands/alias/set.ts

@@ -96,7 +96,7 @@ export default async function set(
     return 1;
   }
 
-  // For `now alias set <argument>`
+  // For `vercel alias set <argument>`
   if (args.length === 1) {
     const deployment = handleCertError(
       output,
@@ -261,7 +261,7 @@ function handleSetupDomainError<T>(
         { extraSpace: '     ' }
       )}\n\n`
     );
-    output.print('  Read more: https://err.sh/now/domain-verification\n');
+    output.print('  Read more: https://err.sh/vercel/domain-verification\n');
     return 1;
   }
 
@@ -388,7 +388,7 @@ function handleCreateAliasError<T>(
   }
   if (error instanceof ERRORS.InvalidAlias) {
     output.error(
-      `Invalid alias. Please confirm that the alias you provided is a valid hostname. Note: For \`now.sh\`, only sub and sub-sub domains are supported.`
+      `Invalid alias. Please confirm that the alias you provided is a valid hostname. Note: For \`vercel.app\`, only sub and sub-sub domains are supported.`
     );
     return 1;
   }

packages/now-cli/src/commands/certs/issue.ts

@@ -75,7 +75,7 @@ export default async function issue(
   }
 
   if (crtPath || keyPath || caPath) {
-    if (args.length !== 0 || (!crtPath || !keyPath || !caPath)) {
+    if (args.length !== 0 || !crtPath || !keyPath || !caPath) {
       output.error(
         `Invalid number of arguments to create a custom certificate entry. Usage:`
       );
@@ -230,6 +230,8 @@ async function runStartOrder(
   output.print(
     `  ${chalk.cyan(getCommandName(`certs issue ${cns.join(' ')}`))}\n`
   );
-  output.print('  Read more: https://err.sh/now/solve-challenges-manually\n');
+  output.print(
+    '  Read more: https://err.sh/vercel/solve-challenges-manually\n'
+  );
   return 0;
 }

packages/now-cli/src/commands/deploy/args.js

@@ -1,7 +1,5 @@
 import chalk from 'chalk';
 import logo from '../../util/output/logo';
-import code from '../../util/output/code';
-import note from '../../util/output/note';
 import { getPkgName } from '../../util/pkg-name.ts';
 
 export const help = () => `
@@ -70,12 +68,6 @@ export const help = () => `
     --prod                         Create a production deployment
     -c, --confirm                  Confirm default options and skip questions
 
-  ${note(
-    `To view the usage information for Now 1.0, run ${code(
-      `${getPkgName()} help deploy-v1`
-    )}`
-  )}
-
   ${chalk.dim('Examples:')}
 
   ${chalk.gray('–')} Deploy the current directory

packages/now-cli/src/commands/deploy/latest.js

@@ -104,7 +104,7 @@ const printDeploymentStatus = async (
 
   if (readyState !== 'READY') {
     output.error(
-      `Your deployment failed. Please retry later. More: https://err.sh/now/deployment-error`
+      `Your deployment failed. Please retry later. More: https://err.sh/vercel/deployment-error`
     );
     return 1;
   }
@@ -157,17 +157,21 @@ const printDeploymentStatus = async (
   }
 
   if (indications) {
+    const indent = process.stdout.isTTY ? '    ' : ''; // if using emojis
+    const newline = '\n';
     for (let indication of indications) {
-      output.print(
-        prependEmoji(
-          `${chalk.dim(indication.payload)}`,
-          emoji(indication.type)
-        ) +
-          `\n` +
-          (indication.link
-            ? `${indication.action || 'Learn More'}: ${indication.link}\n\n`
-            : '')
-      );
+      const message =
+        prependEmoji(chalk.dim(indication.payload), emoji(indication.type)) +
+        newline;
+      let link = '';
+      if (indication.link)
+        link =
+          indent +
+          chalk.dim(
+            `${indication.action || 'Learn More'}: ${indication.link}`
+          ) +
+          newline;
+      output.print(message + link);
     }
   }
 };
@@ -243,11 +247,6 @@ export default async function main(
   const { isFile, path } = pathValidation;
   const autoConfirm = argv['--confirm'] || isFile;
 
-  // --no-scale
-  if (argv['--no-scale']) {
-    warn(`The option --no-scale is only supported on Now 1.0 deployments`);
-  }
-
   // deprecate --name
   if (argv['--name']) {
     output.print(

packages/now-cli/src/commands/dev/index.ts

@@ -99,7 +99,7 @@ export default async function main(ctx: NowContext) {
             'package.json'
           )} must not contain ${cmd('now dev')}`
         );
-        output.error(`Learn More: http://err.sh/now/now-dev-as-dev-script`);
+        output.error(`Learn More: http://err.sh/vercel/now-dev-as-dev-script`);
         return 1;
       }
       if (scripts && scripts.dev && /\bvercel\b\W+\bdev\b/.test(scripts.dev)) {
@@ -108,7 +108,7 @@ export default async function main(ctx: NowContext) {
             'package.json'
           )} must not contain ${cmd('vercel dev')}`
         );
-        output.error(`Learn More: http://err.sh/now/now-dev-as-dev-script`);
+        output.error(`Learn More: http://err.sh/vercel/now-dev-as-dev-script`);
         return 1;
       }
     }

packages/now-cli/src/types.ts

@@ -117,12 +117,6 @@ export type Deployment = {
   creator: { uid: string };
 };
 
-type PathAliasRule = {
-  pathname: string;
-  method: Array<'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE'>;
-  dest: string;
-};
-
 export type Alias = {
   uid: string;
   alias: string;
@@ -137,13 +131,6 @@ export type Alias = {
     email: string;
   };
   deploymentId?: string;
-  rules?: PathAliasRule[];
-};
-
-export type PathRule = {
-  dest: string;
-  pathname?: string;
-  method?: Array<string>;
 };
 
 export type DNSRecord = {

packages/now-cli/src/util/certs/handle-cert-error.ts

@@ -67,13 +67,15 @@ export default function handleCertError<T>(
       output.print(
         `  ${getCommandName(`certs issue --challenge-only <cns>`)}\n`
       );
-      output.print('  Read more: https://err.sh/now/dns-configuration-error\n');
+      output.print(
+        '  Read more: https://err.sh/vercel/dns-configuration-error\n'
+      );
     } else {
       output.print(
         `  We configured them for you, but the propagation may take a few minutes. Please try again later.\n`
       );
       output.print(
-        '  Read more: https://err.sh/now/dns-configuration-error\n\n'
+        '  Read more: https://err.sh/vercel/dns-configuration-error\n\n'
       );
     }
     return 1;

packages/now-cli/src/util/deploy/process-deployment.ts

@@ -172,6 +172,10 @@ export default async function processDeployment({
       if (event.type === 'created') {
         deployingSpinner();
 
+        if (bar && !bar.complete) {
+          bar.tick(bar.total + 1);
+        }
+
         now._host = event.payload.url;
 
         await linkFolderToProject(

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

@@ -923,9 +923,17 @@ export default class DevServer {
     await once(this.watcher, 'ready');
 
     // Configure the server to forward WebSocket "upgrade" events to the proxy.
-    this.server.on('upgrade', (req, socket, head) => {
+    this.server.on('upgrade', async (req, socket, head) => {
+      await this.startPromise;
+      if (!this.devProcessPort) {
+        this.output.debug(
+          `Detected "upgrade" event, but closing socket because no frontend dev server is running`
+        );
+        socket.destroy();
+        return;
+      }
       const target = `http://localhost:${this.devProcessPort}`;
-      this.output.debug(`Detected upgrade event, proxying to ${target}`);
+      this.output.debug(`Detected "upgrade" event, proxying to ${target}`);
       this.proxy.ws(req, socket, head, { target });
     });
 
@@ -1364,6 +1372,7 @@ export default class DevServer {
     const missRoutes = handleMap.get('miss') || [];
     const hitRoutes = handleMap.get('hit') || [];
     const errorRoutes = handleMap.get('error') || [];
+    const filesystemRoutes = handleMap.get('filesystem') || [];
     const phases: (HandleValue | null)[] = [null, 'filesystem'];
 
     let routeResult: RouteResult | null = null;
@@ -1481,6 +1490,11 @@ export default class DevServer {
         // end the phase
         break;
       }
+
+      if (phase === null && filesystemRoutes.length === 0) {
+        // hack to skip the reset from null to filesystem
+        break;
+      }
     }
 
     if (!match && routeResult && errorRoutes.length > 0) {

packages/now-cli/src/util/errors-ts.ts

@@ -999,7 +999,7 @@ export class MissingDotenvVarsError extends NowError<
       ].join('\n');
     }
 
-    message += '\nRead more: https://err.sh/now/missing-env-file';
+    message += '\nRead more: https://err.sh/vercel/missing-env-file';
 
     super({
       code: 'MISSING_DOTENV_VARS',

packages/now-cli/src/util/index.js

@@ -186,7 +186,7 @@ export default class Now extends EventEmitter {
         const { key } = error;
         err.message =
           `The env key ${key} has an invalid type: ${typeof env[key]}. ` +
-          'Please supply a String or a Number (https://err.sh/now-cli/env-value-invalid-type)';
+          'Please supply a String or a Number (https://err.sh/vercel-cli/env-value-invalid-type)';
       } else if (code === 'unreferenced_build_specifications') {
         const count = unreferencedBuildSpecs.length;
         const prefix = count === 1 ? 'build' : 'builds';

packages/now-cli/src/util/output/create-output.ts

@@ -33,7 +33,7 @@ export default function createOutput({ debug: debugEnabled = false } = {}) {
       boxen?: boxen.Options;
     }
   ) {
-    const details = slug ? `https://err.sh/now/${slug}` : link;
+    const details = slug ? `https://err.sh/vercel/${slug}` : link;
 
     print(
       boxen(
@@ -66,7 +66,7 @@ export default function createOutput({ debug: debugEnabled = false } = {}) {
     action = 'Learn More'
   ) {
     print(`${chalk.red(`Error!`)} ${str}\n`);
-    const details = slug ? `https://err.sh/now/${slug}` : link;
+    const details = slug ? `https://err.sh/vercel/${slug}` : link;
     if (details) {
       print(`${chalk.bold(action)}: ${renderLink(details)}\n`);
     }

packages/now-cli/src/util/output/error.ts

@@ -10,7 +10,7 @@ export default function error(...input: string[] | [APIError]) {
   if (typeof input[0] === 'object') {
     const { slug, message, link, action = 'Learn More' } = input[0];
     messages = [message];
-    const details = slug ? `https://err.sh/now/${slug}` : link;
+    const details = slug ? `https://err.sh/vercel/${slug}` : link;
     if (details) {
       messages.push(`${chalk.bold(action)}: ${renderLink(details)}`);
     }

packages/now-cli/test/dev/fixtures/10a-nextjs-routes/.gitignore

@@ -0,0 +1,3 @@
+node_modules
+.next
+.vercel

packages/now-cli/test/dev/fixtures/10a-nextjs-routes/package.json

@@ -0,0 +1,8 @@
+{
+  "private": true,
+  "dependencies": {
+    "next": "9.5.3",
+    "react": "16.13.1",
+    "react-dom": "16.13.1"
+  }
+}

packages/now-cli/test/dev/fixtures/10a-nextjs-routes/pages/api/hello.js

@@ -0,0 +1,3 @@
+module.exports = (_req, res) => {
+  res.end('Hello Routes');
+};

packages/now-cli/test/dev/fixtures/10a-nextjs-routes/pages/index.js

@@ -0,0 +1,10 @@
+function Index() {
+  return (
+    <main>
+      <h1>Next.js with routes</h1>
+      <a href="/hello">/hello</a>
+    </main>
+  );
+}
+
+export default Index;

packages/now-cli/test/dev/fixtures/10a-nextjs-routes/vercel.json

@@ -0,0 +1,3 @@
+{
+  "routes": [{ "src": "/hello", "dest": "/api/hello" }]
+}

packages/now-cli/test/dev/fixtures/node-ts-node-target/tsconfig.json

@@ -1,5 +1,68 @@
 {
   "compilerOptions": {
-    "module": "CommonJS"
+    /* Visit https://aka.ms/tsconfig.json to read more about this file */
+
+    /* Basic Options */
+    // "incremental": true,                   /* Enable incremental compilation */
+    "module": "CommonJS",
+    // "lib": [],                             /* Specify library files to be included in the compilation. */
+    // "allowJs": true,                       /* Allow javascript files to be compiled. */
+    // "checkJs": true,                       /* Report errors in .js files. */
+    // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+    // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "sourceMap": true,                     /* Generates corresponding '.map' file. */
+    // "outFile": "./",                       /* Concatenate and emit output to single file. */
+    // "outDir": "./",                        /* Redirect output structure to the directory. */
+    // "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+    // "composite": true,                     /* Enable project compilation */
+    // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
+    // "removeComments": true,                /* Do not emit comments to output. */
+    // "noEmit": true,                        /* Do not emit outputs. */
+    // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+    // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+    /* Strict Type-Checking Options */
+    "strict": true /* Enable all strict type-checking options. */,
+    // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+    // "strictNullChecks": true,              /* Enable strict null checks. */
+    // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
+    // "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+    // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
+    // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
+    // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+
+    /* Additional Checks */
+    // "noUnusedLocals": true,                /* Report errors on unused locals. */
+    // "noUnusedParameters": true,            /* Report errors on unused parameters. */
+    // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+    // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+    /* Module Resolution Options */
+    // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
+    // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+    // "typeRoots": [],                       /* List of folders to include type definitions from. */
+    // "types": [],                           /* Type declaration files to be included in compilation. */
+    // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+    "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
+    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+    // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
+
+    /* Source Map Options */
+    // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+    // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
+    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+    /* Experimental Options */
+    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+    // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+
+    /* Advanced Options */
+    "skipLibCheck": true /* Skip type checking of declaration files. */,
+    "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
   }
 }

packages/now-cli/test/dev/integration.js

@@ -10,7 +10,7 @@ import retry from 'async-retry';
 import { satisfies } from 'semver';
 import { getDistTag } from '../../src/util/get-dist-tag';
 import { version as cliVersion } from '../../package.json';
-import { fetchTokenWithRetry } from '../../../../test/lib/deployment/now-deploy';
+import { fetchCachedToken } from '../../../../test/lib/deployment/now-deploy';
 
 const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
 const isCanary = () => getDistTag(cliVersion) === 'canary';
@@ -245,7 +245,7 @@ function testFixtureStdio(
     const cwd = isExample
       ? exampleAbsolute(directory)
       : fixtureAbsolute(directory);
-    const token = await fetchTokenWithRetry();
+    const token = await fetchCachedToken();
     let deploymentUrl;
 
     // Deploy fixture and link project
@@ -1180,6 +1180,14 @@ test(
   })
 );
 
+test(
+  '[vercel dev] 10a-nextjs-routes',
+  testFixtureStdio('10a-nextjs-routes', async testPath => {
+    await testPath(200, '/', /Next.js with routes/m);
+    await testPath(200, '/hello', /Hello Routes/m);
+  })
+);
+
 test(
   '[vercel dev] 12-polymer-node',
   testFixtureStdio(

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

@@ -28,9 +28,6 @@ module.exports = async function prepare(session) {
       'first.png': getImageFile(session, { size: 30 }),
       'second.png': getImageFile(session, { size: 20 }),
     },
-    'single-dotfile': {
-      '.testing': 'i am a dotfile',
-    },
     'empty-directory': {},
     'config-scope-property-email': {
       'now.json': `{ "scope": "${session}@zeit.pub", "builds": [ { "src": "*.html", "use": "@now/static" } ] }`,
@@ -90,7 +87,7 @@ module.exports = async function prepare(session) {
       }),
       'now-build.js': `
         const fs = require('fs');
-        fs.writeFileSync( 
+        fs.writeFileSync(
           'index.js',
           fs.readFileSync('index.js', 'utf8')
           .replace('BUILD_ENV_DEBUG', process.env.NOW_BUILDER_DEBUG ? 'on' : 'off'),
@@ -207,23 +204,6 @@ module.exports = async function prepare(session) {
         },
       }),
     },
-    'alias-rules': {
-      'rules.json': JSON.stringify({
-        rules: [
-          // for example:
-          // { pathname: '/', dest: '' },
-          // { pathname: '/', dest: '', method: 'GET' }
-          // Will be generated by the actual test
-        ],
-      }),
-      'invalid-rules.json': JSON.stringify({
-        what: { what: 0 },
-      }),
-      'invalid-type-rules.json': JSON.stringify({
-        rules: { what: 0 },
-      }),
-      'invalid-json-rules.json': '==ok',
-    },
     'zero-config-next-js': {
       'pages/index.js':
         'export default () => <div><h1>Now CLI test</h1><p>Zero-config + Next.js</p></div>',

packages/now-cli/test/integration.js

@@ -2365,7 +2365,6 @@ test('invalid `--token`', async t => {
   );
 });
 
-// We need to skip this test until `now-php` supports Runtime version 3
 test('deploy a Lambda with a specific runtime', async t => {
   const directory = fixture('lambda-with-php-runtime');
   const output = await execute([directory, '--public', '--confirm']);
@@ -2374,7 +2373,8 @@ test('deploy a Lambda with a specific runtime', async t => {
 
   const { host: url } = new URL(output.stdout);
 
-  const [build] = await getDeploymentBuildsByUrl(url);
+  const builds = await getDeploymentBuildsByUrl(url);
+  const build = builds.find(b => b.use && b.use.includes('php')) || builds[0];
   t.is(build.use, 'vercel-php@0.1.0', JSON.stringify(build, null, 2));
 });
 

packages/now-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/client",
-  "version": "9.0.1",
+  "version": "9.0.4-canary.0",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "homepage": "https://vercel.com",
@@ -37,14 +37,14 @@
     ]
   },
   "dependencies": {
-    "@vercel/build-utils": "2.5.1",
+    "@vercel/build-utils": "2.5.5-canary.0",
     "@zeit/fetch": "5.2.0",
     "async-retry": "1.2.3",
     "async-sema": "3.0.0",
     "fs-extra": "8.0.1",
     "ignore": "4.0.6",
     "ms": "2.1.2",
-    "node-fetch": "2.6.0",
+    "node-fetch": "2.6.1",
     "querystring": "^0.2.0",
     "recursive-readdir": "2.2.2",
     "sleep-promise": "8.0.1"

packages/now-client/tests/common.ts

@@ -1,10 +1,10 @@
 const {
-  fetchTokenWithRetry,
+  fetchCachedToken,
   // eslint-disable-next-line @typescript-eslint/no-var-requires
 } = require('../../../test/lib/deployment/now-deploy.js');
 
 export async function generateNewToken(): Promise<string> {
-  const token = await fetchTokenWithRetry();
+  const token = await fetchCachedToken();
   return token;
 }
 

packages/now-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "2.6.24",
+  "version": "2.6.33",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -26,10 +26,10 @@
     "@types/resolve-from": "5.0.1",
     "@types/semver": "6.0.0",
     "@types/yazl": "2.4.1",
-    "@zeit/node-file-trace": "0.8.2",
+    "@vercel/nft": "0.9.2",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",
-    "escape-string-regexp": "3.0.0",
+    "escape-string-regexp": "2.0.0",
     "execa": "2.0.4",
     "find-up": "4.1.0",
     "fs-extra": "7.0.0",

packages/now-next/src/create-serverless-config.ts

@@ -59,7 +59,7 @@ export default async function createServerlessConfig(
 
   const primaryConfigPath = path.join(entryPath, 'next.config.js');
   const secondaryConfigPath = path.join(workPath, 'next.config.js');
-  const backupConfigName = `next.config.original.${Date.now()}.js`;
+  const backupConfigName = `next.config.__vercel_builder_backup__.js`;
 
   const hasPrimaryConfig = fs.existsSync(primaryConfigPath);
   const hasSecondaryConfig = fs.existsSync(secondaryConfigPath);

packages/now-next/src/templated-launcher-shared.ts

@@ -1,3 +1,9 @@
+// The Next.js builder can emit the project in a subdirectory depending on how
+// many folder levels of `node_modules` are traced. To ensure `process.cwd()`
+// returns the proper path, we change the directory to the folder with the
+// launcher. This mimics `yarn workspace run` behavior.
+process.chdir(__dirname);
+
 if (!process.env.NODE_ENV) {
   const region = process.env.VERCEL_REGION || process.env.NOW_REGION;
   process.env.NODE_ENV = region === 'dev1' ? 'development' : 'production';

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

@@ -1,3 +1,9 @@
+// The Next.js builder can emit the project in a subdirectory depending on how
+// many folder levels of `node_modules` are traced. To ensure `process.cwd()`
+// returns the proper path, we change the directory to the folder with the
+// launcher. This mimics `yarn workspace run` behavior.
+process.chdir(__dirname);
+
 if (!process.env.NODE_ENV) {
   const region = process.env.VERCEL_REGION || process.env.NOW_REGION;
   process.env.NODE_ENV = region === 'dev1' ? 'development' : 'production';

packages/now-next/src/utils.ts

@@ -326,6 +326,16 @@ export type RoutesManifest = {
     namedDataRouteRegex?: string;
     routeKeys?: { [named: string]: string };
   }>;
+  i18n?: {
+    defaultLocale: string;
+    locales: string[];
+    domains?: Array<{
+      http?: boolean;
+      domain: string;
+      locales?: string[];
+      defaultLocale: string;
+    }>;
+  };
 };
 
 export async function getRoutesManifest(
@@ -502,6 +512,41 @@ export async function getDynamicRoutes(
   return routes;
 }
 
+type LoaderKey = 'imgix' | 'cloudinary' | 'akamai' | 'default';
+
+type ImagesManifest = {
+  version: number;
+  images: {
+    loader: LoaderKey;
+    sizes: number[];
+    domains: string[];
+  };
+};
+
+export async function getImagesManifest(
+  entryPath: string,
+  outputDirectory: string
+): Promise<ImagesManifest | undefined> {
+  const pathImagesManifest = path.join(
+    entryPath,
+    outputDirectory,
+    'images-manifest.json'
+  );
+
+  const hasImagesManifest = await fs
+    .access(pathImagesManifest)
+    .then(() => true)
+    .catch(() => false);
+
+  if (!hasImagesManifest) {
+    return undefined;
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const imagesManifest: ImagesManifest = require(pathImagesManifest);
+  return imagesManifest;
+}
+
 function syncEnvVars(base: EnvConfig, removeEnv: EnvConfig, addEnv: EnvConfig) {
   // Remove any env vars from `removeEnv`
   // that are not present in the `addEnv`
@@ -711,6 +756,8 @@ export type NextPrerenderedRoutes = {
   };
 
   omittedRoutes: string[];
+
+  notFoundRoutes: string[];
 };
 
 export async function getExportIntent(
@@ -801,6 +848,7 @@ export async function getPrerenderManifest(
       fallbackRoutes: {},
       bypassToken: null,
       omittedRoutes: [],
+      notFoundRoutes: [],
     };
   }
 
@@ -846,6 +894,7 @@ export async function getPrerenderManifest(
         preview: {
           previewModeId: string;
         };
+        notFoundRoutes?: string[];
       } = JSON.parse(await fs.readFile(pathPrerenderManifest, 'utf8'));
 
   switch (manifest.version) {
@@ -860,6 +909,7 @@ export async function getPrerenderManifest(
         bypassToken:
           (manifest.preview && manifest.preview.previewModeId) || null,
         omittedRoutes: [],
+        notFoundRoutes: [],
       };
 
       routes.forEach(route => {
@@ -914,8 +964,13 @@ export async function getPrerenderManifest(
         fallbackRoutes: {},
         bypassToken: manifest.preview.previewModeId,
         omittedRoutes: [],
+        notFoundRoutes: [],
       };
 
+      if (manifest.notFoundRoutes) {
+        ret.notFoundRoutes.push(...manifest.notFoundRoutes);
+      }
+
       routes.forEach(route => {
         const {
           initialRevalidateSeconds,
@@ -969,6 +1024,7 @@ export async function getPrerenderManifest(
         fallbackRoutes: {},
         bypassToken: null,
         omittedRoutes: [],
+        notFoundRoutes: [],
       };
     }
   }
@@ -1000,11 +1056,78 @@ async function getSourceFilePathFromPage({
   workPath: string;
   page: string;
 }) {
+  let fsPath = path.join(workPath, 'pages', page);
   if (await usesSrcDirectory(workPath)) {
-    return path.join('src', 'pages', page);
+    fsPath = path.join(workPath, 'src', 'pages', page);
   }
 
-  return path.join('pages', page);
+  if (fs.existsSync(fsPath)) {
+    return path.relative(workPath, fsPath);
+  }
+
+  const extensionless = fsPath.slice(0, -3); // remove ".js"
+  fsPath = extensionless + '.ts';
+  if (fs.existsSync(fsPath)) {
+    return path.relative(workPath, fsPath);
+  }
+
+  if (isDirectory(extensionless)) {
+    fsPath = path.join(extensionless, 'index.js');
+    if (fs.existsSync(fsPath)) {
+      return path.relative(workPath, fsPath);
+    }
+    fsPath = path.join(extensionless, 'index.ts');
+    if (fs.existsSync(fsPath)) {
+      return path.relative(workPath, fsPath);
+    }
+  }
+
+  console.log(`WARNING: Unable to find source file for page ${page}`);
+  return '';
+}
+
+function isDirectory(path: string) {
+  return fs.existsSync(path) && fs.lstatSync(path).isDirectory();
+}
+
+export function normalizeLocalePath(
+  pathname: string,
+  locales?: string[]
+): {
+  detectedLocale?: string;
+  pathname: string;
+} {
+  let detectedLocale: string | undefined;
+  // first item will be empty string from splitting at first char
+  const pathnameParts = pathname.split('/');
+
+  (locales || []).some(locale => {
+    if (pathnameParts[1].toLowerCase() === locale.toLowerCase()) {
+      detectedLocale = locale;
+      pathnameParts.splice(1, 1);
+      pathname = pathnameParts.join('/') || '/';
+      return true;
+    }
+    return false;
+  });
+
+  return {
+    pathname,
+    detectedLocale,
+  };
+}
+
+export function addLocaleOrDefault(
+  pathname: string,
+  routesManifest?: RoutesManifest,
+  locale?: string
+) {
+  if (!routesManifest?.i18n) return pathname;
+  if (!locale) locale = routesManifest.i18n.defaultLocale;
+
+  return locale
+    ? `/${locale}${pathname === '/index' ? '' : pathname}`
+    : pathname;
 }
 
 export {

packages/now-next/test/fixtures/00-i18n-support-no-shared-lambdas/next.config.js

@@ -0,0 +1,21 @@
+module.exports = {
+  generateBuildId() {
+    return 'testing-build-id';
+  },
+  i18n: {
+    locales: ['nl-NL', 'nl-BE', 'nl', 'fr-BE', 'fr', 'en-US', 'en'],
+    defaultLocale: 'en-US',
+    // TODO: testing locale domains support, will require custom
+    // testing set-up as test accounts are used currently
+    domains: [
+      {
+        domain: 'example.be',
+        defaultLocale: 'nl-BE',
+      },
+      {
+        domain: 'example.fr',
+        defaultLocale: 'fr',
+      },
+    ],
+  },
+};

packages/now-next/test/fixtures/00-i18n-support-no-shared-lambdas/now.json

@@ -0,0 +1,318 @@
+{
+  "version": 2,
+  "builds": [
+    {
+      "src": "package.json",
+      "use": "@vercel/next",
+      "config": {
+        "sharedLambdas": false
+      }
+    }
+  ],
+  "probes": [
+    {
+      "path": "/",
+      "headers": {
+        "accept-language": "en;q=0.9"
+      },
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 307,
+      "responseHeaders": {
+        "location": "//en/"
+      }
+    },
+    {
+      "path": "/",
+      "headers": {
+        "accept-language": "nl;q=0.9"
+      },
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 307,
+      "responseHeaders": {
+        "location": "//nl/"
+      }
+    },
+    {
+      "path": "/",
+      "headers": {
+        "accept-language": "nl-NL;q=0.9"
+      },
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 307,
+      "responseHeaders": {
+        "location": "//nl-NL/"
+      }
+    },
+    {
+      "path": "/",
+      "headers": {
+        "accept-language": "fr;q=0.9"
+      },
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 307,
+      "responseHeaders": {
+        "location": "//fr/"
+      }
+    },
+    {
+      "path": "/",
+      "headers": {
+        "accept-language": "en-US;q=0.9"
+      },
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 200,
+      "mustContain": "index page"
+    },
+    {
+      "path": "/en-US",
+      "headers": {
+        "accept-language": "nl;q=0.9"
+      },
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 200,
+      "mustContain": "index page"
+    },
+
+    {
+      "path": "/",
+      "status": 200,
+      "mustContain": "index page"
+    },
+    {
+      "path": "/",
+      "status": 200,
+      "mustContain": ">en-US<"
+    },
+    {
+      "path": "/en",
+      "status": 200,
+      "mustContain": "index page"
+    },
+    {
+      "path": "/en",
+      "status": 200,
+      "mustContain": ">en<"
+    },
+    {
+      "path": "/fr",
+      "status": 200,
+      "mustContain": "index page"
+    },
+    {
+      "path": "/fr",
+      "status": 200,
+      "mustContain": ">fr<"
+    },
+    {
+      "path": "/nl",
+      "status": 200,
+      "mustContain": "index page"
+    },
+    {
+      "path": "/nl",
+      "status": 200,
+      "mustContain": ">nl<"
+    },
+    {
+      "path": "/nl-NL",
+      "status": 200,
+      "mustContain": "index page"
+    },
+    {
+      "path": "/nl-NL",
+      "status": 200,
+      "mustContain": ">nl-NL<"
+    },
+
+    {
+      "path": "/non-existent",
+      "status": 404
+    },
+    {
+      "path": "/fr/non-existent",
+      "status": 404,
+      "mustContain": "lang=\"fr\""
+    },
+    {
+      "path": "/en/non-existent",
+      "status": 404,
+      "mustContain": "lang=\"en\""
+    },
+    {
+      "path": "/en-US/non-existent",
+      "status": 404,
+      "mustContain": "lang=\"en-US\""
+    },
+    {
+      "path": "/nl/non-existent",
+      "status": 404,
+      "mustContain": "lang=\"nl\""
+    },
+    {
+      "path": "/nl-NL/non-existent",
+      "status": 404,
+      "mustContain": "lang=\"nl-NL\""
+    },
+
+    {
+      "path": "/hello.txt",
+      "status": 200,
+      "mustContain": "hello world!"
+    },
+
+    {
+      "path": "/gsp",
+      "status": 200,
+      "mustContain": "gsp page"
+    },
+    {
+      "path": "/gsp",
+      "status": 200,
+      "mustContain": ">en-US<"
+    },
+    {
+      "path": "/en/gsp",
+      "status": 200,
+      "mustContain": "gsp page"
+    },
+    {
+      "path": "/en/gsp",
+      "status": 200,
+      "mustContain": ">en<"
+    },
+    {
+      "path": "/nl/gsp",
+      "status": 200,
+      "mustContain": "gsp page"
+    },
+    {
+      "path": "/nl/gsp",
+      "status": 200,
+      "mustContain": ">nl<"
+    },
+    {
+      "path": "/fr/gsp",
+      "status": 200,
+      "mustContain": "gsp page"
+    },
+    {
+      "path": "/fr/gsp",
+      "status": 200,
+      "mustContain": ">fr<"
+    },
+
+    {
+      "path": "/gssp",
+      "status": 200,
+      "mustContain": "gssp page"
+    },
+    {
+      "path": "/gssp",
+      "status": 200,
+      "mustContain": ">en-US<"
+    },
+    {
+      "path": "/en/gssp",
+      "status": 200,
+      "mustContain": "gssp page"
+    },
+    {
+      "path": "/en/gssp",
+      "status": 200,
+      "mustContain": ">en<"
+    },
+    {
+      "path": "/nl/gssp",
+      "status": 200,
+      "mustContain": "gssp page"
+    },
+    {
+      "path": "/nl/gssp",
+      "status": 200,
+      "mustContain": ">nl<"
+    },
+    {
+      "path": "/fr/gssp",
+      "status": 200,
+      "mustContain": "gssp page"
+    },
+    {
+      "path": "/fr/gssp",
+      "status": 200,
+      "mustContain": ">fr<"
+    },
+
+    {
+      "path": "/gssp/first",
+      "status": 200,
+      "mustContain": "gssp page"
+    },
+    {
+      "path": "/gssp/first",
+      "status": 200,
+      "mustContain": ">en-US<"
+    },
+    {
+      "path": "/gssp/first",
+      "status": 200,
+      "mustContain": "slug\":\"first\""
+    },
+    {
+      "path": "/en/gssp/first",
+      "status": 200,
+      "mustContain": "gssp page"
+    },
+    {
+      "path": "/en/gssp/first",
+      "status": 200,
+      "mustContain": ">en<"
+    },
+    {
+      "path": "/en/gssp/first",
+      "status": 200,
+      "mustContain": "slug\":\"first\""
+    },
+    {
+      "path": "/nl/gssp/first",
+      "status": 200,
+      "mustContain": "gssp page"
+    },
+    {
+      "path": "/nl/gssp/first",
+      "status": 200,
+      "mustContain": ">nl<"
+    },
+    {
+      "path": "/nl/gssp/first",
+      "status": 200,
+      "mustContain": "slug\":\"first\""
+    },
+    {
+      "path": "/fr/gssp/first",
+      "status": 200,
+      "mustContain": "gssp page"
+    },
+    {
+      "path": "/fr/gssp/first",
+      "status": 200,
+      "mustContain": ">fr<"
+    },
+    {
+      "path": "/fr/gssp/first",
+      "status": 200,
+      "mustContain": "slug\":\"first\""
+    }
+  ]
+}

packages/now-next/test/fixtures/00-i18n-support-no-shared-lambdas/package.json

@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+    "next": "canary",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6"
+  }
+}

packages/now-next/test/fixtures/00-i18n-support-no-shared-lambdas/pages/another.js

@@ -0,0 +1,31 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+
+  return (
+    <>
+      <p id="another">another page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/">
+        <a id="to-index">to /</a>
+      </Link>
+      <br />
+    </>
+  );
+}
+
+export const getServerSideProps = ({ locale, locales }) => {
+  return {
+    props: {
+      locale,
+      locales,
+    },
+  };
+};

packages/now-next/test/fixtures/00-i18n-support-no-shared-lambdas/pages/auto-export/index.js

@@ -0,0 +1,21 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+
+  return (
+    <>
+      <p id="auto-export">auto-export page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/">
+        <a id="to-index">to /</a>
+      </Link>
+    </>
+  );
+}

packages/now-next/test/fixtures/00-i18n-support-no-shared-lambdas/pages/gsp/fallback/[slug].js

@@ -0,0 +1,44 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+
+  if (router.isFallback) return 'Loading...';
+
+  return (
+    <>
+      <p id="gsp">gsp page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/">
+        <a id="to-index">to /</a>
+      </Link>
+      <br />
+    </>
+  );
+}
+
+export const getStaticProps = ({ params, locale, locales }) => {
+  return {
+    props: {
+      params,
+      locale,
+      locales,
+    },
+  };
+};
+
+export const getStaticPaths = () => {
+  return {
+    // the default locale will be used since one isn't defined here
+    paths: ['first', 'second'].map(slug => ({
+      params: { slug },
+    })),
+    fallback: true,
+  };
+};

packages/now-next/test/fixtures/00-i18n-support-no-shared-lambdas/pages/gsp/index.js

@@ -0,0 +1,32 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+
+  return (
+    <>
+      <p id="gsp">gsp page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/">
+        <a id="to-index">to /</a>
+      </Link>
+      <br />
+    </>
+  );
+}
+
+// TODO: should non-dynamic GSP pages pre-render for each locale?
+export const getStaticProps = ({ locale, locales }) => {
+  return {
+    props: {
+      locale,
+      locales,
+    },
+  };
+};

packages/now-next/test/fixtures/00-i18n-support-no-shared-lambdas/pages/gsp/no-fallback/[slug].js

@@ -0,0 +1,46 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+
+  if (router.isFallback) return 'Loading...';
+
+  return (
+    <>
+      <p id="gsp">gsp page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/">
+        <a id="to-index">to /</a>
+      </Link>
+      <br />
+    </>
+  );
+}
+
+export const getStaticProps = ({ params, locale, locales }) => {
+  return {
+    props: {
+      params,
+      locale,
+      locales,
+    },
+  };
+};
+
+export const getStaticPaths = () => {
+  return {
+    paths: [
+      { params: { slug: 'first' } },
+      '/gsp/no-fallback/second',
+      { params: { slug: 'first' }, locale: 'en-US' },
+      '/nl-NL/gsp/no-fallback/second',
+    ],
+    fallback: false,
+  };
+};

packages/now-next/test/fixtures/00-i18n-support-no-shared-lambdas/pages/gssp/[slug].js

@@ -0,0 +1,32 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+
+  return (
+    <>
+      <p id="gssp">gssp page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/">
+        <a id="to-index">to /</a>
+      </Link>
+      <br />
+    </>
+  );
+}
+
+export const getServerSideProps = ({ params, locale, locales }) => {
+  return {
+    props: {
+      params,
+      locale,
+      locales,
+    },
+  };
+};

packages/now-next/test/fixtures/00-i18n-support-no-shared-lambdas/pages/gssp/index.js

@@ -0,0 +1,31 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+
+  return (
+    <>
+      <p id="gssp">gssp page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/">
+        <a id="to-index">to /</a>
+      </Link>
+      <br />
+    </>
+  );
+}
+
+export const getServerSideProps = ({ locale, locales }) => {
+  return {
+    props: {
+      locale,
+      locales,
+    },
+  };
+};

packages/now-next/test/fixtures/00-i18n-support-no-shared-lambdas/pages/index.js

@@ -0,0 +1,46 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+
+  return (
+    <>
+      <p id="index">index page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/another">
+        <a id="to-another">to /another</a>
+      </Link>
+      <br />
+      <Link href="/gsp">
+        <a id="to-gsp">to /gsp</a>
+      </Link>
+      <br />
+      <Link href="/gsp/fallback/first">
+        <a id="to-fallback-first">to /gsp/fallback/first</a>
+      </Link>
+      <br />
+      <Link href="/gsp/fallback/hello">
+        <a id="to-fallback-hello">to /gsp/fallback/hello</a>
+      </Link>
+      <br />
+      <Link href="/gsp/no-fallback/first">
+        <a id="to-no-fallback-first">to /gsp/no-fallback/first</a>
+      </Link>
+      <br />
+      <Link href="/gssp">
+        <a id="to-gssp">to /gssp</a>
+      </Link>
+      <br />
+      <Link href="/gssp/first">
+        <a id="to-gssp-slug">to /gssp/first</a>
+      </Link>
+      <br />
+    </>
+  );
+}

packages/now-next/test/fixtures/00-i18n-support-no-shared-lambdas/pages/links.js

@@ -0,0 +1,54 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+  const { nextLocale } = router.query;
+
+  return (
+    <>
+      <p id="links">links page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/another" locale={nextLocale}>
+        <a id="to-another">to /another</a>
+      </Link>
+      <br />
+      <Link href="/gsp" locale={nextLocale}>
+        <a id="to-gsp">to /gsp</a>
+      </Link>
+      <br />
+      <Link href="/gsp/fallback/first" locale={nextLocale}>
+        <a id="to-fallback-first">to /gsp/fallback/first</a>
+      </Link>
+      <br />
+      <Link href="/gsp/fallback/hello" locale={nextLocale}>
+        <a id="to-fallback-hello">to /gsp/fallback/hello</a>
+      </Link>
+      <br />
+      <Link href="/gsp/no-fallback/first" locale={nextLocale}>
+        <a id="to-no-fallback-first">to /gsp/no-fallback/first</a>
+      </Link>
+      <br />
+      <Link href="/gssp" locale={nextLocale}>
+        <a id="to-gssp">to /gssp</a>
+      </Link>
+      <br />
+      <Link href="/gssp/first" locale={nextLocale}>
+        <a id="to-gssp-slug">to /gssp/first</a>
+      </Link>
+      <br />
+    </>
+  );
+}
+
+// make SSR page so we have query values immediately
+export const getServerSideProps = () => {
+  return {
+    props: {},
+  };
+};

packages/now-next/test/fixtures/00-i18n-support-no-shared-lambdas/pages/not-found/fallback/[slug].js

@@ -0,0 +1,50 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+
+  if (router.isFallback) return 'Loading...';
+
+  return (
+    <>
+      <p id="gsp">gsp page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/">
+        <a id="to-index">to /</a>
+      </Link>
+      <br />
+    </>
+  );
+}
+
+export const getStaticProps = ({ params, locale, locales }) => {
+  if (locale === 'en' || locale === 'nl') {
+    return {
+      notFound: true,
+    };
+  }
+
+  return {
+    props: {
+      params,
+      locale,
+      locales,
+    },
+  };
+};
+
+export const getStaticPaths = () => {
+  return {
+    // the default locale will be used since one isn't defined here
+    paths: ['first', 'second'].map(slug => ({
+      params: { slug },
+    })),
+    fallback: true,
+  };
+};

packages/now-next/test/fixtures/00-i18n-support-no-shared-lambdas/pages/not-found/index.js

@@ -0,0 +1,37 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+
+  return (
+    <>
+      <p id="gsp">gsp page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/">
+        <a id="to-index">to /</a>
+      </Link>
+      <br />
+    </>
+  );
+}
+
+export const getStaticProps = ({ locale, locales }) => {
+  if (locale === 'en' || locale === 'nl') {
+    return {
+      notFound: true,
+    };
+  }
+
+  return {
+    props: {
+      locale,
+      locales,
+    },
+  };
+};

packages/now-next/test/fixtures/00-i18n-support-no-shared-lambdas/public/hello.txt

@@ -0,0 +1 @@
+hello world!

packages/now-next/test/fixtures/00-i18n-support/next.config.js

@@ -0,0 +1,21 @@
+module.exports = {
+  generateBuildId() {
+    return 'testing-build-id';
+  },
+  i18n: {
+    locales: ['nl-NL', 'nl-BE', 'nl', 'fr-BE', 'fr', 'en-US', 'en'],
+    defaultLocale: 'en-US',
+    // TODO: testing locale domains support, will require custom
+    // testing set-up as test accounts are used currently
+    domains: [
+      {
+        domain: 'example.be',
+        defaultLocale: 'nl-BE',
+      },
+      {
+        domain: 'example.fr',
+        defaultLocale: 'fr',
+      },
+    ],
+  },
+};

packages/now-next/test/fixtures/00-i18n-support/now.json

@@ -0,0 +1,432 @@
+{
+  "version": 2,
+  "builds": [
+    {
+      "src": "package.json",
+      "use": "@vercel/next"
+    }
+  ],
+  "probes": [
+    {
+      "path": "/",
+      "headers": {
+        "accept-language": "en;q=0.9"
+      },
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 307,
+      "responseHeaders": {
+        "location": "//en/"
+      }
+    },
+    {
+      "path": "/",
+      "headers": {
+        "accept-language": "nl;q=0.9"
+      },
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 307,
+      "responseHeaders": {
+        "location": "//nl/"
+      }
+    },
+    {
+      "path": "/",
+      "headers": {
+        "accept-language": "nl-NL;q=0.9"
+      },
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 307,
+      "responseHeaders": {
+        "location": "//nl-NL/"
+      }
+    },
+    {
+      "path": "/",
+      "headers": {
+        "accept-language": "fr;q=0.9"
+      },
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 307,
+      "responseHeaders": {
+        "location": "//fr/"
+      }
+    },
+    {
+      "path": "/",
+      "headers": {
+        "accept-language": "en-US;q=0.9"
+      },
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 200,
+      "mustContain": "index page"
+    },
+    {
+      "path": "/en-US",
+      "headers": {
+        "accept-language": "nl;q=0.9"
+      },
+      "fetchOptions": {
+        "redirect": "manual"
+      },
+      "status": 200,
+      "mustContain": "index page"
+    },
+
+    {
+      "path": "/",
+      "status": 200,
+      "mustContain": "index page"
+    },
+    {
+      "path": "/",
+      "status": 200,
+      "mustContain": ">en-US<"
+    },
+    {
+      "path": "/en",
+      "status": 200,
+      "mustContain": "index page"
+    },
+    {
+      "path": "/en",
+      "status": 200,
+      "mustContain": ">en<"
+    },
+    {
+      "path": "/fr",
+      "status": 200,
+      "mustContain": "index page"
+    },
+    {
+      "path": "/fr",
+      "status": 200,
+      "mustContain": ">fr<"
+    },
+    {
+      "path": "/nl",
+      "status": 200,
+      "mustContain": "index page"
+    },
+    {
+      "path": "/nl",
+      "status": 200,
+      "mustContain": ">nl<"
+    },
+    {
+      "path": "/nl-NL",
+      "status": 200,
+      "mustContain": "index page"
+    },
+    {
+      "path": "/nl-NL",
+      "status": 200,
+      "mustContain": ">nl-NL<"
+    },
+
+    {
+      "path": "/non-existent",
+      "status": 404
+    },
+    {
+      "path": "/fr/non-existent",
+      "status": 404,
+      "mustContain": "lang=\"fr\""
+    },
+    {
+      "path": "/en/non-existent",
+      "status": 404,
+      "mustContain": "lang=\"en\""
+    },
+    {
+      "path": "/en-US/non-existent",
+      "status": 404,
+      "mustContain": "lang=\"en-US\""
+    },
+    {
+      "path": "/nl/non-existent",
+      "status": 404,
+      "mustContain": "lang=\"nl\""
+    },
+    {
+      "path": "/nl-NL/non-existent",
+      "status": 404,
+      "mustContain": "lang=\"nl-NL\""
+    },
+
+    {
+      "path": "/hello.txt",
+      "status": 200,
+      "mustContain": "hello world!"
+    },
+
+    {
+      "path": "/gsp",
+      "status": 200,
+      "mustContain": "gsp page"
+    },
+    {
+      "path": "/gsp",
+      "status": 200,
+      "mustContain": ">en-US<"
+    },
+    {
+      "path": "/en/gsp",
+      "status": 200,
+      "mustContain": "gsp page"
+    },
+    {
+      "path": "/en/gsp",
+      "status": 200,
+      "mustContain": ">en<"
+    },
+    {
+      "path": "/nl/gsp",
+      "status": 200,
+      "mustContain": "gsp page"
+    },
+    {
+      "path": "/nl/gsp",
+      "status": 200,
+      "mustContain": ">nl<"
+    },
+    {
+      "path": "/fr/gsp",
+      "status": 200,
+      "mustContain": "gsp page"
+    },
+    {
+      "path": "/fr/gsp",
+      "status": 200,
+      "mustContain": ">fr<"
+    },
+
+    {
+      "path": "/gssp",
+      "status": 200,
+      "mustContain": "gssp page"
+    },
+    {
+      "path": "/gssp",
+      "status": 200,
+      "mustContain": ">en-US<"
+    },
+    {
+      "path": "/en/gssp",
+      "status": 200,
+      "mustContain": "gssp page"
+    },
+    {
+      "path": "/en/gssp",
+      "status": 200,
+      "mustContain": ">en<"
+    },
+    {
+      "path": "/nl/gssp",
+      "status": 200,
+      "mustContain": "gssp page"
+    },
+    {
+      "path": "/nl/gssp",
+      "status": 200,
+      "mustContain": ">nl<"
+    },
+    {
+      "path": "/fr/gssp",
+      "status": 200,
+      "mustContain": "gssp page"
+    },
+    {
+      "path": "/fr/gssp",
+      "status": 200,
+      "mustContain": ">fr<"
+    },
+
+    {
+      "path": "/gssp/first",
+      "status": 200,
+      "mustContain": "gssp page"
+    },
+    {
+      "path": "/gssp/first",
+      "status": 200,
+      "mustContain": ">en-US<"
+    },
+    {
+      "path": "/gssp/first",
+      "status": 200,
+      "mustContain": "slug\":\"first\""
+    },
+    {
+      "path": "/en/gssp/first",
+      "status": 200,
+      "mustContain": "gssp page"
+    },
+    {
+      "path": "/en/gssp/first",
+      "status": 200,
+      "mustContain": ">en<"
+    },
+    {
+      "path": "/en/gssp/first",
+      "status": 200,
+      "mustContain": "slug\":\"first\""
+    },
+    {
+      "path": "/nl/gssp/first",
+      "status": 200,
+      "mustContain": "gssp page"
+    },
+    {
+      "path": "/nl/gssp/first",
+      "status": 200,
+      "mustContain": ">nl<"
+    },
+    {
+      "path": "/nl/gssp/first",
+      "status": 200,
+      "mustContain": "slug\":\"first\""
+    },
+    {
+      "path": "/fr/gssp/first",
+      "status": 200,
+      "mustContain": "gssp page"
+    },
+    {
+      "path": "/fr/gssp/first",
+      "status": 200,
+      "mustContain": ">fr<"
+    },
+    {
+      "path": "/fr/gssp/first",
+      "status": 200,
+      "mustContain": "slug\":\"first\""
+    },
+
+    // TODO: update when directory listing is disabled
+    // and these are proper 404s
+    {
+      "path": "/en/not-found",
+      "status": 200,
+      "mustContain": "Index of"
+    },
+    {
+      "path": "/nl/not-found",
+      "status": 200,
+      "mustContain": "Index of"
+    },
+    {
+      "path": "/en-US/not-found",
+      "status": 200,
+      "mustContain": "lang=\"en-US\""
+    },
+    {
+      "path": "/nl-NL/not-found",
+      "status": 200,
+      "mustContain": "lang=\"nl-NL\""
+    },
+    {
+      "path": "/fr/not-found",
+      "status": 200,
+      "mustContain": "lang=\"fr\""
+    },
+
+    // this will always be a 200 unless fallback: blocking is used
+    // since the static fallback page is served before the 404
+    // page is rendered
+    {
+      "path": "/en/not-found/fallback/first",
+      "status": 200,
+      "mustContain": "lang=\"en\""
+    },
+    {
+      "path": "/en/not-found/fallback/first",
+      "status": 200,
+      "mustNotContain": "gsp page"
+    },
+    {
+      "path": "/_next/data/testing-build-id/en/not-found/fallback/first.json",
+      "status": 404
+    },
+    {
+      "path": "/en/not-found/fallback/first",
+      "status": 200,
+      "mustContain": "lang=\"en\""
+    },
+    {
+      "path": "/en/not-found/fallback/first",
+      "status": 200,
+      "mustNotContain": "gsp page"
+    },
+    {
+      "path": "/fr/not-found/fallback/first",
+      "status": 200,
+      "mustContain": "lang=\"fr\""
+    },
+    {
+      "path": "/_next/data/testing-build-id/fr/not-found/fallback/first.json",
+      "status": 200
+    },
+    {
+      "path": "/fr/not-found/fallback/first",
+      "status": 200,
+      "mustContain": "lang=\"fr\""
+    },
+    {
+      "path": "/fr/not-found/fallback/first",
+      "status": 200,
+      "mustContain": "gsp page"
+    },
+
+    {
+      "path": "/_next/data/testing-build-id/en-US/index.json",
+      "status": 200,
+      "mustContain": "\"locale\":\"en-US\""
+    },
+    {
+      "path": "/_next/data/testing-build-id/en/index.json",
+      "status": 200,
+      "mustContain": "\"locale\":\"en\""
+    },
+    {
+      "path": "/_next/data/testing-build-id/fr/index.json",
+      "status": 200,
+      "mustContain": "\"locale\":\"fr\""
+    },
+    {
+      "path": "/_next/data/testing-build-id/nl/index.json",
+      "status": 200,
+      "mustContain": "\"locale\":\"nl\""
+    },
+
+    {
+      "path": "/_next/data/testing-build-id/en-US/gsp.json",
+      "status": 200,
+      "mustContain": "\"locale\":\"en-US\""
+    },
+    {
+      "path": "/_next/data/testing-build-id/en/gsp.json",
+      "status": 200,
+      "mustContain": "\"locale\":\"en\""
+    },
+    {
+      "path": "/_next/data/testing-build-id/fr/gsp.json",
+      "status": 200,
+      "mustContain": "\"locale\":\"fr\""
+    },
+    {
+      "path": "/_next/data/testing-build-id/nl/gsp.json",
+      "status": 200,
+      "mustContain": "\"locale\":\"nl\""
+    }
+  ]
+}

packages/now-next/test/fixtures/00-i18n-support/package.json

@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+    "next": "canary",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6"
+  }
+}

packages/now-next/test/fixtures/00-i18n-support/pages/another.js

@@ -0,0 +1,31 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+
+  return (
+    <>
+      <p id="another">another page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/">
+        <a id="to-index">to /</a>
+      </Link>
+      <br />
+    </>
+  );
+}
+
+export const getServerSideProps = ({ locale, locales }) => {
+  return {
+    props: {
+      locale,
+      locales,
+    },
+  };
+};

packages/now-next/test/fixtures/00-i18n-support/pages/auto-export/index.js

@@ -0,0 +1,21 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+
+  return (
+    <>
+      <p id="auto-export">auto-export page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/">
+        <a id="to-index">to /</a>
+      </Link>
+    </>
+  );
+}

packages/now-next/test/fixtures/00-i18n-support/pages/gsp/fallback/[slug].js

@@ -0,0 +1,44 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+
+  if (router.isFallback) return 'Loading...';
+
+  return (
+    <>
+      <p id="gsp">gsp page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/">
+        <a id="to-index">to /</a>
+      </Link>
+      <br />
+    </>
+  );
+}
+
+export const getStaticProps = ({ params, locale, locales }) => {
+  return {
+    props: {
+      params,
+      locale,
+      locales,
+    },
+  };
+};
+
+export const getStaticPaths = () => {
+  return {
+    // the default locale will be used since one isn't defined here
+    paths: ['first', 'second'].map(slug => ({
+      params: { slug },
+    })),
+    fallback: true,
+  };
+};

packages/now-next/test/fixtures/00-i18n-support/pages/gsp/index.js

@@ -0,0 +1,32 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+
+  return (
+    <>
+      <p id="gsp">gsp page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/">
+        <a id="to-index">to /</a>
+      </Link>
+      <br />
+    </>
+  );
+}
+
+// TODO: should non-dynamic GSP pages pre-render for each locale?
+export const getStaticProps = ({ locale, locales }) => {
+  return {
+    props: {
+      locale,
+      locales,
+    },
+  };
+};

packages/now-next/test/fixtures/00-i18n-support/pages/gsp/no-fallback/[slug].js

@@ -0,0 +1,46 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+
+  if (router.isFallback) return 'Loading...';
+
+  return (
+    <>
+      <p id="gsp">gsp page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/">
+        <a id="to-index">to /</a>
+      </Link>
+      <br />
+    </>
+  );
+}
+
+export const getStaticProps = ({ params, locale, locales }) => {
+  return {
+    props: {
+      params,
+      locale,
+      locales,
+    },
+  };
+};
+
+export const getStaticPaths = () => {
+  return {
+    paths: [
+      { params: { slug: 'first' } },
+      '/gsp/no-fallback/second',
+      { params: { slug: 'first' }, locale: 'en-US' },
+      '/nl-NL/gsp/no-fallback/second',
+    ],
+    fallback: false,
+  };
+};

packages/now-next/test/fixtures/00-i18n-support/pages/gssp/[slug].js

@@ -0,0 +1,32 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+
+  return (
+    <>
+      <p id="gssp">gssp page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/">
+        <a id="to-index">to /</a>
+      </Link>
+      <br />
+    </>
+  );
+}
+
+export const getServerSideProps = ({ params, locale, locales }) => {
+  return {
+    props: {
+      params,
+      locale,
+      locales,
+    },
+  };
+};

packages/now-next/test/fixtures/00-i18n-support/pages/gssp/index.js

@@ -0,0 +1,31 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+
+  return (
+    <>
+      <p id="gssp">gssp page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/">
+        <a id="to-index">to /</a>
+      </Link>
+      <br />
+    </>
+  );
+}
+
+export const getServerSideProps = ({ locale, locales }) => {
+  return {
+    props: {
+      locale,
+      locales,
+    },
+  };
+};

packages/now-next/test/fixtures/00-i18n-support/pages/index.js

@@ -0,0 +1,55 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+
+  return (
+    <>
+      <p id="index">index page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/another">
+        <a id="to-another">to /another</a>
+      </Link>
+      <br />
+      <Link href="/gsp">
+        <a id="to-gsp">to /gsp</a>
+      </Link>
+      <br />
+      <Link href="/gsp/fallback/first">
+        <a id="to-fallback-first">to /gsp/fallback/first</a>
+      </Link>
+      <br />
+      <Link href="/gsp/fallback/hello">
+        <a id="to-fallback-hello">to /gsp/fallback/hello</a>
+      </Link>
+      <br />
+      <Link href="/gsp/no-fallback/first">
+        <a id="to-no-fallback-first">to /gsp/no-fallback/first</a>
+      </Link>
+      <br />
+      <Link href="/gssp">
+        <a id="to-gssp">to /gssp</a>
+      </Link>
+      <br />
+      <Link href="/gssp/first">
+        <a id="to-gssp-slug">to /gssp/first</a>
+      </Link>
+      <br />
+    </>
+  );
+}
+
+export const getStaticProps = ({ locale, locales }) => {
+  return {
+    props: {
+      locale,
+      locales,
+    },
+  };
+};

packages/now-next/test/fixtures/00-i18n-support/pages/links.js

@@ -0,0 +1,54 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+  const { nextLocale } = router.query;
+
+  return (
+    <>
+      <p id="links">links page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/another" locale={nextLocale}>
+        <a id="to-another">to /another</a>
+      </Link>
+      <br />
+      <Link href="/gsp" locale={nextLocale}>
+        <a id="to-gsp">to /gsp</a>
+      </Link>
+      <br />
+      <Link href="/gsp/fallback/first" locale={nextLocale}>
+        <a id="to-fallback-first">to /gsp/fallback/first</a>
+      </Link>
+      <br />
+      <Link href="/gsp/fallback/hello" locale={nextLocale}>
+        <a id="to-fallback-hello">to /gsp/fallback/hello</a>
+      </Link>
+      <br />
+      <Link href="/gsp/no-fallback/first" locale={nextLocale}>
+        <a id="to-no-fallback-first">to /gsp/no-fallback/first</a>
+      </Link>
+      <br />
+      <Link href="/gssp" locale={nextLocale}>
+        <a id="to-gssp">to /gssp</a>
+      </Link>
+      <br />
+      <Link href="/gssp/first" locale={nextLocale}>
+        <a id="to-gssp-slug">to /gssp/first</a>
+      </Link>
+      <br />
+    </>
+  );
+}
+
+// make SSR page so we have query values immediately
+export const getServerSideProps = () => {
+  return {
+    props: {},
+  };
+};

packages/now-next/test/fixtures/00-i18n-support/pages/not-found/fallback/[slug].js

@@ -0,0 +1,50 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+
+  if (router.isFallback) return 'Loading...';
+
+  return (
+    <>
+      <p id="gsp">gsp page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/">
+        <a id="to-index">to /</a>
+      </Link>
+      <br />
+    </>
+  );
+}
+
+export const getStaticProps = ({ params, locale, locales }) => {
+  if (locale === 'en' || locale === 'nl') {
+    return {
+      notFound: true,
+    };
+  }
+
+  return {
+    props: {
+      params,
+      locale,
+      locales,
+    },
+  };
+};
+
+export const getStaticPaths = () => {
+  return {
+    // the default locale will be used since one isn't defined here
+    paths: ['first', 'second'].map(slug => ({
+      params: { slug },
+    })),
+    fallback: true,
+  };
+};

packages/now-next/test/fixtures/00-i18n-support/pages/not-found/index.js

@@ -0,0 +1,37 @@
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+
+export default function Page(props) {
+  const router = useRouter();
+
+  return (
+    <>
+      <p id="gsp">gsp page</p>
+      <p id="props">{JSON.stringify(props)}</p>
+      <p id="router-locale">{router.locale}</p>
+      <p id="router-locales">{JSON.stringify(router.locales)}</p>
+      <p id="router-query">{JSON.stringify(router.query)}</p>
+      <p id="router-pathname">{router.pathname}</p>
+      <p id="router-as-path">{router.asPath}</p>
+      <Link href="/">
+        <a id="to-index">to /</a>
+      </Link>
+      <br />
+    </>
+  );
+}
+
+export const getStaticProps = ({ locale, locales }) => {
+  if (locale === 'en' || locale === 'nl') {
+    return {
+      notFound: true,
+    };
+  }
+
+  return {
+    props: {
+      locale,
+      locales,
+    },
+  };
+};

packages/now-next/test/fixtures/00-i18n-support/public/hello.txt

@@ -0,0 +1 @@
+hello world!

packages/now-next/test/fixtures/06-lambda-with-memory/now.json

@@ -7,6 +7,15 @@
         "functions": {
           "src/pages/api/memory.js": {
             "memory": 128
+          },
+          "src/pages/api/index.js": {
+            "memory": 192
+          },
+          "src/pages/api/sub/index.ts": {
+            "memory": 128
+          },
+          "src/pages/api/sub/another.ts": {
+            "memory": 192
           }
         }
       }
@@ -18,6 +27,21 @@
       "status": 200,
       "mustContain": "128"
     },
+    {
+      "path": "/api",
+      "status": 200,
+      "mustContain": "192"
+    },
+    {
+      "path": "/api/sub",
+      "status": 200,
+      "mustContain": "128"
+    },
+    {
+      "path": "/api/sub/another",
+      "status": 200,
+      "mustContain": "192"
+    },
     {
       "logMustContain": "WARNING: Your application is being opted out of \"@vercel/next\" optimized lambdas mode due to `functions` config"
     }

packages/now-next/test/fixtures/06-lambda-with-memory/package.json

@@ -1,7 +1,11 @@
 {
+  "private": true,
   "dependencies": {
+    "@types/node": "^12.12.56",
+    "@types/react": "^16.9.49",
     "next": "canary",
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6"
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1",
+    "typescript": "^4.0.2"
   }
 }

packages/now-next/test/fixtures/06-lambda-with-memory/src/pages/api/index.js

@@ -0,0 +1,3 @@
+export default function (req, res) {
+  res.end(`${process.env.AWS_LAMBDA_FUNCTION_MEMORY_SIZE}`);
+}

packages/now-next/test/fixtures/06-lambda-with-memory/src/pages/api/sub/another.ts

@@ -0,0 +1,3 @@
+export default function (req: any, res: any) {
+  res.end(`${process.env.AWS_LAMBDA_FUNCTION_MEMORY_SIZE}`);
+}

packages/now-next/test/fixtures/06-lambda-with-memory/src/pages/api/sub/index.ts

@@ -0,0 +1,3 @@
+export default function (req: any, res: any) {
+  res.end(`${process.env.AWS_LAMBDA_FUNCTION_MEMORY_SIZE}`);
+}

packages/now-next/test/fixtures/22-ssg-v2/now.json

@@ -135,6 +135,37 @@
       "path": "/_next/data/testing-build-id/nofallback/nope.json",
       "status": 404
     },
+    {
+      "path": "/api-docs/first",
+      "status": 200,
+      "mustContain": "API Docs"
+    },
+    {
+      "path": "/api-docs/second",
+      "status": 200,
+      "mustContain": "Loading..."
+    },
+    {
+      "path": "/_next/data/testing-build-id/api-docs/first.json",
+      "status": 200,
+      "responseHeaders": {
+        "x-vercel-cache": "/HIT|STALE|PRERENDER/"
+      }
+    },
+    {
+      "path": "/",
+      "status": 200,
+      "mustContain": "Hi"
+    },
+    {
+      "path": "/_next/data/testing-build-id/index.json",
+      "status": 200,
+      "mustContain": "\"hello\":\"index\""
+    },
+    {
+      "path": "/_next/data/testing-build-id/api-docs/second.json",
+      "status": 200
+    },
     {
       "logMustNotContain": "WARNING: your application is being opted out of @vercel/next's optimized lambdas mode due to legacy routes"
     },

packages/now-next/test/fixtures/22-ssg-v2/pages/api-docs/[...slug].js

@@ -0,0 +1,27 @@
+import { useRouter } from 'next/router';
+
+export const getStaticProps = () => {
+  return {
+    props: {
+      hello: 'world',
+    },
+  };
+};
+
+export const getStaticPaths = () => {
+  return {
+    paths: ['/api-docs/first'],
+    fallback: true,
+  };
+};
+
+export default function Slug(props) {
+  if (useRouter().isFallback) return 'Loading...';
+
+  return (
+    <>
+      <p id="api-docs">API Docs</p>
+      <p id="props">{JSON.stringify(props)}</p>
+    </>
+  );
+}

packages/now-next/test/fixtures/22-ssg-v2/pages/index.js

@@ -1 +1,9 @@
 export default () => 'Hi';
+
+export const getStaticProps = () => {
+  return {
+    props: {
+      hello: 'index',
+    },
+  };
+};

packages/now-next/test/fixtures/31-blocking-fallback/pages/fixed/[slug].js

@@ -19,5 +19,5 @@ export function getStaticProps({ params }) {
 }
 
 export function getStaticPaths() {
-  return { paths: [], fallback: 'unstable_blocking' };
+  return { paths: [], fallback: 'blocking' };
 }

packages/now-next/test/fixtures/31-blocking-fallback/pages/regenerated/[slug].js

@@ -19,5 +19,5 @@ export function getStaticProps({ params }) {
 }
 
 export function getStaticPaths() {
-  return { paths: [], fallback: 'unstable_blocking' };
+  return { paths: [], fallback: 'blocking' };
 }

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

@@ -207,7 +207,9 @@ it(
 
     expect(contents.some(name => name === 'next.config.js')).toBeTruthy();
     expect(
-      contents.some(name => name.includes('next.config.original.'))
+      contents.some(name =>
+        name.includes('next.config.__vercel_builder_backup__')
+      )
     ).toBeTruthy();
   },
   FOUR_MINUTES
@@ -278,7 +280,9 @@ it(
 
     expect(contents.some(name => name === 'next.config.js')).toBeTruthy();
     expect(
-      contents.some(name => name.includes('next.config.original.'))
+      contents.some(name =>
+        name.includes('next.config.__vercel_builder_backup__')
+      )
     ).toBeTruthy();
   },
   FOUR_MINUTES
@@ -345,7 +349,9 @@ it(
 
     expect(contents.some(name => name === 'next.config.js')).toBeTruthy();
     expect(
-      contents.some(name => name.includes('next.config.original.'))
+      contents.some(name =>
+        name.includes('next.config.__vercel_builder_backup__')
+      )
     ).toBeTruthy();
   },
   FOUR_MINUTES
@@ -380,7 +386,9 @@ it(
 
     expect(contents.some(name => name === 'next.config.js')).toBeTruthy();
     expect(
-      contents.some(name => name.includes('next.config.original.'))
+      contents.some(name =>
+        name.includes('next.config.__vercel_builder_backup__')
+      )
     ).toBeFalsy();
   },
   FOUR_MINUTES
@@ -422,7 +430,9 @@ it(
 
     expect(contents.some(name => name === 'next.config.js')).toBeTruthy();
     expect(
-      contents.some(name => name.includes('next.config.original.'))
+      contents.some(name =>
+        name.includes('next.config.__vercel_builder_backup__')
+      )
     ).toBeFalsy();
   },
   FOUR_MINUTES