Publish Canary

- @vercel/build-utils@2.12.3-canary.27
 - vercel@23.1.3-canary.45
 - @vercel/client@10.2.3-canary.28
 - vercel-plugin-go@1.0.0-canary.12
 - vercel-plugin-node@1.12.2-canary.18
 - vercel-plugin-python@1.0.0-canary.13
 - vercel-plugin-ruby@1.0.0-canary.11

examples/remix/.gitignore

@@ -5,4 +5,4 @@ node_modules
 .output
 
 public/build
-api/build
+api/_build

examples/remix/api/index.js

@@ -1,5 +1,5 @@
 const { createRequestHandler } = require("@remix-run/vercel");
 
 module.exports = createRequestHandler({
-  build: require("./build")
+  build: require("./_build")
 });

examples/remix/app/styles/demos/remix.css

@@ -1,120 +0,0 @@
-/*
- * You probably want to just delete this file; it's just for the demo pages.
- */
-.remix-app {
-  display: flex;
-  flex-direction: column;
-  min-height: 100vh;
-  min-height: calc(100vh - env(safe-area-inset-bottom));
-}
-
-.remix-app > * {
-  width: 100%;
-}
-
-.remix-app__header {
-  padding-top: 1rem;
-  padding-bottom: 1rem;
-  border-bottom: 1px solid var(--color-border);
-}
-
-.remix-app__header-content {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.remix-app__header-home-link {
-  width: 106px;
-  height: 30px;
-  color: var(--color-foreground);
-}
-
-.remix-app__header-nav ul {
-  list-style: none;
-  margin: 0;
-  display: flex;
-  align-items: center;
-  gap: 1.5em;
-}
-
-.remix-app__header-nav li {
-  font-weight: bold;
-}
-
-.remix-app__main {
-  flex: 1 1 100%;
-}
-
-.remix-app__footer {
-  padding-top: 1rem;
-  padding-bottom: 1rem;
-  border-top: 1px solid var(--color-border);
-}
-
-.remix-app__footer-content {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.remix__page {
-  --gap: 1rem;
-  --space: 2rem;
-  display: grid;
-  grid-auto-rows: min-content;
-  gap: var(--gap);
-  padding-top: var(--space);
-  padding-bottom: var(--space);
-}
-
-@media print, screen and (min-width: 640px) {
-  .remix__page {
-    --gap: 2rem;
-    grid-auto-rows: unset;
-    grid-template-columns: repeat(2, 1fr);
-  }
-}
-
-@media screen and (min-width: 1024px) {
-  .remix__page {
-    --gap: 4rem;
-  }
-}
-
-.remix__page > main > :first-child {
-  margin-top: 0;
-}
-
-.remix__page > main > :last-child {
-  margin-bottom: 0;
-}
-
-.remix__page > aside {
-  margin: 0;
-  padding: 1.5ch 2ch;
-  border: solid 1px var(--color-border);
-  border-radius: 0.5rem;
-}
-
-.remix__page > aside > :first-child {
-  margin-top: 0;
-}
-
-.remix__page > aside > :last-child {
-  margin-bottom: 0;
-}
-
-.remix__form {
-  display: flex;
-  flex-direction: column;
-  gap: 1rem;
-  padding: 1rem;
-  border: 1px solid var(--color-border);
-  border-radius: 0.5rem;
-}
-
-.remix__form > * {
-  margin-top: 0;
-  margin-bottom: 0;
-}

examples/remix/package.json

@@ -9,15 +9,15 @@
     "postinstall": "remix setup node"
   },
   "dependencies": {
-    "@remix-run/react": "^1.0.5",
+    "@remix-run/react": "^1.0.6",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "remix": "^1.0.5",
-    "@remix-run/serve": "^1.0.5",
-    "@remix-run/vercel": "^1.0.5"
+    "remix": "^1.0.6",
+    "@remix-run/serve": "^1.0.6",
+    "@remix-run/vercel": "^1.0.6"
   },
   "devDependencies": {
-    "@remix-run/dev": "^1.0.5",
+    "@remix-run/dev": "^1.0.6",
     "@types/react": "^17.0.24",
     "@types/react-dom": "^17.0.9",
     "typescript": "^4.1.2"

examples/remix/remix.config.js

@@ -5,5 +5,5 @@ module.exports = {
   appDirectory: "app",
   browserBuildDirectory: "public/build",
   publicPath: "/build/",
-  serverBuildDirectory: "api/build"
+  serverBuildDirectory: "api/_build"
 };

packages/build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.12.3-canary.25",
+  "version": "2.12.3-canary.27",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -30,7 +30,7 @@
     "@types/node-fetch": "^2.1.6",
     "@types/semver": "6.0.0",
     "@types/yazl": "^2.4.1",
-    "@vercel/frameworks": "0.5.1-canary.15",
+    "@vercel/frameworks": "0.5.1-canary.16",
     "@vercel/ncc": "0.24.0",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",

packages/build-utils/src/convert-runtime-to-plugin.ts

@@ -2,10 +2,9 @@ import fs from 'fs-extra';
 import { join, dirname, relative } from 'path';
 import glob from './fs/glob';
 import { normalizePath } from './fs/normalize-path';
-import { FILES_SYMBOL, getLambdaOptionsFromFunction, Lambda } from './lambda';
+import { FILES_SYMBOL, Lambda } from './lambda';
 import type FileBlob from './file-blob';
-import type { BuilderFunctions, BuildOptions, Files } from './types';
-import minimatch from 'minimatch';
+import type { BuildOptions, Files } from './types';
 
 /**
  * Convert legacy Runtime to a Plugin.
@@ -17,40 +16,25 @@ export function convertRuntimeToPlugin(
   ext: string
 ) {
   // This `build()` signature should match `plugin.build()` signature in `vercel build`.
-  return async function build({
-    vercelConfig,
-    workPath,
-  }: {
-    vercelConfig: {
-      functions?: BuilderFunctions;
-      regions?: string[];
-    };
-    workPath: string;
-  }) {
+  return async function build({ workPath }: { workPath: string }) {
     const opts = { cwd: workPath };
     const files = await glob('**', opts);
     delete files['vercel.json']; // Builders/Runtimes didn't have vercel.json
     const entrypoints = await glob(`api/**/*${ext}`, opts);
     const pages: { [key: string]: any } = {};
-    const { functions = {} } = vercelConfig;
     const traceDir = join(workPath, '.output', 'runtime-traced-files');
     await fs.ensureDir(traceDir);
 
     for (const entrypoint of Object.keys(entrypoints)) {
-      const key =
-        Object.keys(functions).find(
-          src => src === entrypoint || minimatch(entrypoint, src)
-        ) || '';
-      const config = functions[key] || {};
-
       const { output } = await buildRuntime({
         files,
         entrypoint,
         workPath,
         config: {
           zeroConfig: true,
-          includeFiles: config.includeFiles,
-          excludeFiles: config.excludeFiles,
+        },
+        meta: {
+          avoidTopLevelInstall: true,
         },
       });
 
@@ -61,7 +45,6 @@ export function convertRuntimeToPlugin(
         maxDuration: output.maxDuration,
         environment: output.environment,
         allowQuery: output.allowQuery,
-        //regions: output.regions,
       };
 
       // @ts-ignore This symbol is a private API
@@ -108,7 +91,7 @@ export function convertRuntimeToPlugin(
       await fs.writeFile(nft, json);
     }
 
-    await updateFunctionsManifest({ vercelConfig, workPath, pages });
+    await updateFunctionsManifest({ workPath, pages });
   };
 }
 
@@ -136,15 +119,12 @@ async function readJson(filePath: string): Promise<{ [key: string]: any }> {
 
 /**
  * If `.output/functions-manifest.json` exists, append to the pages
- * property. Otherwise write a new file. This will also read `vercel.json`
- * and apply relevant `functions` property config.
+ * property. Otherwise write a new file.
  */
 export async function updateFunctionsManifest({
-  vercelConfig,
   workPath,
   pages,
 }: {
-  vercelConfig: { functions?: BuilderFunctions; regions?: string[] };
   workPath: string;
   pages: { [key: string]: any };
 }) {
@@ -159,16 +139,7 @@ export async function updateFunctionsManifest({
   if (!functionsManifest.pages) functionsManifest.pages = {};
 
   for (const [pageKey, pageConfig] of Object.entries(pages)) {
-    const fnConfig = await getLambdaOptionsFromFunction({
-      sourceFile: pageKey,
-      config: vercelConfig,
-    });
-    functionsManifest.pages[pageKey] = {
-      ...pageConfig,
-      memory: fnConfig.memory || pageConfig.memory,
-      maxDuration: fnConfig.maxDuration || pageConfig.maxDuration,
-      regions: vercelConfig.regions || pageConfig.regions,
-    };
+    functionsManifest.pages[pageKey] = { ...pageConfig };
   }
 
   await fs.writeFile(functionsManifestPath, JSON.stringify(functionsManifest));

packages/build-utils/src/types.ts

@@ -58,6 +58,7 @@ export interface Meta {
   filesRemoved?: string[];
   env?: Env;
   buildEnv?: Env;
+  avoidTopLevelInstall?: boolean;
 }
 
 export interface AnalyzeOptions {

packages/build-utils/test/unit.convert-runtime-to-plugin.test.ts

@@ -50,11 +50,10 @@ describe('convert-runtime-to-plugin', () => {
     };
 
     const lambdaFiles = await fsToJson(workPath);
-    const vercelConfig = JSON.parse(lambdaFiles['vercel.json']);
     delete lambdaFiles['vercel.json'];
     const build = await convertRuntimeToPlugin(buildRuntime, '.py');
 
-    await build({ vercelConfig, workPath });
+    await build({ workPath });
 
     const output = await fsToJson(join(workPath, '.output'));
     expect(output).toMatchObject({
@@ -82,7 +81,7 @@ describe('convert-runtime-to-plugin', () => {
       pages: {
         'api/index.py': lambdaOptions,
         'api/users/get.py': lambdaOptions,
-        'api/users/post.py': { ...lambdaOptions, memory: 3008 },
+        'api/users/post.py': { ...lambdaOptions, memory: 512 },
       },
     });
 

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "23.1.3-canary.43",
+  "version": "23.1.3-canary.45",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -43,14 +43,14 @@
     "node": ">= 12"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.12.3-canary.25",
+    "@vercel/build-utils": "2.12.3-canary.27",
     "@vercel/go": "1.2.4-canary.4",
     "@vercel/node": "1.12.2-canary.7",
-    "@vercel/python": "2.1.2-canary.0",
-    "@vercel/ruby": "1.2.8-canary.4",
+    "@vercel/python": "2.1.2-canary.1",
+    "@vercel/ruby": "1.2.8-canary.5",
     "update-notifier": "4.1.0",
     "vercel-plugin-middleware": "0.0.0-canary.7",
-    "vercel-plugin-node": "1.12.2-canary.16"
+    "vercel-plugin-node": "1.12.2-canary.18"
   },
   "devDependencies": {
     "@next/env": "11.1.2",
@@ -90,7 +90,7 @@
     "@types/update-notifier": "5.1.0",
     "@types/which": "1.3.2",
     "@types/write-json-file": "2.2.1",
-    "@vercel/frameworks": "0.5.1-canary.15",
+    "@vercel/frameworks": "0.5.1-canary.16",
     "@vercel/ncc": "0.24.0",
     "@vercel/nft": "0.17.0",
     "@zeit/fun": "0.11.2",

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/client",
-  "version": "10.2.3-canary.26",
+  "version": "10.2.3-canary.28",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "homepage": "https://vercel.com",
@@ -40,7 +40,7 @@
     ]
   },
   "dependencies": {
-    "@vercel/build-utils": "2.12.3-canary.25",
+    "@vercel/build-utils": "2.12.3-canary.27",
     "@zeit/fetch": "5.2.0",
     "async-retry": "1.2.3",
     "async-sema": "3.0.0",

packages/frameworks/logos/remix.svg

@@ -0,0 +1,6 @@
+<svg viewBox="0 0 800 800" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M700 0H100C44.772 0 0 44.772 0 100v600c0 55.228 44.772 100 100 100h600c55.228 0 100-44.772 100-100V100C800 44.772 755.228 0 700 0Z" fill="#212121"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M587.947 527.768c4.254 54.65 4.254 80.268 4.254 108.232H465.756c0-6.091.109-11.663.219-17.313.342-17.564.699-35.88-2.147-72.868-3.761-54.152-27.08-66.185-69.957-66.185H195v-98.525h204.889c54.16 0 81.241-16.476 81.241-60.098 0-38.357-27.081-61.601-81.241-61.601H195V163h227.456C545.069 163 606 220.912 606 313.42c0 69.193-42.877 114.319-100.799 121.84 48.895 9.777 77.48 37.605 82.746 92.508Z" fill="#fff"/>
+  <path d="M195 636v-73.447h133.697c22.332 0 27.181 16.563 27.181 26.441V636H195Z" fill="#fff"/>
+  <path d="M194.5 636v.5h161.878v-47.506c0-5.006-1.226-11.734-5.315-17.224-4.108-5.515-11.059-9.717-22.366-9.717H194.5V636Z" stroke="#fff" stroke-opacity=".8"/>
+</svg>

packages/frameworks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/frameworks",
-  "version": "0.5.1-canary.15",
+  "version": "0.5.1-canary.16",
   "main": "./dist/frameworks.js",
   "types": "./dist/frameworks.d.ts",
   "files": [

packages/plugin-go/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "vercel-plugin-go",
-  "version": "1.0.0-canary.10",
+  "version": "1.0.0-canary.12",
   "main": "dist/index.js",
   "license": "MIT",
   "files": [
@@ -17,7 +17,7 @@
     "prepublishOnly": "tsc"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.12.3-canary.25",
+    "@vercel/build-utils": "2.12.3-canary.27",
     "@vercel/go": "1.2.4-canary.4"
   },
   "devDependencies": {

packages/plugin-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel-plugin-node",
-  "version": "1.12.2-canary.16",
+  "version": "1.12.2-canary.18",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -34,7 +34,7 @@
     "@types/node-fetch": "2",
     "@types/test-listen": "1.1.0",
     "@types/yazl": "2.4.2",
-    "@vercel/build-utils": "2.12.3-canary.25",
+    "@vercel/build-utils": "2.12.3-canary.27",
     "@vercel/fun": "1.0.3",
     "@vercel/ncc": "0.24.0",
     "@vercel/nft": "0.14.0",

packages/plugin-node/src/index.ts

@@ -48,7 +48,6 @@ import { Register, register } from './typescript';
 import { pageToRoute } from './router/page-to-route';
 import { isDynamicRoute } from './router/is-dynamic';
 import crypto from 'crypto';
-import type { VercelConfig } from '@vercel/client';
 
 export { shouldServe };
 export {
@@ -380,13 +379,7 @@ function getAWSLambdaHandler(entrypoint: string, config: FunctionConfig) {
 }
 
 // TODO NATE: turn this into a `@vercel/plugin-utils` helper function?
-export async function build({
-  vercelConfig,
-  workPath,
-}: {
-  vercelConfig: VercelConfig;
-  workPath: string;
-}) {
+export async function build({ workPath }: { workPath: string }) {
   const project = new Project();
   const entrypoints = await glob('api/**/*.[jt]s', workPath);
   const installedPaths = new Set<string>();
@@ -415,7 +408,6 @@ export async function build({
     }
 
     await buildEntrypoint({
-      vercelConfig,
       workPath,
       entrypoint,
       config,
@@ -425,13 +417,11 @@ export async function build({
 }
 
 export async function buildEntrypoint({
-  vercelConfig,
   workPath,
   entrypoint,
   config,
   installedPaths,
 }: {
-  vercelConfig: VercelConfig;
   workPath: string;
   entrypoint: string;
   config: FunctionConfig;
@@ -561,7 +551,7 @@ export async function buildEntrypoint({
       runtime: nodeVersion.runtime,
     },
   };
-  await updateFunctionsManifest({ vercelConfig, workPath, pages });
+  await updateFunctionsManifest({ workPath, pages });
 
   // Update the `routes-mainifest.json` file with the wildcard route
   // when the entrypoint is dynamic (i.e. `/api/[id].ts`).

packages/plugin-node/test/build.test.ts

@@ -143,16 +143,7 @@ function withFixture<T>(
       await runNpmInstall(fixture);
     }
 
-    let vercelConfig = {};
-    try {
-      vercelConfig = JSON.parse(
-        await fsp.readFile(path.join(fixture, 'vercel.json'), 'utf8')
-      );
-    } catch (e) {
-      // Consume error
-    }
-
-    await build({ vercelConfig, workPath: fixture });
+    await build({ workPath: fixture });
 
     try {
       return await t({ fixture, fetch });

packages/plugin-python/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "vercel-plugin-python",
-  "version": "1.0.0-canary.11",
+  "version": "1.0.0-canary.13",
   "main": "dist/index.js",
   "license": "MIT",
   "files": [
@@ -17,8 +17,8 @@
     "prepublishOnly": "tsc"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.12.3-canary.25",
-    "@vercel/python": "2.1.2-canary.0"
+    "@vercel/build-utils": "2.12.3-canary.27",
+    "@vercel/python": "2.1.2-canary.1"
   },
   "devDependencies": {
     "@types/node": "*",

packages/plugin-ruby/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "vercel-plugin-ruby",
-  "version": "1.0.0-canary.9",
+  "version": "1.0.0-canary.11",
   "main": "dist/index.js",
   "license": "MIT",
   "files": [
@@ -17,8 +17,8 @@
     "prepublishOnly": "tsc"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.12.3-canary.25",
-    "@vercel/ruby": "1.2.8-canary.4"
+    "@vercel/build-utils": "2.12.3-canary.27",
+    "@vercel/ruby": "1.2.8-canary.5"
   },
   "devDependencies": {
     "@types/node": "*",

packages/python/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/python",
-  "version": "2.1.2-canary.0",
+  "version": "2.1.2-canary.1",
   "main": "./dist/index.js",
   "license": "MIT",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",

packages/python/src/install.ts

@@ -1,3 +1,4 @@
+import { relative, basename } from 'path';
 import execa from 'execa';
 import { Meta, debug } from '@vercel/build-utils';
 
@@ -135,6 +136,18 @@ export async function installRequirementsFile({
   meta,
   args = [],
 }: InstallRequirementsFileArg) {
+  const fileAtRoot = relative(workPath, filePath) === basename(filePath);
+
+  // If the `requirements.txt` file is located in the Root Directory of the project and
+  // the new File System API is used (`avoidTopLevelInstall`), the Install Command
+  // will have already installed its dependencies, so we don't need to do it again.
+  if (meta.avoidTopLevelInstall && fileAtRoot) {
+    debug(
+      `Skipping requirements file installation, already installed by Install Command`
+    );
+    return;
+  }
+
   if (
     meta.isDev &&
     (await areRequirementsInstalled(pythonPath, filePath, workPath))

packages/ruby/index.ts

@@ -1,4 +1,4 @@
-import { join, dirname } from 'path';
+import { join, dirname, relative } from 'path';
 import execa from 'execa';
 import {
   ensureDir,
@@ -85,10 +85,12 @@ export async function build({
 }: BuildOptions) {
   await download(files, workPath, meta);
   const entrypointFsDirname = join(workPath, dirname(entrypoint));
+  const gemfileName = 'Gemfile';
+
   const gemfilePath = await walkParentDirs({
     base: workPath,
     start: entrypointFsDirname,
-    filename: 'Gemfile',
+    filename: gemfileName,
   });
   const gemfileContents = gemfilePath
     ? await readFile(gemfilePath, 'utf8')
@@ -130,15 +132,24 @@ export async function build({
         'did not find a vendor directory but found a Gemfile, bundling gems...'
       );
 
-      // try installing. this won't work if native extesions are required.
-      // if that's the case, gems should be vendored locally before deploying.
-      try {
-        await bundleInstall(bundlerPath, bundleDir, gemfilePath);
-      } catch (err) {
-        debug(
-          'unable to build gems from Gemfile. vendor the gems locally with "bundle install --deployment" and retry.'
-        );
-        throw err;
+      const fileAtRoot = relative(workPath, gemfilePath) === gemfileName;
+
+      // If the `Gemfile` is located in the Root Directory of the project and
+      // the new File System API is used (`avoidTopLevelInstall`), the Install Command
+      // will have already installed its dependencies, so we don't need to do it again.
+      if (meta.avoidTopLevelInstall && fileAtRoot) {
+        debug('Skipping `bundle install` — already handled by Install Command');
+      } else {
+        // try installing. this won't work if native extesions are required.
+        // if that's the case, gems should be vendored locally before deploying.
+        try {
+          await bundleInstall(bundlerPath, bundleDir, gemfilePath);
+        } catch (err) {
+          debug(
+            'unable to build gems from Gemfile. vendor the gems locally with "bundle install --deployment" and retry.'
+          );
+          throw err;
+        }
       }
     }
   } else {

packages/ruby/install-ruby.ts

@@ -61,6 +61,14 @@ function getRubyPath(meta: Meta, gemfileContents: string) {
 // process.env.GEM_HOME), and returns
 // the absolute path to it
 export async function installBundler(meta: Meta, gemfileContents: string) {
+  // If the new File System API is used (`avoidTopLevelInstall`), the Install Command
+  // will have already installed the dependencies, so we don't need to do it again.
+  if (meta.avoidTopLevelInstall) {
+    debug(
+      `Skipping bundler installation, already installed by Install Command`
+    );
+  }
+
   const { gemHome, rubyPath, gemPath, vendorPath, runtime } = getRubyPath(
     meta,
     gemfileContents

packages/ruby/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vercel/ruby",
   "author": "Nathan Cahill <nathan@nathancahill.com>",
-  "version": "1.2.8-canary.4",
+  "version": "1.2.8-canary.5",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/ruby",