Revert "break intentionally"

This reverts commit 7c9db4da39.

examples/redwoodjs/api/package.json

@@ -3,6 +3,6 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "0.15.0"
+    "@redwoodjs/api": "0.14.0"
   }
 }

examples/redwoodjs/package.json

@@ -7,7 +7,7 @@
     ]
   },
   "devDependencies": {
-    "@redwoodjs/core": "0.15.0"
+    "@redwoodjs/core": "0.14.0"
   },
   "eslintConfig": {
     "extends": "@redwoodjs/eslint-config"

examples/redwoodjs/web/package.json

@@ -6,8 +6,8 @@
     "defaults"
   ],
   "dependencies": {
-    "@redwoodjs/router": "0.15.0",
-    "@redwoodjs/web": "0.15.0",
+    "@redwoodjs/router": "0.14.0",
+    "@redwoodjs/web": "0.14.0",
     "prop-types": "^15.7.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1"

examples/svelte/package.json

@@ -2,17 +2,17 @@
   "name": "svelte-app",
   "version": "1.0.0",
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^13.0.0",
-    "@rollup/plugin-node-resolve": "^8.1.0",
     "npm-run-all": "^4.1.5",
-    "rollup": "^2.18.0",
+    "rollup": "^1.10.1",
+    "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-livereload": "^1.0.0",
+    "rollup-plugin-node-resolve": "^4.2.3",
     "rollup-plugin-svelte": "^5.0.3",
-    "rollup-plugin-terser": "^6.1.0",
+    "rollup-plugin-terser": "^4.0.4",
     "svelte": "^3.0.0"
   },
   "dependencies": {
-    "sirv-cli": "^1.0.1"
+    "sirv-cli": "^0.4.4"
   },
   "scripts": {
     "build": "rollup -c",

examples/svelte/rollup.config.js

@@ -1,6 +1,6 @@
 import svelte from 'rollup-plugin-svelte';
-import resolve from '@rollup/plugin-node-resolve';
-import commonjs from '@rollup/plugin-commonjs';
+import resolve from 'rollup-plugin-node-resolve';
+import commonjs from 'rollup-plugin-commonjs';
 import livereload from 'rollup-plugin-livereload';
 import { terser } from 'rollup-plugin-terser';
 

packages/frameworks/frameworks.json

@@ -685,7 +685,6 @@
   {
     "name": "RedwoodJS",
     "slug": "redwoodjs",
-    "demo": "https://redwoodjs.now-examples.now.sh",
     "logo": "https://raw.githubusercontent.com/vercel/vercel/master/packages/frameworks/logos/redwood.svg",
     "tagline": "RedwoodJS is a full-stack framework for the Jamstack.",
     "description": "A RedwoodJS app, bootstraped with create-redwood-app.",
@@ -703,7 +702,7 @@
         "value": "yarn rw db up --no-db-client --auto-approve && yarn rw build"
       },
       "devCommand": {
-        "value": "yarn rw dev --fwd=\"--port=$PORT --open=false\""
+        "value": "yarn rw dev"
       },
       "outputDirectory": {
         "value": "RedwoodJS default"
@@ -832,7 +831,7 @@
     "description": "No framework or a unoptimized framework.",
     "settings": {
       "buildCommand": {
-        "placeholder": "`npm run vercel-build` or `npm run build`"
+        "placeholder": "`npm run now-build` or `npm run build`"
       },
       "devCommand": {
         "placeholder": "None"

packages/frameworks/package.json

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

packages/now-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "20.0.0-canary.11",
+  "version": "20.0.0-canary.4",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -64,10 +64,10 @@
   "dependencies": {
     "@vercel/build-utils": "2.4.3-canary.2",
     "@vercel/go": "1.1.5-canary.0",
-    "@vercel/next": "2.6.18",
-    "@vercel/node": "1.7.5-canary.1",
+    "@vercel/next": "2.6.14-canary.1",
+    "@vercel/node": "1.7.4-canary.0",
     "@vercel/python": "1.2.2",
-    "@vercel/redwood": "0.0.2-canary.3",
+    "@vercel/redwood": "0.0.2-canary.1",
     "@vercel/ruby": "1.2.3",
     "@vercel/static-build": "0.17.7-canary.1",
     "update-notifier": "4.1.0"

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

@@ -669,7 +669,7 @@ export default async function main(
     }
 
     if (err instanceof BuildError) {
-      output.error(err.message || 'Build failed');
+      output.error('Build failed');
       output.error(
         `Check your logs at https://${now.url}/_logs or run ${getCommandName(
           `logs ${now.url}`,

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

@@ -118,16 +118,7 @@ export async function devRouter(
           continue;
         }
 
-        // if the destination is an external URL (rewrite or redirect)
-        const isDestUrl = isURL(destPath);
-
-        if (
-          routeConfig.check &&
-          devServer &&
-          nowConfig &&
-          phase !== 'hit' &&
-          !isDestUrl
-        ) {
+        if (routeConfig.check && devServer && nowConfig && phase !== 'hit') {
           const { pathname = '/' } = url.parse(destPath);
           const hasDestFile = await devServer.hasFilesystem(
             pathname,
@@ -165,6 +156,7 @@ export async function devRouter(
           }
         }
 
+        const isDestUrl = isURL(destPath);
         if (isDestUrl) {
           result = {
             found: true,

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

@@ -1578,13 +1578,6 @@ export default class DevServer {
       debug(
         `Checking build result's ${buildResult.routes.length} \`routes\` to match ${newUrl}`
       );
-      for (const r of buildResult.routes) {
-        // This replace is necessary for `@vercel/redwood` but might be relevant
-        // for builders that wish to return routes and work with zero config.
-        if (r.dest) {
-          r.dest = r.dest.replace(/\$PORT/g, `${this.devProcessPort}`);
-        }
-      }
       const matchedRoute = await devRouter(
         newUrl,
         req.method,

packages/now-cli/src/util/link/setup-and-link.ts

@@ -1,7 +1,7 @@
 import { join, basename } from 'path';
 import chalk from 'chalk';
 import { remove } from 'fs-extra';
-import { NowContext, ProjectLinkResult, ProjectSettings } from '../../types';
+import { NowContext, ProjectLinkResult } from '../../types';
 import { NowConfig } from '../dev/types';
 import { Output } from '../output';
 import {
@@ -142,75 +142,69 @@ export default async function setupAndLink(
   if (ctx.localConfig && !(ctx.localConfig instanceof Error)) {
     localConfig = ctx.localConfig;
   }
-
   client.currentTeam = org.type === 'team' ? org.id : undefined;
-  const isZeroConfig = !localConfig.builds || localConfig.builds.length === 0;
+  const now = new Now({
+    apiUrl,
+    token,
+    debug,
+    currentTeam: client.currentTeam,
+  });
+  let deployment = null;
 
   try {
-    let settings: ProjectSettings = {};
+    const createArgs: any = {
+      name: newProjectName,
+      env: {},
+      build: { env: {} },
+      forceNew: undefined,
+      withCache: undefined,
+      quiet,
+      wantsPublic: localConfig.public,
+      isFile,
+      type: null,
+      nowConfig: localConfig,
+      regions: undefined,
+      meta: {},
+      deployStamp: stamp(),
+      target: undefined,
+      skipAutoDetectionConfirmation: false,
+    };
 
-    if (isZeroConfig) {
-      const now = new Now({
-        apiUrl,
-        token,
-        debug,
-        currentTeam: client.currentTeam,
-      });
-      const createArgs: any = {
-        name: newProjectName,
-        env: {},
-        build: { env: {} },
-        forceNew: undefined,
-        withCache: undefined,
-        quiet,
-        wantsPublic: localConfig.public,
-        isFile,
-        type: null,
-        nowConfig: localConfig,
-        regions: undefined,
-        meta: {},
-        deployStamp: stamp(),
-        target: undefined,
-        skipAutoDetectionConfirmation: false,
-      };
+    deployment = await createDeploy(
+      output,
+      now,
+      client.currentTeam || 'current user',
+      [sourcePath],
+      createArgs,
+      org,
+      !isFile,
+      path
+    );
 
-      const deployment = await createDeploy(
-        output,
-        now,
-        client.currentTeam || 'current user',
-        [sourcePath],
-        createArgs,
-        org,
-        !isFile,
-        path
-      );
-
-      if (
-        !deployment ||
-        !('code' in deployment) ||
-        deployment.code !== 'missing_project_settings'
-      ) {
-        output.error('Failed to detect project settings. Please try again.');
-        if (output.isDebugEnabled()) {
-          console.log(deployment);
-        }
-        return { status: 'error', exitCode: 1 };
+    if (
+      !deployment ||
+      !('code' in deployment) ||
+      deployment.code !== 'missing_project_settings'
+    ) {
+      output.error('Failed to detect project settings. Please try again.');
+      if (output.isDebugEnabled()) {
+        console.log(deployment);
       }
-
-      const { projectSettings, framework } = deployment;
-
-      settings = await editProjectSettings(
-        output,
-        projectSettings,
-        framework,
-        autoConfirm
-      );
+      return { status: 'error', exitCode: 1 };
     }
 
+    const { projectSettings, framework } = deployment;
+
     if (rootDirectory) {
-      settings.rootDirectory = rootDirectory;
+      projectSettings.rootDirectory = rootDirectory;
     }
 
+    const settings = await editProjectSettings(
+      output,
+      projectSettings,
+      framework,
+      autoConfirm
+    );
     const project = await createProject(client, newProjectName);
     await updateProject(client, project.id, settings);
     Object.assign(project, settings);

packages/now-cli/test/dev/fixtures/test-external-rewrites-and-redirects/vercel.json

@@ -1,14 +0,0 @@
-{
-  "version": 2,
-  "rewrites": [
-    { "source": "/rewrite", "destination": "https://vercel.com/robots.txt" }
-  ],
-  "redirects": [
-    { "source": "/redirect", "destination": "https://vercel.com/robots.txt" },
-    {
-      "source": "/tempRedirect",
-      "destination": "https://vercel.com/robots.txt",
-      "permanent": false
-    }
-  ]
-}

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

@@ -20,8 +20,6 @@ let port = 3000;
 const binaryPath = resolve(__dirname, `../../scripts/start.js`);
 const fixture = name => join('test', 'dev', 'fixtures', name);
 const fixtureAbsolute = name => join(__dirname, 'fixtures', name);
-const exampleAbsolute = name =>
-  join(__dirname, '..', '..', '..', '..', 'examples', name);
 
 let processCounter = 0;
 const processList = new Map();
@@ -113,7 +111,7 @@ async function exec(directory, args = []) {
 }
 
 async function runNpmInstall(fixturePath) {
-  if (await fs.pathExists(join(fixturePath, 'package.json'))) {
+  if (await fs.exists(join(fixturePath, 'package.json'))) {
     await execa('yarn', ['install'], {
       cwd: fixturePath,
       shell: true,
@@ -129,10 +127,9 @@ async function testPath(
   path,
   expectedText,
   headers = {},
-  method = 'GET',
-  body = undefined
+  method = 'GET'
 ) {
-  const opts = { redirect: 'manual-dont-change', method, body };
+  const opts = { redirect: 'manual-dont-change', method };
   const url = `${origin}${path}`;
   const res = await fetch(url, opts);
   const msg = `Testing response from ${method} ${url}`;
@@ -233,18 +230,10 @@ async function testFixture(directory, opts = {}, args = []) {
 function testFixtureStdio(
   directory,
   fn,
-  { expectedCode = 0, skipDeploy, isExample } = {}
+  { expectedCode = 0, skipDeploy } = {}
 ) {
   return async t => {
-    const nodeMajor = Number(process.versions.node.split('.')[0]);
-    if (isExample && nodeMajor < 12) {
-      console.log(`Skipping ${directory} on Node ${process.version}`);
-      t.pass();
-      return;
-    }
-    const cwd = isExample
-      ? exampleAbsolute(directory)
-      : fixtureAbsolute(directory);
+    const cwd = fixtureAbsolute(directory);
     const token = await fetchTokenWithRetry();
     let deploymentUrl;
 
@@ -380,21 +369,6 @@ test.afterEach(async () => {
   );
 });
 
-test(
-  '[vercel dev] redwoodjs example',
-  testFixtureStdio(
-    'redwoodjs',
-    async testPath => {
-      await testPath(200, '/', /<div id="redwood-app">/m);
-      await testPath(200, '/about', /<div id="redwood-app">/m);
-      const reqBody = '{"query":"{redwood{version}}"}';
-      const resBody = '{"data":{"redwood":{"version":"0.15.0"}}}';
-      await testPath(200, '/api/graphql', resBody, {}, 'POST', reqBody);
-    },
-    { isExample: true }
-  )
-);
-
 test('[vercel dev] prints `npm install` errors', async t => {
   const dir = fixture('runtime-not-installed');
   const result = await exec(dir);
@@ -843,20 +817,6 @@ test(
   })
 );
 
-test(
-  '[vercel dev] test rewrites and redirects serve correct external content',
-  testFixtureStdio('test-external-rewrites-and-redirects', async testPath => {
-    const vcRobots = `https://vercel.com/robots.txt`;
-    await testPath(200, '/rewrite', /User-Agent: \*/m);
-    await testPath(308, '/redirect', `Redirecting to ${vcRobots} (308)`, {
-      Location: vcRobots,
-    });
-    await testPath(307, '/tempRedirect', `Redirecting to ${vcRobots} (307)`, {
-      Location: vcRobots,
-    });
-  })
-);
-
 test(
   '[vercel dev] test rewrites and redirects is case sensitive',
   testFixtureStdio('test-routing-case-sensitive', async testPath => {
@@ -1175,8 +1135,7 @@ test(
     await testPath(200, '/api/date', new RegExp(new Date().getFullYear()));
     await testPath(200, '/contact', /Contact Page/);
     await testPath(200, '/support', /Contact Page/);
-    // TODO: Fix this test assertion that fails intermittently
-    // await testPath(404, '/nothing', /Custom Next 404/);
+    await testPath(404, '/nothing', /Custom Next 404/);
   })
 );
 

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

@@ -500,21 +500,14 @@ CMD ["node", "index.js"]`,
         },
       }),
     },
-    'project-link-deploy': {
-      'package.json': '{}',
-    },
-    'project-link-zeroconf': {
-      'package.json': '{}',
+    'project-link': {
+      'package.json': JSON.stringify({}),
     },
     'project-link-confirm': {
-      'package.json': '{}',
+      'package.json': JSON.stringify({}),
     },
     'project-link-dev': {
-      'package.json': '{}',
-    },
-    'project-link-legacy': {
-      'index.html': 'Hello',
-      'vercel.json': '{"builds":[{"src":"*.html","use":"@vercel/static"}]}',
+      'package.json': JSON.stringify({}),
     },
     'dev-proxy-headers-and-env': {
       'package.json': JSON.stringify({}),

packages/now-cli/test/integration.js

@@ -1885,6 +1885,7 @@ test('deploying a file should not show prompts and display deprecation', async t
   // Test if the output is really a URL
   const { href, host } = new URL(stdout);
   t.is(host.split('-')[0], 'files');
+  console.log('static-single-file/first.png: stdout', stdout);
 
   // Send a test request to the deployment
   const response = await fetch(href);
@@ -2321,11 +2322,7 @@ test('render build errors', async t => {
   console.log(output.exitCode);
 
   t.is(output.exitCode, 1, formatOutput(output));
-  t.regex(
-    output.stderr,
-    /Command "yarn run build" exited with 1/gm,
-    formatOutput(output)
-  );
+  t.regex(output.stderr, /Build failed/gm, formatOutput(output));
 });
 
 test('invalid deployment, projects and alias names', async t => {
@@ -2554,18 +2551,6 @@ test('deploy a Lambda with a specific runtime', async t => {
   t.is(build.use, 'vercel-php@0.1.0', JSON.stringify(build, null, 2));
 });
 
-test('fail to deploy a Lambda with a specific runtime but without a locked version', async t => {
-  const directory = fixture('lambda-with-invalid-runtime');
-  const output = await execute([directory, '--confirm']);
-
-  t.is(output.exitCode, 1, formatOutput(output));
-  t.regex(
-    output.stderr,
-    /Function Runtimes must have a valid version/gim,
-    formatOutput(output)
-  );
-});
-
 test('fail to add a domain without a project', async t => {
   const output = await execute(['domains', 'add', 'my-domain.now.sh']);
   t.is(output.exitCode, 1, formatOutput(output));
@@ -2661,9 +2646,9 @@ test('ensure `github` and `scope` are not sent to the API', async t => {
   t.is(output.exitCode, 0, formatOutput(output));
 });
 
-test('should show prompts to set up project during first deploy', async t => {
-  const directory = fixture('project-link-deploy');
-  const projectName = `project-link-deploy-${
+test('should show prompts to set up project', async t => {
+  const directory = fixture('project-link');
+  const projectName = `project-link-${
     Math.random().toString(36).split('.')[1]
   }`;
 
@@ -3288,8 +3273,8 @@ test('reject deploying with wrong team .vercel config', async t => {
 });
 
 test('[vc link] should show prompts to set up project', async t => {
-  const dir = fixture('project-link-zeroconf');
-  const projectName = `project-link-zeroconf-${
+  const dir = fixture('project-link');
+  const projectName = `project-link-${
     Math.random().toString(36).split('.')[1]
   }`;
 
@@ -3498,61 +3483,6 @@ test('[vc dev] should show prompts to set up project', async t => {
   }
 });
 
-test('[vc link] should show project prompts but not framework when `builds` defined', async t => {
-  const dir = fixture('project-link-legacy');
-  const projectName = `project-link-legacy-${
-    Math.random().toString(36).split('.')[1]
-  }`;
-
-  // remove previously linked project if it exists
-  await remove(path.join(dir, '.vercel'));
-
-  const vc = execa(binaryPath, ['link', ...defaultArgs], { cwd: dir });
-
-  await waitForPrompt(vc, chunk => /Set up [^?]+\?/.test(chunk));
-  vc.stdin.write('yes\n');
-
-  await waitForPrompt(vc, chunk =>
-    chunk.includes('Which scope should contain your project?')
-  );
-  vc.stdin.write('\n');
-
-  await waitForPrompt(vc, chunk => chunk.includes('Link to existing project?'));
-  vc.stdin.write('no\n');
-
-  await waitForPrompt(vc, chunk =>
-    chunk.includes('What’s your project’s name?')
-  );
-  vc.stdin.write(`${projectName}\n`);
-
-  await waitForPrompt(vc, chunk =>
-    chunk.includes('In which directory is your code located?')
-  );
-  vc.stdin.write('\n');
-
-  await waitForPrompt(vc, chunk => chunk.includes('Linked to'));
-
-  const output = await vc;
-
-  // Ensure the exit code is right
-  t.is(output.exitCode, 0, formatOutput(output));
-
-  // Ensure .gitignore is created
-  t.is((await readFile(path.join(dir, '.gitignore'))).toString(), '.vercel');
-
-  // Ensure .vercel/project.json and .vercel/README.txt are created
-  t.is(
-    await exists(path.join(dir, '.vercel', 'project.json')),
-    true,
-    'project.json should be created'
-  );
-  t.is(
-    await exists(path.join(dir, '.vercel', 'README.txt')),
-    true,
-    'README.txt should be created'
-  );
-});
-
 test('[vc dev] should send the platform proxy request headers to frontend dev server ', async t => {
   const dir = fixture('dev-proxy-headers-and-env');
   const port = 58353;

packages/now-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/client",
-  "version": "8.2.2-canary.4",
+  "version": "8.2.2-canary.3",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "homepage": "https://vercel.com",

packages/now-client/src/create-deployment.ts

@@ -80,11 +80,7 @@ export default function buildCreateDeployment(version: number) {
       rootFiles = [path];
     }
 
-    let { fileList } = await buildFileTree(
-      path,
-      clientOptions.isDirectory,
-      debug
-    );
+    let fileList = await buildFileTree(path, clientOptions.isDirectory, debug);
 
     let configPath: string | undefined;
     if (!nowConfig) {

packages/now-client/src/index.ts

@@ -1,6 +1,6 @@
 import buildCreateDeployment from './create-deployment';
 
-export { getVercelIgnore, buildFileTree } from './utils/index';
+export { getVercelIgnore } from './utils/index';
 export const createDeployment = buildCreateDeployment(2);
 export const createLegacyDeployment = buildCreateDeployment(1);
 export * from './errors';

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

@@ -35,7 +35,7 @@ const EVENTS_ARRAY = [
   'canceled',
 ] as const;
 
-export type DeploymentEventType = typeof EVENTS_ARRAY[number];
+export type DeploymentEventType = (typeof EVENTS_ARRAY)[number];
 export const EVENTS = new Set(EVENTS_ARRAY);
 
 export function getApiDeploymentsUrl(
@@ -69,7 +69,7 @@ export async function parseVercelConfig(filePath?: string): Promise<NowConfig> {
   }
 }
 
-const maybeRead = async function <T>(path: string, default_: T) {
+const maybeRead = async function<T>(path: string, default_: T) {
   try {
     return await readFile(path, 'utf8');
   } catch (err) {
@@ -81,26 +81,19 @@ export async function buildFileTree(
   path: string | string[],
   isDirectory: boolean,
   debug: Debug
-): Promise<{ fileList: string[]; ignoreList: string[] }> {
-  const ignoreList: string[] = [];
+): Promise<string[]> {
   let fileList: string[];
-  let { ig, ignores } = await getVercelIgnore(path);
+  let { ig } = await getVercelIgnore(path);
 
-  debug(`Found ${ignores.length} rules in .vercelignore`);
+  debug(`Found ${ig.ignores.length} rules in .vercelignore`);
   debug('Building file tree...');
 
   if (isDirectory && !Array.isArray(path)) {
     // Directory path
-    const ignores = (absPath: string) => {
-      const rel = relative(path, absPath);
-      const ignored = ig.ignores(rel);
-      if (ignored) {
-        ignoreList.push(rel);
-      }
-      return ignored;
-    };
+    const cwd = process.cwd();
+    const ignores = (absPath: string) => ig.ignores(relative(cwd, absPath));
     fileList = await readdir(path, [ignores]);
-    debug(`Found ${fileList.length} files in the specified directory`);
+    debug(`Read ${fileList.length} files in the specified directory`);
   } else if (Array.isArray(path)) {
     // Array of file paths
     fileList = path;
@@ -111,7 +104,7 @@ export async function buildFileTree(
     debug(`Deploying the provided path as single file`);
   }
 
-  return { fileList, ignoreList };
+  return fileList;
 }
 
 export async function getVercelIgnore(

packages/now-client/tests/unit.utils.test.ts

@@ -14,30 +14,18 @@ const normalizeWindowsPaths = (files: string[]) => {
 const toAbsolutePaths = (cwd: string, files: string[]) =>
   files.map(p => join(cwd, p));
 
-describe('buildFileTree()', () => {
+describe('buildFileTree', () => {
   it('should exclude files using `.nowignore` blocklist', async () => {
     const cwd = fixture('nowignore');
-    const { fileList, ignoreList } = await buildFileTree(cwd, true, noop);
-
-    const expectedFileList = toAbsolutePaths(cwd, ['.nowignore', 'index.txt']);
-    expect(normalizeWindowsPaths(expectedFileList).sort()).toEqual(
-      normalizeWindowsPaths(fileList).sort()
-    );
-
-    const expectedIgnoreList = [
-      'ignore.txt',
-      'folder/ignore.txt',
-      'node_modules/ignore.txt',
-    ];
-    expect(normalizeWindowsPaths(expectedIgnoreList).sort()).toEqual(
-      normalizeWindowsPaths(ignoreList).sort()
+    const expected = toAbsolutePaths(cwd, ['.nowignore', 'index.txt']);
+    const actual = await buildFileTree(cwd, true, noop);
+    expect(normalizeWindowsPaths(expected).sort()).toEqual(
+      normalizeWindowsPaths(actual).sort()
     );
   });
 
   it('should include the node_modules using `.vercelignore` allowlist', async () => {
     const cwd = fixture('vercelignore-allow-nodemodules');
-    const { fileList, ignoreList } = await buildFileTree(cwd, true, noop);
-
     const expected = toAbsolutePaths(cwd, [
       'node_modules/one.txt',
       'sub/node_modules/two.txt',
@@ -45,13 +33,9 @@ describe('buildFileTree()', () => {
       '.vercelignore',
       'hello.txt',
     ]);
+    const actual = await buildFileTree(cwd, true, noop);
     expect(normalizeWindowsPaths(expected).sort()).toEqual(
-      normalizeWindowsPaths(fileList).sort()
-    );
-
-    const expectedIgnoreList = ['.env.local', 'exclude.txt'];
-    expect(normalizeWindowsPaths(expectedIgnoreList).sort()).toEqual(
-      normalizeWindowsPaths(ignoreList).sort()
+      normalizeWindowsPaths(actual).sort()
     );
   });
 });

packages/now-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "2.6.18",
+  "version": "2.6.14-canary.1",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -26,7 +26,7 @@
     "@types/resolve-from": "5.0.1",
     "@types/semver": "6.0.0",
     "@types/yazl": "2.4.1",
-    "@zeit/node-file-trace": "0.8.2",
+    "@zeit/node-file-trace": "0.8.0",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",
     "escape-string-regexp": "3.0.0",

packages/now-next/src/index.ts

@@ -235,7 +235,7 @@ export const build = async ({
 
   await download(files, workPath, meta);
 
-  let pkg = await readPackageJson(entryPath);
+  const pkg = await readPackageJson(entryPath);
   const nextVersionRange = await getNextVersionRange(entryPath);
   const nodeVersion = await getNodeVersion(entryPath, undefined, config, meta);
   const spawnOpts = getSpawnOptions(meta, nodeVersion);
@@ -331,17 +331,17 @@ export const build = async ({
     ]);
 
     debug('Normalizing package.json');
-    pkg = normalizePackageJson(pkg);
-    debug('Normalized package.json result: ', pkg);
-    await writePackageJson(entryPath, pkg);
+    const packageJson = normalizePackageJson(pkg);
+    debug('Normalized package.json result: ', packageJson);
+    await writePackageJson(entryPath, packageJson);
   }
 
-  let buildScriptName = getScriptName(pkg, [
+  const buildScriptName = getScriptName(pkg, [
     'vercel-build',
     'now-build',
     'build',
   ]);
-  const { buildCommand } = config;
+  let { buildCommand } = config;
 
   if (!buildScriptName && !buildCommand) {
     console.log(
@@ -349,15 +349,7 @@ export const build = async ({
         'If you need to define a different build step, please create a `vercel-build` script in your `package.json` ' +
         '(e.g. `{ "scripts": { "vercel-build": "npm run prepare && next build" } }`).'
     );
-
-    await writePackageJson(entryPath, {
-      ...pkg,
-      scripts: {
-        'vercel-build': 'next build',
-        ...pkg.scripts,
-      },
-    });
-    buildScriptName = 'vercel-build';
+    buildCommand = 'next build';
   }
 
   if (process.env.NPM_AUTH_TOKEN) {
@@ -888,13 +880,7 @@ export const build = async ({
         !prerenderManifest.fallbackRoutes[route] &&
         !prerenderManifest.legacyBlockingRoutes[route]
       ) {
-        // if the 404 page used getStaticProps we need to update static404Page
-        // since it wasn't populated from the staticPages group
-        if (route === '/404') {
-          static404Page = path.join(entryDirectory, '404');
-        }
-
-        nonLambdaSsgPages.add(route === '/' ? '/index' : route);
+        nonLambdaSsgPages.add(route);
       }
     };
 
@@ -1131,7 +1117,7 @@ export const build = async ({
           src: `^${escapeStringRegexp(outputName).replace(
             /\/index$/,
             '(/|/index|)'
-          )}/?$`,
+          )}$`,
           dest: `${path.join('/', currentLambdaGroup.lambdaIdentifier)}`,
           headers: {
             'x-nextjs-page': outputName,
@@ -1311,7 +1297,7 @@ export const build = async ({
                   if (!toRender) {
                     try {
                       const { pathname } = url.parse(req.url)
-                      toRender = pathname.replace(/\\/$/, '')
+                      toRender = pathname
                     } catch (_) {
                       // handle failing to parse url
                       res.statusCode = 400

packages/now-next/test/fixtures/00-trailing-slash-add/next.config.js

@@ -1,6 +1 @@
-module.exports = {
-  generateBuildId() {
-    return 'testing-build-id';
-  },
-  trailingSlash: true,
-};
+module.exports = { trailingSlash: true };

packages/now-next/test/fixtures/00-trailing-slash-add/now.json

@@ -33,48 +33,6 @@
       "path": "/test.txt",
       "status": 200,
       "mustContain": "this is a file"
-    },
-    {
-      "fetchOptions": { "redirect": "manual" },
-      "path": "/blog/post-1",
-      "status": 308,
-      "responseHeaders": {
-        "refresh": "/url=/blog/post-1/$/"
-      }
-    },
-    {
-      "fetchOptions": { "redirect": "manual" },
-      "path": "/blog/post-1/",
-      "status": 200,
-      "mustContain": "post: <!-- -->post-1"
-    },
-    {
-      "fetchOptions": { "redirect": "manual" },
-      "path": "/_next/data/testing-build-id/blog/post-1.json/",
-      "status": 308,
-      "responseHeaders": {
-        "refresh": "/url=/_next/data/testing-build-id/blog/post-1.json$/"
-      }
-    },
-    {
-      "fetchOptions": { "redirect": "manual" },
-      "path": "/_next/data/testing-build-id/blog/post-1.json",
-      "status": 200,
-      "mustContain": "\"post-1\""
-    },
-    {
-      "fetchOptions": { "redirect": "manual" },
-      "path": "/api/hello",
-      "status": 308,
-      "responseHeaders": {
-        "refresh": "/url=/api/hello/$/"
-      }
-    },
-    {
-      "fetchOptions": { "redirect": "manual" },
-      "path": "/api/hello/",
-      "status": 200,
-      "mustContain": "hello from API"
     }
   ]
 }

packages/now-next/test/fixtures/00-trailing-slash-add/pages/abc/def.js

@@ -1,11 +1,3 @@
 export default function Page() {
   return <p>nested page</p>;
 }
-
-export const getServerSideProps = () => {
-  return {
-    props: {
-      hello: 'world',
-    },
-  };
-};

packages/now-next/test/fixtures/00-trailing-slash-add/pages/api/hello.js

@@ -1,3 +0,0 @@
-export default (req, res) => {
-  res.end('hello from API');
-};

packages/now-next/test/fixtures/00-trailing-slash-add/pages/blog/[post].js

@@ -1,11 +0,0 @@
-export default function Page({ post }) {
-  return <p>post: {post}</p>;
-}
-
-export const getServerSideProps = ({ params }) => {
-  return {
-    props: {
-      post: params.post,
-    },
-  };
-};

packages/now-next/test/fixtures/01-cache-headers/now.json

@@ -3,13 +3,13 @@
   "builds": [{ "src": "package.json", "use": "@vercel/next" }],
   "probes": [
     {
-      "path": "/_next/__NEXT_SCRIPT__(/)",
+      "path": "/_next/static/testing-build-id/pages/index.js",
       "responseHeaders": {
         "cache-control": "public,max-age=31536000,immutable"
       }
     },
     {
-      "path": "/_next/static/invalid-build-id/pages/non-existent.js",
+      "path": "/_next/static/invalid-build-id/pages/index.js",
       "notResponseHeaders": {
         "cache-control": "public,max-age=31536000,immutable"
       }

packages/now-next/test/fixtures/01-cache-headers/package.json

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

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

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "next": "canary",
+    "next": "^9.1.2-canary.8",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"
   }

packages/now-next/test/fixtures/17-static-404/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "next": "canary",
+    "next": "9.2.1-canary.3",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"
   }

packages/now-next/test/fixtures/19-pages-404/package.json

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

packages/now-next/test/fixtures/24-custom-output-dir/package.json

@@ -3,7 +3,7 @@
     "build": "next build"
   },
   "dependencies": {
-    "next": "canary",
+    "next": "^9.1.2-canary.8",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"
   }

packages/now-next/test/fixtures/25-index-routes/next.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-  generateBuildId() {
-    return 'testing-build-id';
-  },
-};

packages/now-next/test/fixtures/25-index-routes/now.json

@@ -1,42 +0,0 @@
-{
-  "version": 2,
-  "builds": [{ "src": "package.json", "use": "@now/next" }],
-  "probes": [
-    {
-      "path": "/",
-      "mustContain": "hello from index"
-    },
-    {
-      "path": "/index",
-      "mustContain": "hello from index"
-    },
-    {
-      "path": "/nested-index/index",
-      "mustContain": "hello from nested index"
-    },
-    {
-      "path": "/sub",
-      "mustContain": "hello from sub index"
-    },
-    {
-      "path": "/sub/index",
-      "mustContain": "hello from sub id"
-    },
-    {
-      "path": "/sub/another",
-      "mustContain": "hello from sub id"
-    },
-    {
-      "path": "/api/sub",
-      "mustContain": "hi from sub index"
-    },
-    {
-      "path": "/api/sub/index",
-      "mustContain": "hi from sub id"
-    },
-    {
-      "path": "/api/sub/another",
-      "mustContain": "hi from sub id"
-    }
-  ]
-}

packages/now-next/test/fixtures/25-index-routes/package.json

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

packages/now-next/test/fixtures/25-index-routes/pages/api/sub/[id].js

@@ -1 +0,0 @@
-export default (req, res) => res.end('hi from sub id')

packages/now-next/test/fixtures/25-index-routes/pages/api/sub/index.js

@@ -1 +0,0 @@
-export default (req, res) => res.end('hi from sub index');

packages/now-next/test/fixtures/25-index-routes/pages/index.js

@@ -1,2 +0,0 @@
-const page = () => 'hello from index';
-export default page;

packages/now-next/test/fixtures/25-index-routes/pages/nested-index/index/index.js

@@ -1 +0,0 @@
-export default () => 'hello from nested index';

packages/now-next/test/fixtures/25-index-routes/pages/sub/[id].js

@@ -1,3 +0,0 @@
-const page = () => "hello from sub id"
-page.getInitialProps = () => ({ hello: 'hi' })
-export default page

packages/now-next/test/fixtures/25-index-routes/pages/sub/index.js

@@ -1,3 +0,0 @@
-const page = () => 'hello from sub index';
-page.getInitialProps = () => ({ hello: 'hi' });
-export default page;

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/next.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-  generateBuildId() {
-    return 'testing-build-id';
-  },
-};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/now.json

@@ -1,113 +0,0 @@
-{
-  "version": 2,
-  "uploadNowJson": true,
-  "builds": [{ "src": "package.json", "use": "@vercel/next" }],
-  "probes": [
-    {
-      "path": "/forever",
-      "status": 200,
-      "mustContain": "hello"
-    },
-    {
-      "path": "/blog/post-1",
-      "status": 200,
-      "mustContain": "post-1"
-    },
-    {
-      "path": "/blog/post-2",
-      "status": 200,
-      "mustContain": "post-2"
-    },
-    {
-      "path": "/_next/data/testing-build-id/blog/post-1.json",
-      "status": 200,
-      "mustContain": "post-1"
-    },
-    {
-      "path": "/_next/data/testing-build-id/blog/post-2.json",
-      "status": 200,
-      "mustContain": "post-2"
-    },
-
-    {
-      "path": "/blog/post-1/comment-1",
-      "status": 200,
-      "mustContain": "comment-1"
-    },
-    {
-      "path": "/blog/post-2/comment-2",
-      "status": 200,
-      "mustContain": "comment-2"
-    },
-    {
-      "path": "/_next/data/testing-build-id/blog/post-1/comment-1.json",
-      "status": 200,
-      "mustContain": "comment-1"
-    },
-    {
-      "path": "/_next/data/testing-build-id/blog/post-2/comment-2.json",
-      "status": 200,
-      "mustContain": "comment-2"
-    },
-
-    {
-      "path": "/_next/data/testing-build-id/forever.json",
-      "status": 200,
-      "mustContain": "world"
-    },
-    {
-      "path": "/_next/data/testing-build-id/another2.json",
-      "status": 200,
-      "mustContain": "world"
-    },
-    {
-      "path": "/nofallback/one",
-      "status": 200,
-      "mustContain": "one"
-    },
-    {
-      "path": "/nofallback/two",
-      "status": 200,
-      "mustContain": "two"
-    },
-    {
-      "path": "/nofallback/nope",
-      "status": 404,
-      "mustContain": "page not <!-- -->found"
-    },
-    {
-      "path": "/_next/data/testing-build-id/nofallback/one.json",
-      "status": 200,
-      "mustContain": "one"
-    },
-    {
-      "path": "/_next/data/testing-build-id/nofallback/two.json",
-      "status": 200,
-      "mustContain": "two"
-    },
-    {
-      "path": "/_next/data/testing-build-id/nofallback/nope.json",
-      "status": 404
-    },
-    {
-      "path": "/404",
-      "status": 404,
-      "mustContain": "page not <!-- -->found"
-    },
-    {
-      "logMustNotContain": "WARNING: your application is being opted out of @vercel/next's optimized lambdas mode due to legacy routes"
-    },
-    {
-      "logMustNotContain": "WARNING: Your application is being opted out of \"@vercel/next\" optimized lambdas mode due to `functions` config"
-    },
-    {
-      "logMustNotContain": "Traced Next.js serverless functions for external files in"
-    },
-    {
-      "logMustNotContain": "All serverless functions created in"
-    },
-    {
-      "logMustNotContain": "Compressed shared serverless function files"
-    }
-  ]
-}

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/package.json

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

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/404.js

@@ -1,11 +0,0 @@
-export default function Page({ found }) {
-  return <p>page not {found}</p>;
-}
-
-export const getStaticProps = () => {
-  return {
-    props: {
-      found: 'found',
-    },
-  };
-};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/another.js

@@ -1,22 +0,0 @@
-import React from 'react';
-
-// eslint-disable-next-line camelcase
-export async function getStaticProps() {
-  return {
-    props: {
-      world: 'world',
-      random: Math.random(),
-      time: new Date().getTime(),
-    },
-  };
-}
-
-export default ({ world, time, random }) => {
-  return (
-    <>
-      <p id="hello">hello: {world}</p>
-      <span id="time">time: {time}</span>
-      <span id="random">random: {random}</span>
-    </>
-  );
-};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/another2.js

@@ -1,20 +0,0 @@
-import React from 'react';
-
-// eslint-disable-next-line camelcase
-export async function getStaticProps() {
-  return {
-    props: {
-      world: 'world',
-      time: new Date().getTime(),
-    },
-  };
-}
-
-export default ({ world, time }) => {
-  return (
-    <>
-      <p>hello: {world}</p>
-      <span>time: {time}</span>
-    </>
-  );
-};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/blog/[post]/[comment].js

@@ -1,39 +0,0 @@
-import React from 'react';
-
-// eslint-disable-next-line camelcase
-export async function getStaticPaths() {
-  return {
-    paths: [
-      '/blog/post-1/comment-1',
-      { params: { post: 'post-2', comment: 'comment-2' } },
-      '/blog/post-1337/comment-1337',
-      '/blog/post-123/comment-321',
-    ],
-    fallback: false,
-  };
-}
-
-// eslint-disable-next-line camelcase
-export async function getStaticProps({ params }) {
-  return {
-    props: {
-      post: params.post,
-      random: Math.random(),
-      comment: params.comment,
-      time: new Date().getTime(),
-    },
-  };
-}
-
-export default ({ post, comment, time, random }) => {
-  if (!post) return <p>loading...</p>;
-
-  return (
-    <>
-      <p id="post">Post: {post}</p>
-      <p id="comment">Comment: {comment}</p>
-      <span id="time">time: {time}</span>
-      <span id="random">random: {random}</span>
-    </>
-  );
-};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/blog/[post]/index.js

@@ -1,38 +0,0 @@
-import React from 'react';
-
-// eslint-disable-next-line camelcase
-export async function getStaticPaths() {
-  return {
-    paths: ['/blog/post-1', { params: { post: 'post-2' } }, '/blog/post-123'],
-    fallback: false,
-  };
-}
-
-// eslint-disable-next-line camelcase
-export async function getStaticProps({ params }) {
-  if (params.post === 'post-10') {
-    await new Promise(resolve => {
-      setTimeout(() => resolve(), 1000);
-    });
-  }
-
-  return {
-    props: {
-      post: params.post,
-      random: Math.random(),
-      time: (await import('perf_hooks')).performance.now(),
-    },
-  };
-}
-
-export default ({ post, time, random }) => {
-  if (!post) return <p>loading...</p>;
-
-  return (
-    <>
-      <p id="post">Post: {post}</p>
-      <span id="time">time: {time}</span>
-      <span id="random">random: {random}</span>
-    </>
-  );
-};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/forever.js

@@ -1,21 +0,0 @@
-import React from 'react';
-
-// eslint-disable-next-line camelcase
-export async function getStaticProps() {
-  return {
-    props: {
-      world: 'world',
-      time: new Date().getTime(),
-    },
-    revalidate: false,
-  };
-}
-
-export default ({ world, time }) => {
-  return (
-    <>
-      <p>hello: {world}</p>
-      <span>time: {time}</span>
-    </>
-  );
-};

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/index.js

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

packages/now-next/test/fixtures/29-ssg-all-static-custom-404/pages/nofallback/[slug].js

@@ -1,30 +0,0 @@
-import React from 'react';
-
-// eslint-disable-next-line camelcase
-export async function getStaticPaths() {
-  return {
-    paths: ['/nofallback/one', { params: { slug: 'two' } }],
-    fallback: false,
-  };
-}
-
-// eslint-disable-next-line camelcase
-export async function getStaticProps({ params }) {
-  return {
-    props: {
-      slug: params.slug,
-      time: (await import('perf_hooks')).performance.now(),
-    },
-  };
-}
-
-export default ({ slug, time }) => {
-  return (
-    <>
-      <p>
-        Slug ({slug.length}): {slug}
-      </p>
-      <span>time: {time}</span>
-    </>
-  );
-};

packages/now-next/test/fixtures/29-ssg-all-static/pages/another-index/index.js

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

packages/now-next/test/fixtures/29-ssg-all-static/pages/index.js

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

packages/now-next/test/fixtures/30-monorepo-no-script/.gitignore

@@ -1,108 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-*.lcov
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
-
-# TypeScript cache
-*.tsbuildinfo
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Microbundle cache
-.rpt2_cache/
-.rts2_cache_cjs/
-.rts2_cache_es/
-.rts2_cache_umd/
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-.env.test
-
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-
-# Next.js build output
-.next
-
-# Nuxt.js build / generate output
-.nuxt
-dist
-
-# Gatsby files
-.cache/
-# Comment in the public line in if your project uses Gatsby and *not* Next.js
-# https://nextjs.org/blog/next-9-1#public-directory-support
-# public
-
-# vuepress build output
-.vuepress/dist
-
-# Serverless directories
-.serverless/
-
-# FuseBox cache
-.fusebox/
-
-# DynamoDB Local files
-.dynamodb/
-
-# TernJS port file
-.tern-port
-
-# IDEA
-.idea/
-*.iml

packages/now-next/test/fixtures/30-monorepo-no-script/babel.config.js

@@ -1,7 +0,0 @@
-module.exports = api => {
-  api.cache(true);
-
-  const presets = [require.resolve('next/babel')];
-
-  return { presets, plugins: [] };
-};

packages/now-next/test/fixtures/30-monorepo-no-script/now.json

@@ -1,31 +0,0 @@
-{
-  "version": 2,
-  "uploadNowJson": true,
-  "builds": [{ "src": "packages/www/package.json", "use": "@vercel/next" }],
-  "routes": [{ "src": "/(.*)", "dest": "/packages/www/$1" }],
-  "probes": [
-    {
-      "path": "/",
-      "status": 200,
-      "mustContain": "Hello World"
-    },
-    {
-      "logMustContain": "Your application is being built using `next build`"
-    },
-    {
-      "logMustContain": "WARNING: your application is being opted out of @vercel/next's optimized lambdas mode due to legacy routes"
-    },
-    {
-      "logMustNotContain": "WARNING: Your application is being opted out of \"@vercel/next\" optimized lambdas mode due to `functions` config"
-    },
-    {
-      "logMustNotContain": "Traced Next.js serverless functions for external files in"
-    },
-    {
-      "logMustNotContain": "All serverless functions created in"
-    },
-    {
-      "logMustNotContain": "Compressed shared serverless function files"
-    }
-  ]
-}

packages/now-next/test/fixtures/30-monorepo-no-script/package.json

@@ -1,11 +0,0 @@
-{
-  "private": true,
-  "workspaces": [
-    "packages/*"
-  ],
-  "dependencies": {
-    "next": "9.5.1",
-    "react": "16.13.1",
-    "react-dom": "16.13.1"
-  }
-}

packages/now-next/test/fixtures/30-monorepo-no-script/packages/www/next.config.js

@@ -1,8 +0,0 @@
-module.exports = {
-  poweredByHeader: false,
-
-  webpack: (config, { defaultLoaders }) => {
-    defaultLoaders.babel.options.rootMode = 'upward';
-    return config;
-  },
-};

packages/now-next/test/fixtures/30-monorepo-no-script/packages/www/package.json

@@ -1,6 +0,0 @@
-{
-  "name": "@vercel-crash-demo/www",
-  "version": "1.0.0",
-  "private": true,
-  "sideEffects": false
-}

packages/now-next/test/fixtures/30-monorepo-no-script/packages/www/pages/index.jsx

@@ -1,7 +0,0 @@
-import React from 'react';
-
-const HelloWorld = () => (
-    <h1>Hello World</h1>
-);
-
-export default HelloWorld;

packages/now-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/node",
-  "version": "1.7.5-canary.1",
+  "version": "1.7.4-canary.0",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -33,7 +33,7 @@
     "@types/etag": "1.8.0",
     "@types/test-listen": "1.1.0",
     "@zeit/ncc": "0.20.4",
-    "@zeit/node-file-trace": "0.8.2",
+    "@zeit/node-file-trace": "0.8.0",
     "content-type": "1.0.4",
     "cookie": "0.4.0",
     "etag": "1.8.1",

packages/now-routing-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/routing-utils",
-  "version": "1.8.4-canary.0",
+  "version": "1.8.3",
   "description": "Vercel routing utilities",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

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

@@ -218,42 +218,18 @@ function replaceSegments(
   return destination;
 }
 
-function safelyCompile(
-  value: string,
-  indexes: { [k: string]: string }
-): string {
-  if (!value) {
-    return value;
+function safelyCompile(str: string, indexes: { [k: string]: string }): string {
+  if (!str) {
+    return str;
   }
-
-  for (const key of Object.keys(indexes)) {
-    if (value.includes(`:${key}`)) {
-      value = value
-        .replace(
-          new RegExp(`:${key}\\*`, 'g'),
-          `:${key}--ESCAPED_PARAM_ASTERISK`
-        )
-        .replace(
-          new RegExp(`:${key}\\?`, 'g'),
-          `:${key}--ESCAPED_PARAM_QUESTION`
-        )
-        .replace(new RegExp(`:${key}\\+`, 'g'), `:${key}--ESCAPED_PARAM_PLUS`)
-        .replace(
-          new RegExp(`:${key}(?!\\w)`, 'g'),
-          `--ESCAPED_PARAM_COLON${key}`
-        );
-    }
-  }
-  value = value
-    .replace(/(:|\*|\?|\+|\(|\)|\{|\})/g, '\\$1')
-    .replace(/--ESCAPED_PARAM_PLUS/g, '+')
-    .replace(/--ESCAPED_PARAM_COLON/g, ':')
-    .replace(/--ESCAPED_PARAM_QUESTION/g, '?')
-    .replace(/--ESCAPED_PARAM_ASTERISK/g, '*');
-
-  // the value needs to start with a forward-slash to be compiled
-  // correctly
-  return compile(`/${value}`, { validate: false })(indexes).substr(1);
+  // path-to-regexp cannot compile question marks
+  return str
+    .split('?')
+    .map(part => {
+      const compiler = compile(part);
+      return compiler(indexes);
+    })
+    .join('?');
 }
 
 function toSegmentDest(index: number): string {

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

@@ -508,60 +508,6 @@ test('convertHeaders', () => {
         },
       ],
     },
-    {
-      source: '/like/params/:path',
-      headers: [
-        {
-          key: 'x-path',
-          value: ':path',
-        },
-        {
-          key: 'some:path',
-          value: 'hi',
-        },
-        {
-          key: 'x-test',
-          value: 'some:value*',
-        },
-        {
-          key: 'x-test-2',
-          value: 'value*',
-        },
-        {
-          key: 'x-test-3',
-          value: ':value?',
-        },
-        {
-          key: 'x-test-4',
-          value: ':value+',
-        },
-        {
-          key: 'x-test-5',
-          value: 'something https:',
-        },
-        {
-          key: 'x-test-6',
-          value: ':hello(world)',
-        },
-        {
-          key: 'x-test-7',
-          value: 'hello(world)',
-        },
-        {
-          key: 'x-test-8',
-          value: 'hello{1,}',
-        },
-        {
-          key: 'x-test-9',
-          value: ':hello{1,2}',
-        },
-        {
-          key: 'content-security-policy',
-          value:
-            "default-src 'self'; img-src *; media-src media1.com media2.com; script-src userscripts.example.com/:path",
-        },
-      ],
-    },
   ]);
 
   const expected = [
@@ -580,25 +526,6 @@ test('convertHeaders', () => {
       headers: { 'on-blog': '$1', $1: 'blog' },
       continue: true,
     },
-    {
-      continue: true,
-      headers: {
-        'content-security-policy':
-          "default-src 'self'; img-src *; media-src media1.com media2.com; script-src userscripts.example.com/$1",
-        some$1: 'hi',
-        'x-path': '$1',
-        'x-test': 'some:value*',
-        'x-test-2': 'value*',
-        'x-test-3': ':value?',
-        'x-test-4': ':value+',
-        'x-test-5': 'something https:',
-        'x-test-6': ':hello(world)',
-        'x-test-7': 'hello(world)',
-        'x-test-8': 'hello{1,}',
-        'x-test-9': ':hello{1,2}',
-      },
-      src: '^\\/like\\/params(?:\\/([^\\/]+?))$',
-    },
   ];
 
   deepEqual(actual, expected);
@@ -607,14 +534,12 @@ test('convertHeaders', () => {
     ['hello/world/file.eot', 'another/font.ttf', 'dir/arial.font.css'],
     ['404.html'],
     ['/blog/first-post', '/blog/another/one'],
-    ['/like/params/first', '/like/params/second'],
   ];
 
   const mustNotMatch = [
     ['hello/file.jpg', 'hello/font-css', 'dir/arial.font-css'],
     ['403.html', '500.html'],
     ['/blogg', '/random'],
-    ['/non-match', '/like/params', '/like/params/'],
   ];
 
   assertRegexMatches(actual, mustMatch, mustNotMatch);

packages/redwood/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/redwood",
-  "version": "0.0.2-canary.3",
+  "version": "0.0.2-canary.1",
   "main": "./dist/index.js",
   "license": "MIT",
   "homepage": "https://vercel.com/docs",
@@ -18,7 +18,8 @@
     "prepublishOnly": "./build.sh"
   },
   "dependencies": {
-    "@netlify/zip-it-and-ship-it": "1.2.0"
+    "@netlify/zip-it-and-ship-it": "1.2.0",
+    "is-port-reachable": "3.0.0"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.19",

packages/redwood/src/index.ts

@@ -1,4 +1,5 @@
 import { join, dirname, relative, parse as parsePath, sep } from 'path';
+import { ChildProcess, SpawnOptions } from 'child_process';
 import {
   BuildOptions,
   Lambda,
@@ -12,22 +13,54 @@ import {
   getSpawnOptions,
   runNpmInstall,
   execCommand,
+  spawnCommand,
+  readConfigFile,
   FileBlob,
   FileFsRef,
+  NowBuildError,
 } from '@vercel/build-utils';
 import { makeAwsLauncher } from './launcher';
 const {
   getDependencies,
   // eslint-disable-next-line @typescript-eslint/no-var-requires
 } = require('@netlify/zip-it-and-ship-it/src/dependencies.js');
+//@ts-ignore
+import isPortReachable from 'is-port-reachable';
+
+interface RedwoodConfig {
+  web?: {
+    port?: number;
+    apiProxyPath?: string;
+  };
+  api?: {
+    port?: number;
+  };
+  browser?: {
+    open?: boolean;
+  };
+}
 
 const LAUNCHER_FILENAME = '___vc_launcher';
 const BRIDGE_FILENAME = '___vc_bridge';
 const HELPERS_FILENAME = '___vc_helpers';
 const SOURCEMAP_SUPPORT_FILENAME = '__vc_sourcemap_support';
 
+const entrypointToPort = new Map<string, number>();
+const childProcesses = new Set<ChildProcess>();
 export const version = 2;
 
+const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
+
+async function waitForPort(port: number): Promise<boolean> {
+  for (let i = 0; i < 500; i++) {
+    if (await isPortReachable(port)) {
+      return true;
+    }
+    await sleep(100);
+  }
+  return false;
+}
+
 export async function build({
   workPath,
   files,
@@ -56,10 +89,46 @@ export async function build({
 
   const {
     buildCommand = 'yarn rw db up --no-db-client --auto-approve && yarn rw build',
+    devCommand = 'yarn rw dev',
   } = config;
 
   if (meta.isDev) {
-    debug('Detected @vercel/redwood dev, returning routes...');
+    const toml = await readConfigFile<RedwoodConfig>(
+      join(mountpoint, 'redwood.toml')
+    );
+    const webPort = toml?.web?.port || 8910;
+    const apiPort = toml?.web?.port || 8911;
+    let devPort = entrypointToPort.get(entrypoint);
+
+    if (typeof devPort === 'number') {
+      debug('`%s` server already running for %j', devCommand, entrypoint);
+    } else {
+      devPort = webPort;
+      entrypointToPort.set(entrypoint, devPort);
+
+      const opts: SpawnOptions = {
+        cwd: mountpoint,
+        stdio: 'inherit',
+        env: { ...spawnOpts.env, PORT: String(devPort) },
+      };
+
+      const child = spawnCommand(devCommand, opts);
+      child.on('exit', () => entrypointToPort.delete(entrypoint));
+      childProcesses.add(child);
+
+      const found = await waitForPort(devPort);
+      if (!found) {
+        throw new NowBuildError({
+          code: 'REDWOOD_PORT_UNAVAILABLE',
+          message: `Failed to detect a server running on port ${devPort}`,
+          action: 'More Details',
+          link:
+            'https://err.sh/vercel/vercel/now-static-build-failed-to-detect-a-server',
+        });
+      }
+
+      debug('Detected dev server for %j', entrypoint);
+    }
 
     let srcBase = mountpoint.replace(/^\.\/?/, '');
 
@@ -69,11 +138,16 @@ export async function build({
 
     return {
       routes: [
+        {
+          src: `${srcBase}/api/(.*)`,
+          dest: `http://localhost:${apiPort}/$1`,
+        },
         {
           src: `${srcBase}/(.*)`,
-          dest: `http://localhost:$PORT/$1`,
+          dest: `http://localhost:${webPort}/$1`,
         },
       ],
+      watch: [join(srcBase, '**/*')],
       output: {},
     };
   }

packages/redwood/test/fixtures/01-create-redwood-app/api/package.json

@@ -3,6 +3,6 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "0.15.0"
+    "@redwoodjs/api": "0.14.0"
   }
 }

packages/redwood/test/fixtures/01-create-redwood-app/package.json

@@ -7,7 +7,7 @@
     ]
   },
   "devDependencies": {
-    "@redwoodjs/core": "0.15.0"
+    "@redwoodjs/core": "0.14.0"
   },
   "engines": {
     "node": ">=12",

packages/redwood/test/fixtures/01-create-redwood-app/vercel.json

@@ -14,7 +14,7 @@
       "method": "POST",
       "headers": { "Accept": "application/json" },
       "body": { "query": "{ redwood { version } }" },
-      "mustContain": "0.15.0"
+      "mustContain": "0.14.0"
     }
   ]
 }

packages/redwood/test/fixtures/01-create-redwood-app/web/package.json

@@ -6,8 +6,8 @@
     "defaults"
   ],
   "dependencies": {
-    "@redwoodjs/router": "0.15.0",
-    "@redwoodjs/web": "0.15.0",
+    "@redwoodjs/router": "0.14.0",
+    "@redwoodjs/web": "0.14.0",
     "prop-types": "^15.7.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1"

yarn.lock

@@ -2292,10 +2292,10 @@
   resolved "https://registry.yarnpkg.com/@zeit/ncc/-/ncc-0.20.4.tgz#00f0a25a88cac3712af4ba66561d9e281c6f05c9"
   integrity sha512-fmq+F/QxPec+k/zvT7HiVpk7oiGFseS6brfT/AYqmCUp6QFRK7vZf2Ref46MImsg/g2W3g5X6SRvGRmOAvEfdA==
 
-"@zeit/node-file-trace@0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@zeit/node-file-trace/-/node-file-trace-0.8.2.tgz#a00d21a98015c4ea18c8b1104ad60ea91b42dcca"
-  integrity sha512-M6KR95Xz9af8kB8X7e4inhoIjVoKNT6WxjLQwPByAAdCP6JdCg3Fb0dbTh2WelKlAibUpfS9nANU/HUDcfedSA==
+"@zeit/node-file-trace@0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@zeit/node-file-trace/-/node-file-trace-0.8.0.tgz#fe597a8f63c1a6eb38cee92ab4eef322897b4173"
+  integrity sha512-itrVZUwqJSbURaRNxOAJUVkhCjl8BgQpTxy+i5m4Akdacn5CzKAHlschTcTvdcnYGtKoilDwYFuPenS5zHfDQw==
   dependencies:
     acorn "^7.1.1"
     acorn-class-fields "^0.3.2"