Publish Canary

- @vercel/build-utils@2.12.3-canary.32
 - vercel@23.1.3-canary.53
 - @vercel/client@10.2.3-canary.33
 - vercel-plugin-go@1.0.0-canary.20
 - vercel-plugin-node@1.12.2-canary.24
 - vercel-plugin-python@1.0.0-canary.21
 - vercel-plugin-ruby@1.0.0-canary.19

packages/build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.12.3-canary.29",
+  "version": "2.12.3-canary.32",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",

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

@@ -1,5 +1,5 @@
 import fs from 'fs-extra';
-import { join, dirname, relative } from 'path';
+import { join, dirname, parse, relative } from 'path';
 import glob from './fs/glob';
 import { normalizePath } from './fs/normalize-path';
 import { FILES_SYMBOL, Lambda } from './lambda';
@@ -29,6 +29,25 @@ const shouldIgnorePath = (
   return isNative || ignoreFilter(file);
 };
 
+const getSourceFiles = async (workPath: string, ignoreFilter: any) => {
+  const list = await glob('**', {
+    cwd: workPath,
+  });
+
+  // We're not passing this as an `ignore` filter to the `glob` function above,
+  // so that we can re-use exactly the same `getIgnoreFilter` method that the
+  // Build Step uses (literally the same code). Note that this exclusion only applies
+  // when deploying. Locally, another exclusion is needed, which is handled
+  // further below in the `convertRuntimeToPlugin` function.
+  for (const file in list) {
+    if (shouldIgnorePath(file, ignoreFilter, true)) {
+      delete list[file];
+    }
+  }
+
+  return list;
+};
+
 /**
  * Convert legacy Runtime to a Plugin.
  * @param buildRuntime - a legacy build() function from a Runtime
@@ -42,25 +61,30 @@ export function convertRuntimeToPlugin(
 ) {
   // This `build()` signature should match `plugin.build()` signature in `vercel build`.
   return async function build({ workPath }: { workPath: string }) {
-    const opts = { cwd: workPath };
-    const files = await glob('**', opts);
-
     // We also don't want to provide any files to Runtimes that were ignored
     // through `.vercelignore` or `.nowignore`, because the Build Step does the same.
     const ignoreFilter = await getIgnoreFilter(workPath);
 
-    // We're not passing this as an `ignore` filter to the `glob` function above,
-    // so that we can re-use exactly the same `getIgnoreFilter` method that the
-    // Build Step uses (literally the same code). Note that this exclusion only applies
-    // when deploying. Locally, another exclusion further below is needed.
-    for (const file in files) {
-      if (shouldIgnorePath(file, ignoreFilter, true)) {
-        delete files[file];
+    // Retrieve the files that are currently available on the File System,
+    // before the Legacy Runtime has even started to build.
+    const sourceFilesPreBuild = await getSourceFiles(workPath, ignoreFilter);
+
+    // Instead of doing another `glob` to get all the matching source files,
+    // we'll filter the list of existing files down to only the ones
+    // that are matching the entrypoint pattern, so we're first creating
+    // a clean new list to begin.
+    const entrypoints = Object.assign({}, sourceFilesPreBuild);
+
+    const entrypointMatch = new RegExp(`^api/.*${ext}$`);
+
+    // Up next, we'll strip out the files from the list of entrypoints
+    // that aren't actually considered entrypoints.
+    for (const file in entrypoints) {
+      if (!entrypointMatch.test(file)) {
+        delete entrypoints[file];
       }
     }
 
-    const entrypointPattern = `api/**/*${ext}`;
-    const entrypoints = await glob(entrypointPattern, opts);
     const pages: { [key: string]: any } = {};
     const pluginName = packageName.replace('vercel-plugin-', '');
 
@@ -79,7 +103,7 @@ export function convertRuntimeToPlugin(
 
     for (const entrypoint of Object.keys(entrypoints)) {
       const { output } = await buildRuntime({
-        files,
+        files: sourceFilesPreBuild,
         entrypoint,
         workPath,
         config: {
@@ -90,8 +114,28 @@ export function convertRuntimeToPlugin(
         },
       });
 
+      // Legacy Runtimes tend to pollute the `workPath` with compiled results,
+      // because the `workPath` used to be a place that was a place where they could
+      // just put anything, but nowadays it's the working directory of the `vercel build`
+      // command, which is the place where the developer keeps their source files,
+      // so we don't want to pollute this space unnecessarily. That means we have to clean
+      // up files that were created by the build, which is done further below.
+      const sourceFilesAfterBuild = await getSourceFiles(
+        workPath,
+        ignoreFilter
+      );
+
+      // Further down, we will need the filename of the Lambda handler
+      // for placing it inside `server/pages/api`, but because Legacy Runtimes
+      // don't expose the filename directly, we have to construct it
+      // from the handler name, and then find the matching file further below,
+      // because we don't yet know its extension here.
+      const handler = output.handler;
+      const handlerMethod = handler.split('.').reverse()[0];
+      const handlerFileName = handler.replace(`.${handlerMethod}`, '');
+
       pages[entrypoint] = {
-        handler: output.handler,
+        handler: handler,
         runtime: output.runtime,
         memory: output.memory,
         maxDuration: output.maxDuration,
@@ -108,13 +152,39 @@ export function convertRuntimeToPlugin(
       // to the outputs that they are returning instead.
       for (const file in lambdaFiles) {
         if (shouldIgnorePath(file, ignoreFilter, false)) {
-          delete files[file];
+          delete lambdaFiles[file];
         }
       }
 
+      const handlerFilePath = Object.keys(lambdaFiles).find(item => {
+        return parse(item).name === handlerFileName;
+      });
+
+      const handlerFileOrigin = lambdaFiles[handlerFilePath || ''].fsPath;
+
+      if (!handlerFileOrigin) {
+        throw new Error(
+          `Could not find a handler file. Please ensure that the list of \`files\` defined for the returned \`Lambda\` contains a file with the name ${handlerFileName} (+ any extension).`
+        );
+      }
+
       const entry = join(workPath, '.output', 'server', 'pages', entrypoint);
+
       await fs.ensureDir(dirname(entry));
-      await linkOrCopy(files[entrypoint].fsPath, entry);
+      await linkOrCopy(handlerFileOrigin, entry);
+
+      const toRemove = [];
+
+      // You can find more details about this at the point where the
+      // `sourceFilesAfterBuild` is created originally.
+      for (const file in sourceFilesAfterBuild) {
+        if (!sourceFilesPreBuild[file]) {
+          const path = sourceFilesAfterBuild[file].fsPath;
+          toRemove.push(fs.remove(path));
+        }
+      }
+
+      await Promise.all(toRemove);
 
       const tracedFiles: {
         absolutePath: string;
@@ -123,7 +193,14 @@ export function convertRuntimeToPlugin(
 
       Object.entries(lambdaFiles).forEach(async ([relPath, file]) => {
         const newPath = join(traceDir, relPath);
+
+        // The handler was already moved into position above.
+        if (relPath === handlerFilePath) {
+          return;
+        }
+
         tracedFiles.push({ absolutePath: newPath, relativePath: relPath });
+
         if (file.fsPath) {
           await linkOrCopy(file.fsPath, newPath);
         } else if (file.type === 'FileBlob') {
@@ -141,11 +218,12 @@ export function convertRuntimeToPlugin(
         'pages',
         `${entrypoint}.nft.json`
       );
+
       const json = JSON.stringify({
         version: 1,
-        files: tracedFiles.map(f => ({
-          input: normalizePath(relative(nft, f.absolutePath)),
-          output: normalizePath(f.relativePath),
+        files: tracedFiles.map(file => ({
+          input: normalizePath(relative(dirname(nft), file.absolutePath)),
+          output: normalizePath(file.relativePath),
         })),
       });
 

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

@@ -1,6 +1,6 @@
 import { join } from 'path';
 import fs from 'fs-extra';
-import { BuildOptions, createLambda } from '../src';
+import { BuildOptions, createLambda, FileFsRef } from '../src';
 import { convertRuntimeToPlugin } from '../src/convert-runtime-to-plugin';
 
 async function fsToJson(dir: string, output: Record<string, any> = {}) {
@@ -32,9 +32,13 @@ describe('convert-runtime-to-plugin', () => {
   });
 
   it('should create correct fileystem for python', async () => {
+    const ext = '.py';
     const workPath = pythonApiWorkpath;
+    const handlerName = 'vc__handler__python';
+    const handlerFileName = handlerName + ext;
+
     const lambdaOptions = {
-      handler: 'index.handler',
+      handler: `${handlerName}.vc_handler`,
       runtime: 'python3.9',
       memory: 512,
       maxDuration: 5,
@@ -42,6 +46,15 @@ describe('convert-runtime-to-plugin', () => {
     };
 
     const buildRuntime = async (opts: BuildOptions) => {
+      const handlerPath = join(workPath, handlerFileName);
+
+      // This is the usual time at which a Legacy Runtime writes its Lambda launcher.
+      await fs.writeFile(handlerPath, '# handler');
+
+      opts.files[handlerFileName] = new FileFsRef({
+        fsPath: handlerPath,
+      });
+
       const lambda = await createLambda({
         files: opts.files,
         ...lambdaOptions,
@@ -50,9 +63,6 @@ describe('convert-runtime-to-plugin', () => {
     };
 
     const lambdaFiles = await fsToJson(workPath);
-    delete lambdaFiles['vercel.json'];
-
-    const ext = '.py';
     const packageName = 'vercel-plugin-python';
     const build = await convertRuntimeToPlugin(buildRuntime, packageName, ext);
 
@@ -60,6 +70,9 @@ describe('convert-runtime-to-plugin', () => {
 
     const output = await fsToJson(join(workPath, '.output'));
 
+    delete lambdaFiles['vercel.json'];
+    delete lambdaFiles['vc__handler__python.py'];
+
     expect(output).toMatchObject({
       'functions-manifest.json': expect.stringContaining('{'),
       inputs: {
@@ -68,12 +81,12 @@ describe('convert-runtime-to-plugin', () => {
       server: {
         pages: {
           api: {
-            'index.py': expect.stringContaining('index'),
+            'index.py': expect.stringContaining('handler'),
             'index.py.nft.json': expect.stringContaining('{'),
             users: {
-              'get.py': expect.stringContaining('get'),
+              'get.py': expect.stringContaining('handler'),
               'get.py.nft.json': expect.stringContaining('{'),
-              'post.py': expect.stringContaining('post'),
+              'post.py': expect.stringContaining('handler'),
               'post.py.nft.json': expect.stringContaining('{'),
             },
           },
@@ -93,6 +106,47 @@ describe('convert-runtime-to-plugin', () => {
 
     const indexJson = JSON.parse(output.server.pages.api['index.py.nft.json']);
     expect(indexJson).toMatchObject({
+      version: 1,
+      files: [
+        {
+          input: `../../../inputs/api-routes-python/api/db/[id].py`,
+          output: 'api/db/[id].py',
+        },
+        {
+          input: `../../../inputs/api-routes-python/api/index.py`,
+          output: 'api/index.py',
+        },
+        {
+          input: `../../../inputs/api-routes-python/api/project/[aid]/[bid]/index.py`,
+          output: 'api/project/[aid]/[bid]/index.py',
+        },
+        {
+          input: `../../../inputs/api-routes-python/api/users/get.py`,
+          output: 'api/users/get.py',
+        },
+        {
+          input: `../../../inputs/api-routes-python/api/users/post.py`,
+          output: 'api/users/post.py',
+        },
+        {
+          input: `../../../inputs/api-routes-python/file.txt`,
+          output: 'file.txt',
+        },
+        {
+          input: `../../../inputs/api-routes-python/util/date.py`,
+          output: 'util/date.py',
+        },
+        {
+          input: `../../../inputs/api-routes-python/util/math.py`,
+          output: 'util/math.py',
+        },
+      ],
+    });
+
+    const getJson = JSON.parse(
+      output.server.pages.api.users['get.py.nft.json']
+    );
+    expect(getJson).toMatchObject({
       version: 1,
       files: [
         {
@@ -130,47 +184,6 @@ describe('convert-runtime-to-plugin', () => {
       ],
     });
 
-    const getJson = JSON.parse(
-      output.server.pages.api.users['get.py.nft.json']
-    );
-    expect(getJson).toMatchObject({
-      version: 1,
-      files: [
-        {
-          input: `../../../../../inputs/api-routes-python/api/db/[id].py`,
-          output: 'api/db/[id].py',
-        },
-        {
-          input: `../../../../../inputs/api-routes-python/api/index.py`,
-          output: 'api/index.py',
-        },
-        {
-          input: `../../../../../inputs/api-routes-python/api/project/[aid]/[bid]/index.py`,
-          output: 'api/project/[aid]/[bid]/index.py',
-        },
-        {
-          input: `../../../../../inputs/api-routes-python/api/users/get.py`,
-          output: 'api/users/get.py',
-        },
-        {
-          input: `../../../../../inputs/api-routes-python/api/users/post.py`,
-          output: 'api/users/post.py',
-        },
-        {
-          input: `../../../../../inputs/api-routes-python/file.txt`,
-          output: 'file.txt',
-        },
-        {
-          input: `../../../../../inputs/api-routes-python/util/date.py`,
-          output: 'util/date.py',
-        },
-        {
-          input: `../../../../../inputs/api-routes-python/util/math.py`,
-          output: 'util/math.py',
-        },
-      ],
-    });
-
     const postJson = JSON.parse(
       output.server.pages.api.users['post.py.nft.json']
     );
@@ -178,35 +191,35 @@ describe('convert-runtime-to-plugin', () => {
       version: 1,
       files: [
         {
-          input: `../../../../../inputs/api-routes-python/api/db/[id].py`,
+          input: `../../../../inputs/api-routes-python/api/db/[id].py`,
           output: 'api/db/[id].py',
         },
         {
-          input: `../../../../../inputs/api-routes-python/api/index.py`,
+          input: `../../../../inputs/api-routes-python/api/index.py`,
           output: 'api/index.py',
         },
         {
-          input: `../../../../../inputs/api-routes-python/api/project/[aid]/[bid]/index.py`,
+          input: `../../../../inputs/api-routes-python/api/project/[aid]/[bid]/index.py`,
           output: 'api/project/[aid]/[bid]/index.py',
         },
         {
-          input: `../../../../../inputs/api-routes-python/api/users/get.py`,
+          input: `../../../../inputs/api-routes-python/api/users/get.py`,
           output: 'api/users/get.py',
         },
         {
-          input: `../../../../../inputs/api-routes-python/api/users/post.py`,
+          input: `../../../../inputs/api-routes-python/api/users/post.py`,
           output: 'api/users/post.py',
         },
         {
-          input: `../../../../../inputs/api-routes-python/file.txt`,
+          input: `../../../../inputs/api-routes-python/file.txt`,
           output: 'file.txt',
         },
         {
-          input: `../../../../../inputs/api-routes-python/util/date.py`,
+          input: `../../../../inputs/api-routes-python/util/date.py`,
           output: 'util/date.py',
         },
         {
-          input: `../../../../../inputs/api-routes-python/util/math.py`,
+          input: `../../../../inputs/api-routes-python/util/math.py`,
           output: 'util/math.py',
         },
       ],

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "23.1.3-canary.50",
+  "version": "23.1.3-canary.53",
   "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.29",
+    "@vercel/build-utils": "2.12.3-canary.32",
     "@vercel/go": "1.2.4-canary.4",
     "@vercel/node": "1.12.2-canary.7",
     "@vercel/python": "2.1.2-canary.1",
     "@vercel/ruby": "1.2.8-canary.6",
     "update-notifier": "4.1.0",
     "vercel-plugin-middleware": "0.0.0-canary.7",
-    "vercel-plugin-node": "1.12.2-canary.21"
+    "vercel-plugin-node": "1.12.2-canary.24"
   },
   "devDependencies": {
     "@next/env": "11.1.2",

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/client",
-  "version": "10.2.3-canary.30",
+  "version": "10.2.3-canary.33",
   "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.29",
+    "@vercel/build-utils": "2.12.3-canary.32",
     "@zeit/fetch": "5.2.0",
     "async-retry": "1.2.3",
     "async-sema": "3.0.0",

packages/plugin-go/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "vercel-plugin-go",
-  "version": "1.0.0-canary.17",
+  "version": "1.0.0-canary.20",
   "main": "dist/index.js",
   "license": "MIT",
   "files": [
@@ -17,7 +17,7 @@
     "prepublishOnly": "tsc"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.12.3-canary.29",
+    "@vercel/build-utils": "2.12.3-canary.32",
     "@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.21",
+  "version": "1.12.2-canary.24",
   "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.29",
+    "@vercel/build-utils": "2.12.3-canary.32",
     "@vercel/fun": "1.0.3",
     "@vercel/ncc": "0.24.0",
     "@vercel/nft": "0.14.0",

packages/plugin-python/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "vercel-plugin-python",
-  "version": "1.0.0-canary.18",
+  "version": "1.0.0-canary.21",
   "main": "dist/index.js",
   "license": "MIT",
   "files": [
@@ -17,7 +17,7 @@
     "prepublishOnly": "tsc"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.12.3-canary.29",
+    "@vercel/build-utils": "2.12.3-canary.32",
     "@vercel/python": "2.1.2-canary.1"
   },
   "devDependencies": {

packages/plugin-ruby/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "vercel-plugin-ruby",
-  "version": "1.0.0-canary.16",
+  "version": "1.0.0-canary.19",
   "main": "dist/index.js",
   "license": "MIT",
   "files": [
@@ -17,7 +17,7 @@
     "prepublishOnly": "tsc"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.12.3-canary.29",
+    "@vercel/build-utils": "2.12.3-canary.32",
     "@vercel/ruby": "1.2.8-canary.6"
   },
   "devDependencies": {