Publish Stable

- vercel@27.0.2
 - @vercel/fs-detectors@1.0.2
 - @vercel/node@2.4.2

api/package.json

@@ -5,7 +5,8 @@
   "description": "API for the vercel/vercel repo",
   "main": "index.js",
   "scripts": {
-    "vercel-build": "node ../utils/run.js build all"
+    "//TODO": "We should add this pkg to yarn workspaces",
+    "vercel-build": "cd .. && yarn install && yarn vercel-build"
   },
   "dependencies": {
     "@sentry/node": "5.11.1",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "27.0.0",
+  "version": "27.0.2",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -46,10 +46,10 @@
     "@vercel/go": "2.0.5",
     "@vercel/hydrogen": "0.0.2",
     "@vercel/next": "3.1.4",
-    "@vercel/node": "2.4.1",
+    "@vercel/node": "2.4.2",
     "@vercel/python": "3.0.5",
     "@vercel/redwood": "1.0.6",
-    "@vercel/remix": "1.0.6",
+    "@vercel/remix": "1.0.7",
     "@vercel/ruby": "1.3.13",
     "@vercel/static-build": "1.0.5",
     "update-notifier": "5.1.0"
@@ -98,7 +98,7 @@
     "@types/yauzl-promise": "2.1.0",
     "@vercel/client": "12.1.0",
     "@vercel/frameworks": "1.1.0",
-    "@vercel/fs-detectors": "1.0.1",
+    "@vercel/fs-detectors": "1.0.2",
     "@vercel/ncc": "0.24.0",
     "@zeit/fun": "0.11.2",
     "@zeit/source-map-support": "0.6.2",

packages/cli/src/commands/build.ts

@@ -336,8 +336,7 @@ export default async function main(client: Client): Promise<number> {
   const buildResults: Map<Builder, BuildResult> = new Map();
   const overrides: PathOverride[] = [];
   const repoRootPath = cwd;
-  const rootPackageJsonPath = repoRootPath || workPath;
+  const corepackShimDir = await initCorepack({ repoRootPath });
-  const corepackShimDir = await initCorepack({ cwd, rootPackageJsonPath });
 
   for (const build of builds) {
     if (typeof build.src !== 'string') continue;

packages/cli/src/commands/index.ts

@@ -25,8 +25,8 @@ export default new Map([
   ['logout', 'logout'],
   ['logs', 'logs'],
   ['ls', 'list'],
-  ['project', 'projects'],
+  ['project', 'project'],
-  ['projects', 'projects'],
+  ['projects', 'project'],
   ['pull', 'pull'],
   ['remove', 'remove'],
   ['rm', 'remove'],

packages/cli/src/index.ts

@@ -173,7 +173,7 @@ const main = async () => {
   const targetOrSubcommand = argv._[2];
 
   // Currently no beta commands - add here as needed
-  const betaCommands: string[] = [''];
+  const betaCommands: string[] = [];
   if (betaCommands.includes(targetOrSubcommand)) {
     console.log(
       `${chalk.grey(
@@ -653,7 +653,7 @@ const main = async () => {
       case 'logout':
         func = require('./commands/logout').default;
         break;
-      case 'projects':
+      case 'project':
         func = require('./commands/project').default;
         break;
       case 'pull':

packages/cli/src/util/build/corepack.ts

@@ -6,11 +6,9 @@ import { VERCEL_DIR } from '../projects/link';
 import readJSONFile from '../read-json-file';
 
 export async function initCorepack({
-  cwd,
+  repoRootPath,
-  rootPackageJsonPath,
 }: {
-  cwd: string;
+  repoRootPath: string;
-  rootPackageJsonPath: string;
 }): Promise<string | null> {
   if (process.env.ENABLE_EXPERIMENTAL_COREPACK !== '1') {
     // Since corepack is experimental, we need to exit early
@@ -18,7 +16,7 @@ export async function initCorepack({
     return null;
   }
   const pkg = await readJSONFile<PackageJson>(
-    join(rootPackageJsonPath, 'package.json')
+    join(repoRootPath, 'package.json')
   );
   if (pkg instanceof CantParseJSONFile) {
     console.warn(
@@ -32,16 +30,13 @@ export async function initCorepack({
     console.log(
       `Detected ENABLE_EXPERIMENTAL_COREPACK=1 and "${pkg.packageManager}" in package.json`
     );
-    const corepackRootDir = join(cwd, VERCEL_DIR, 'cache', 'corepack');
+    const corepackRootDir = join(repoRootPath, VERCEL_DIR, 'cache', 'corepack');
     const corepackHomeDir = join(corepackRootDir, 'home');
     const corepackShimDir = join(corepackRootDir, 'shim');
     await fs.mkdirp(corepackHomeDir);
     await fs.mkdirp(corepackShimDir);
     process.env.COREPACK_HOME = corepackHomeDir;
     process.env.PATH = `${corepackShimDir}${delimiter}${process.env.PATH}`;
-    process.env.DEBUG = process.env.DEBUG
-      ? `corepack,${process.env.DEBUG}`
-      : 'corepack';
     const pkgManagerName = pkg.packageManager.split('@')[0];
     // We must explicitly call `corepack enable npm` since `corepack enable`
     // doesn't work with npm. See https://github.com/nodejs/corepack/pull/24
@@ -72,11 +67,4 @@ export function cleanupCorepack(corepackShimDir: string) {
       ''
     );
   }
-  if (process.env.DEBUG) {
-    if (process.env.DEBUG === 'corepack') {
-      delete process.env.DEBUG;
-    } else {
-      process.env.DEBUG = process.env.DEBUG.replace('corepack,', '');
-    }
-  }
 }

packages/cli/src/util/deploy/create-git-meta.ts

@@ -9,11 +9,11 @@ import { Output } from '../output';
 export function isDirty(directory: string, output: Output): Promise<boolean> {
   return new Promise(resolve => {
     exec('git status -s', { cwd: directory }, function (err, stdout, stderr) {
-      if (err) return resolve(false);
+      let debugMessage = `Failed to determine if Git repo has been modified:`;
-      if (stderr) {
+      if (err || stderr) {
-        output.debug(
+        if (err) debugMessage += `\n${err}`;
-          `Failed to determine if git repo has been modified: ${stderr.trim()}`
+        if (stderr) debugMessage += `\n${stderr.trim()}`;
-        );
+        output.debug(debugMessage);
         return resolve(false);
       }
       resolve(stdout.trim().length > 0);
@@ -64,7 +64,10 @@ export async function createGitMeta(
     return;
   }
   const [commit, dirty] = await Promise.all([
-    getLastCommit(directory).catch(() => {
+    getLastCommit(directory).catch(err => {
+      output.debug(
+        `Failed to get last commit. The directory is likely not a Git repo, there are no latest commits, or it is corrupted.\n${err}`
+      );
       return;
     }),
     isDirty(directory, output),

packages/cli/test/helpers/parse-table.ts

@@ -1,4 +1,4 @@
-export function getDataFromIntro(output: string): {
+export function pluckIdentifiersFromDeploymentList(output: string): {
   project: string | undefined;
   org: string | undefined;
 } {
@@ -11,7 +11,7 @@ export function getDataFromIntro(output: string): {
   };
 }
 
-export function parseTable(output: string): string[] {
+export function parseSpacedTableRow(output: string): string[] {
   return output
     .trim()
     .replace(/ {1} +/g, ',')

packages/cli/test/helpers/read-output-stream.ts

@@ -0,0 +1,23 @@
+import { MockClient } from '../mocks/client';
+
+export function readOutputStream(
+  client: MockClient,
+  length: number = 3
+): Promise<string> {
+  return new Promise((resolve, reject) => {
+    const chunks: Buffer[] = [];
+    const timeout = setTimeout(() => {
+      reject();
+    }, 3000);
+
+    client.stderr.resume();
+    client.stderr.on('data', chunk => {
+      chunks.push(chunk);
+      if (chunks.length === length) {
+        clearTimeout(timeout);
+        resolve(chunks.toString().replace(/,/g, ''));
+      }
+    });
+    client.stderr.on('error', reject);
+  });
+}

packages/cli/test/integration.js

@@ -1323,12 +1323,7 @@ test('[vc projects] should create a project successfully', async t => {
     Math.random().toString(36).split('.')[1]
   }`;
 
-  const vc = execa(binaryPath, [
+  const vc = execa(binaryPath, ['project', 'add', projectName, ...defaultArgs]);
-    'projects',
-    'add',
-    projectName,
-    ...defaultArgs,
-  ]);
 
   await waitForPrompt(vc, chunk =>
     chunk.includes(`Success! Project ${projectName} added`)
@@ -1339,7 +1334,7 @@ test('[vc projects] should create a project successfully', async t => {
 
   // creating the same project again should succeed
   const vc2 = execa(binaryPath, [
-    'projects',
+    'project',
     'add',
     projectName,
     ...defaultArgs,

packages/cli/test/mocks/client.ts

@@ -35,7 +35,6 @@ export class MockClient extends Client {
   scenario: Scenario;
   mockServer?: Server;
   private app: Express;
-  private mockOutput: jest.Mock<void, Parameters<Output['print']>>;
 
   constructor() {
     super({
@@ -53,13 +52,6 @@ export class MockClient extends Client {
       output: new Output(new PassThrough()),
     });
 
-    this.mockOutput = jest.fn();
-    const _print = this.output.print.bind(this.output);
-    this.output.print = s => {
-      _print(s);
-      this.mockOutput(s);
-    };
-
     this.app = express();
     this.app.use(express.json());
 
@@ -99,13 +91,7 @@ export class MockClient extends Client {
 
     this._createPromptModule();
 
-    this.mockOutput.mockReset();
     this.output = new Output(this.stderr);
-    const _print = this.output.print.bind(this.output);
-    this.output.print = s => {
-      _print(s);
-      this.mockOutput(s);
-    };
 
     this.argv = [];
     this.authConfig = {};
@@ -115,10 +101,6 @@ export class MockClient extends Client {
     this.scenario = Router();
   }
 
-  get outputBuffer() {
-    return this.mockOutput.mock.calls.map(c => c[0]).join('');
-  }
-
   async startMockServer() {
     this.mockServer = createServer(this.app);
     await listen(this.mockServer, 0);

packages/cli/test/mocks/matchers/index.ts

@@ -25,8 +25,6 @@ type GetMatcherType<TP, TResult> = TP extends PromiseFunction
   ? (...args: Tail<Parameters<TP>>) => TResult
   : TP;
 
-//type T = GetMatcherType<typeof matchers['toOutput'], void>;
-
 type GetMatchersType<TMatchers, TResult> = {
   [P in keyof TMatchers]: GetMatcherType<TMatchers[P], TResult>;
 };

packages/cli/test/unit/commands/list.test.ts

@@ -5,7 +5,11 @@ import { join } from 'path';
 import { useTeams } from '../../mocks/team';
 import { defaultProject, useProject } from '../../mocks/project';
 import { useDeployment } from '../../mocks/deployment';
-import { parseTable, getDataFromIntro } from '../../helpers/parse-table';
+import { readOutputStream } from '../../helpers/read-output-stream';
+import {
+  parseSpacedTableRow,
+  pluckIdentifiersFromDeploymentList,
+} from '../../helpers/parse-table';
 
 const fixture = (name: string) =>
   join(__dirname, '../../fixtures/unit/commands/list', name);
@@ -31,10 +35,11 @@ describe('list', () => {
 
       await list(client);
 
-      const [line0, , line2, line3] = client.outputBuffer.split('\n');
+      const output = await readOutputStream(client);
-      const { org } = getDataFromIntro(line0);
+
-      const header: string[] = parseTable(line2);
+      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[0]);
-      const data: string[] = parseTable(line3);
+      const header: string[] = parseSpacedTableRow(output.split('\n')[2]);
+      const data: string[] = parseSpacedTableRow(output.split('\n')[3]);
       data.splice(2, 1);
 
       expect(org).toEqual(team[0].slug);
@@ -72,10 +77,11 @@ describe('list', () => {
       client.setArgv(deployment.name);
       await list(client);
 
-      const [line0, , line2, line3] = client.outputBuffer.split('\n');
+      const output = await readOutputStream(client);
-      const { org } = getDataFromIntro(line0);
+
-      const header: string[] = parseTable(line2);
+      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[0]);
-      const data: string[] = parseTable(line3);
+      const header: string[] = parseSpacedTableRow(output.split('\n')[2]);
+      const data: string[] = parseSpacedTableRow(output.split('\n')[3]);
       data.splice(2, 1);
 
       expect(org).toEqual(teamSlug);

packages/cli/test/unit/commands/project.test.ts

@@ -4,9 +4,13 @@ import { useTeams } from '../../mocks/team';
 import { defaultProject, useProject } from '../../mocks/project';
 import { client } from '../../mocks/client';
 import { Project } from '../../../src/types';
-import { getDataFromIntro, parseTable } from '../../helpers/parse-table';
+import { readOutputStream } from '../../helpers/read-output-stream';
+import {
+  pluckIdentifiersFromDeploymentList,
+  parseSpacedTableRow,
+} from '../../helpers/parse-table';
 
-describe('projects', () => {
+describe('project', () => {
   describe('list', () => {
     it('should list deployments under a user', async () => {
       const user = useUser();
@@ -17,10 +21,10 @@ describe('projects', () => {
       client.setArgv('project', 'ls');
       await projects(client);
 
-      const [line0, , line2, line3] = client.outputBuffer.split('\n');
+      const output = await readOutputStream(client, 2);
-      const { org } = getDataFromIntro(line0);
+      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[0]);
-      const header: string[] = parseTable(line2);
+      const header: string[] = parseSpacedTableRow(output.split('\n')[2]);
-      const data: string[] = parseTable(line3);
+      const data: string[] = parseSpacedTableRow(output.split('\n')[3]);
       data.pop();
 
       expect(org).toEqual(user.username);
@@ -38,10 +42,10 @@ describe('projects', () => {
       client.setArgv('project', 'ls');
       await projects(client);
 
-      const [line0, , line2, line3] = client.outputBuffer.split('\n');
+      const output = await readOutputStream(client, 2);
-      const { org } = getDataFromIntro(line0);
+      const { org } = pluckIdentifiersFromDeploymentList(output.split('\n')[0]);
-      const header: string[] = parseTable(line2);
+      const header: string[] = parseSpacedTableRow(output.split('\n')[2]);
-      const data: string[] = parseTable(line3);
+      const data: string[] = parseSpacedTableRow(output.split('\n')[3]);
       data.pop();
 
       expect(org).toEqual(team[0].slug);

packages/cli/test/unit/util/deploy/create-git-meta.test.ts

@@ -135,7 +135,15 @@ describe('createGitMeta', () => {
       await fs.copy(directory, tmpDir);
       await fs.rename(join(tmpDir, 'git'), join(tmpDir, '.git'));
 
+      client.output.debugEnabled = true;
       const data = await createGitMeta(tmpDir, client.output);
+
+      await expect(client.stderr).toOutput(
+        `Failed to get last commit. The directory is likely not a Git repo, there are no latest commits, or it is corrupted.`
+      );
+      await expect(client.stderr).toOutput(
+        `Failed to determine if Git repo has been modified:`
+      );
       expect(data).toBeUndefined();
     } finally {
       await fs.remove(tmpDir);

packages/fs-detectors/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fs-detectors",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Vercel filesystem detectors",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

packages/fs-detectors/src/detect-framework.ts

@@ -80,11 +80,13 @@ export async function detectFramework({
   fs,
   frameworkList,
 }: DetectFrameworkOptions): Promise<string | null> {
-  for (const framework of frameworkList) {
+  const result = await Promise.all(
-    if (await matches(fs, framework)) {
+    frameworkList.map(async frameworkMatch => {
-      return framework.slug;
+      if (await matches(fs, frameworkMatch)) {
-    }
+        return frameworkMatch.slug;
-  }
+      }
-
+      return null;
-  return null;
+    })
+  );
+  return result.find(res => res !== null) ?? null;
 }

packages/fs-detectors/test/unit.framework-detector.test.ts

@@ -252,6 +252,19 @@ describe('DetectorFilesystem', () => {
       expect(await detectFramework({ fs, frameworkList })).toBe('nextjs');
     });
 
+    it('Detect frameworks based on ascending order in framework list', async () => {
+      const fs = new VirtualFilesystem({
+        'package.json': JSON.stringify({
+          dependencies: {
+            next: '9.0.0',
+            gatsby: '4.18.0',
+          },
+        }),
+      });
+
+      expect(await detectFramework({ fs, frameworkList })).toBe('nextjs');
+    });
+
     it('Detect Nuxt.js', async () => {
       const fs = new VirtualFilesystem({
         'package.json': JSON.stringify({

packages/node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/node",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",

packages/node/src/dev-server.ts

@@ -193,7 +193,7 @@ async function compileUserCode(entrypoint: string) {
 
           let edgeHandler = module.exports.default;
           if (!edgeHandler) {
-            throw new Error('No default export was found. Add a default export to handle requests.');
+            throw new Error('No default export was found. Add a default export to handle requests. Learn more: https://vercel.link/creating-edge-middleware');
           }
 
           let response = await edgeHandler(event.request, event);
@@ -305,7 +305,7 @@ function parseRuntime(
     throw new Error(
       `Invalid function runtime "${runtime}" for "${entrypoint}". Valid runtimes are: ${JSON.stringify(
         validRuntimes
-      )}`
+      )}. Learn more: https://vercel.link/creating-edge-functions`
     );
   }
 

packages/remix/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/remix",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "license": "MIT",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",

packages/remix/src/build.ts

@@ -187,6 +187,17 @@ export const build: BuildV2 = async ({
       // Explicit directory path the server output will be
       serverBuildPath = join(remixConfig.serverBuildDirectory, 'index.js');
     }
+
+    // Also check for whether were in a monorepo.
+    // If we are, prepend the app root directory from config onto the build path.
+    // e.g. `/apps/my-remix-app/api/index.js`
+    const isMonorepo = repoRootPath && repoRootPath !== workPath;
+    if (isMonorepo && config.projectSettings?.rootDirectory) {
+      serverBuildPath = join(
+        config.projectSettings.rootDirectory,
+        serverBuildPath
+      );
+    }
   } catch (err: any) {
     // Ignore error if `remix.config.js` does not exist
     if (err.code !== 'MODULE_NOT_FOUND') throw err;
@@ -196,6 +207,7 @@ export const build: BuildV2 = async ({
     glob('**', join(entrypointFsDirname, 'public')),
     createRenderFunction(
       entrypointFsDirname,
+      repoRootPath,
       serverBuildPath,
       needsHandler,
       nodeVersion
@@ -230,6 +242,7 @@ function hasScript(scriptName: string, pkg: PackageJson | null) {
 }
 
 async function createRenderFunction(
+  entrypointDir: string,
   rootDir: string,
   serverBuildPath: string,
   needsHandler: boolean,
@@ -250,6 +263,7 @@ async function createRenderFunction(
   // Trace the handler with `@vercel/nft`
   const trace = await nodeFileTrace([handlerPath], {
     base: rootDir,
+    processCwd: entrypointDir,
   });
 
   for (const warning of trace.warnings) {

vercel.json

@@ -20,7 +20,7 @@
   ],
   "build": {
     "env": {
-      "ENABLE_FILE_SYSTEM_API": "1"
+      "ENABLE_VC_BUILD": "1"
     }
   },
   "github": {