Publish Canary

- vercel-plugin-go@1.0.0-canary.14
 - vercel-plugin-python@1.0.0-canary.15
 - vercel-plugin-ruby@1.0.0-canary.13

.github/CODEOWNERS

@@ -4,26 +4,24 @@
 *                                        @TooTallNate
 /.github/workflows                       @AndyBitz @styfle
 /packages/frameworks                     @AndyBitz
-/packages/cli/src/commands/build         @TooTallNate @styfle @AndyBitz @gdborton @jaredpalmer
-/packages/cli/src/commands/dev           @TooTallNate @styfle @AndyBitz
-/packages/cli/src/util/dev               @TooTallNate @styfle @AndyBitz
-/packages/cli/src/commands/domains       @javivelasco @mglagola @anatrajkovska
-/packages/cli/src/commands/certs         @javivelasco @mglagola @anatrajkovska
-/packages/cli/src/commands/env           @styfle @lucleray
-/packages/client                         @styfle @TooTallNate
-/packages/build-utils                    @styfle @AndyBitz @TooTallNate
-/packages/middleware                     @gdborton @javivelasco
-/packages/node                           @styfle @TooTallNate @lucleray
-/packages/node-bridge                    @styfle @TooTallNate @lucleray
-/packages/next                           @Timer @ijjk
-/packages/go                             @styfle @TooTallNate
-/packages/python                         @styfle @TooTallNate
-/packages/ruby                           @styfle @TooTallNate
-/packages/static-build                   @styfle @AndyBitz
-/packages/routing-utils                  @styfle @dav-is @ijjk
-/examples                                @mcsdevv
+/packages/cli/src/commands/dev       @TooTallNate @styfle @AndyBitz
+/packages/cli/src/util/dev           @TooTallNate @styfle @AndyBitz
+/packages/cli/src/commands/domains   @javivelasco @mglagola @anatrajkovska
+/packages/cli/src/commands/certs     @javivelasco @mglagola @anatrajkovska
+/packages/cli/src/commands/env       @styfle @lucleray
+/packages/client                     @rdev @styfle @TooTallNate
+/packages/build-utils                @styfle @AndyBitz @TooTallNate
+/packages/node                       @styfle @TooTallNate @lucleray
+/packages/node-bridge                @styfle @TooTallNate @lucleray
+/packages/next                       @Timer @ijjk
+/packages/go                         @styfle @TooTallNate
+/packages/python                     @styfle @TooTallNate
+/packages/ruby                       @styfle @coetry @TooTallNate
+/packages/static-build               @styfle @AndyBitz
+/packages/routing-utils              @styfle @dav-is @ijjk
+/examples                                @mcsdevv @timothyis
 /examples/create-react-app               @Timer
 /examples/nextjs                         @timneutkens @Timer
-/examples/hugo                           @mcsdevv @styfle
-/examples/jekyll                         @mcsdevv @styfle
-/examples/zola                           @mcsdevv @styfle
+/examples/hugo                           @mcsdevv @timothyis @styfle
+/examples/jekyll                         @mcsdevv @timothyis @styfle
+/examples/zola                           @mcsdevv @timothyis @styfle

api/package.json

@@ -5,7 +5,7 @@
   "description": "API for the vercel/vercel repo",
   "main": "index.js",
   "scripts": {
-    "vercel-build": "node ../utils/run.js build all"
+    "vercel-build": "yarn --cwd .. && node ../utils/run.js build all"
   },
   "dependencies": {
     "@sentry/node": "5.11.1",

packages/build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.12.3-canary.40",
+  "version": "2.12.3-canary.28",
   "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.17",
+    "@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

@@ -1,51 +1,11 @@
 import fs from 'fs-extra';
-import { join, parse, relative, dirname, basename, extname } from 'path';
+import { join, dirname, relative } from 'path';
 import glob from './fs/glob';
 import { normalizePath } from './fs/normalize-path';
 import { FILES_SYMBOL, Lambda } from './lambda';
+import type FileBlob from './file-blob';
 import type { BuildOptions, Files } from './types';
-import { debug, getIgnoreFilter } from '.';
-
-// `.output` was already created by the Build Command, so we have
-// to ensure its contents don't get bundled into the Lambda. Similarily,
-// we don't want to bundle anything from `.vercel` either. Lastly,
-// Builders/Runtimes didn't have `vercel.json` or `now.json`.
-const ignoredPaths = ['.output', '.vercel', 'vercel.json', 'now.json'];
-
-const shouldIgnorePath = (
-  file: string,
-  ignoreFilter: any,
-  ignoreFile: boolean
-) => {
-  const isNative = ignoredPaths.some(item => {
-    return file.startsWith(item);
-  });
-
-  if (!ignoreFile) {
-    return isNative;
-  }
-
-  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;
-};
+import { getIgnoreFilter } from '.';
 
 /**
  * Convert legacy Runtime to a Plugin.
@@ -60,36 +20,40 @@ 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);
+
+    // `.output` was already created by the Build Command, so we have
+    // to ensure its contents don't get bundled into the Lambda. Similarily,
+    // we don't want to bundle anything from `.vercel` either. Lastly,
+    // Builders/Runtimes didn't have `vercel.json` or `now.json`.
+    const ignoredPaths = ['.output', '.vercel', 'vercel.json', 'now.json'];
+
     // 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);
 
-    // 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);
+    // 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).
+    for (const file in files) {
+      const isNative = ignoredPaths.some(item => {
+        return file.startsWith(item);
+      });
 
-    // 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];
+      if (isNative || ignoreFilter(file)) {
+        delete files[file];
       }
     }
 
+    const entrypointPattern = `api/**/*${ext}`;
+    const entrypoints = await glob(entrypointPattern, opts);
     const pages: { [key: string]: any } = {};
     const pluginName = packageName.replace('vercel-plugin-', '');
-    const outputPath = join(workPath, '.output');
 
     const traceDir = join(
-      outputPath,
+      workPath,
+      `.output`,
       `inputs`,
       // Legacy Runtimes can only provide API Routes, so that's
       // why we can use this prefix for all of them. Here, we have to
@@ -100,13 +64,9 @@ export function convertRuntimeToPlugin(
 
     await fs.ensureDir(traceDir);
 
-    let newPathsRuntime: Set<string> = new Set();
-
-    const entryRoot = join(outputPath, 'server', 'pages');
-
     for (const entrypoint of Object.keys(entrypoints)) {
       const { output } = await buildRuntime({
-        files: sourceFilesPreBuild,
+        files,
         entrypoint,
         workPath,
         config: {
@@ -114,260 +74,76 @@ export function convertRuntimeToPlugin(
         },
         meta: {
           avoidTopLevelInstall: true,
-          skipDownload: true,
         },
       });
 
-      // 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
-      );
-
-      // @ts-ignore This symbol is a private API
-      const lambdaFiles: Files = output[FILES_SYMBOL];
-
-      // When deploying, the `files` that are passed to the Legacy Runtimes already
-      // have certain files that are ignored stripped, but locally, that list of
-      // files isn't used by the Legacy Runtimes, so we need to apply the filters
-      // to the outputs that they are returning instead.
-      for (const file in lambdaFiles) {
-        if (shouldIgnorePath(file, ignoreFilter, false)) {
-          delete lambdaFiles[file];
-        }
-      }
-
-      let handlerFileBase = output.handler;
-      let handlerFile = lambdaFiles[handlerFileBase];
-      let handlerHasImport = false;
-
-      const { handler } = output;
-      const handlerMethod = handler.split('.').pop();
-      const handlerFileName = handler.replace(`.${handlerMethod}`, '');
-
-      // For compiled languages, the launcher file for the Lambda generated
-      // by the Legacy Runtime matches the `handler` defined for it, but for
-      // interpreted languages, the `handler` consists of the launcher file name
-      // without an extension, plus the name of the method inside of that file
-      // that should be invoked, so we have to construct the file path explicitly.
-      if (!handlerFile) {
-        handlerFileBase = handlerFileName + ext;
-        handlerFile = lambdaFiles[handlerFileBase];
-        handlerHasImport = true;
-      }
-
-      if (!handlerFile || !handlerFile.fsPath) {
-        throw new Error(
-          `Could not find a handler file. Please ensure that \`files\` for the returned \`Lambda\` contains an \`FileFsRef\` named "${handlerFileBase}" with a valid \`fsPath\`.`
-        );
-      }
-
-      const handlerExtName = extname(handlerFile.fsPath);
-
-      const entryBase = basename(entrypoint).replace(ext, handlerExtName);
-      const entryPath = join(dirname(entrypoint), entryBase);
-      const entry = join(entryRoot, entryPath);
-
-      // We never want to link here, only copy, because the launcher
-      // file often has the same name for every entrypoint, which means that
-      // every build for every entrypoint overwrites the launcher of the previous
-      // one, so linking would end with a broken reference.
-      await fs.ensureDir(dirname(entry));
-      await fs.copy(handlerFile.fsPath, entry);
-
-      // For compiled languages, the launcher file will be binary and therefore
-      // won't try to import a user-provided request handler (instead, it will
-      // contain it). But for interpreted languages, the launcher might try to
-      // load a user-provided request handler from the source file instead of bundling
-      // it, so we have to adjust the import statement inside the launcher to point
-      // to the respective source file. Previously, Legacy Runtimes simply expected
-      // the user-provided request-handler to be copied right next to the launcher,
-      // but with the new File System API, files won't be moved around unnecessarily.
-      if (handlerHasImport) {
-        const { fsPath } = handlerFile;
-        const encoding = 'utf-8';
-
-        // This is the true directory of the user-provided request handler in the
-        // source files, so that's what we will use as an import path in the launcher.
-        const locationPrefix = relative(entry, outputPath);
-
-        let handlerContent = await fs.readFile(fsPath, encoding);
-
-        const importPaths = [
-          // This is the full entrypoint path, like `./api/test.py`
-          `./${entrypoint}`,
-          // This is the entrypoint path without extension, like `api/test`
-          entrypoint.slice(0, -ext.length),
-        ];
-
-        // Generate a list of regular expressions that we can use for
-        // finding matches, but only allow matches if the import path is
-        // wrapped inside single (') or double quotes (").
-        const patterns = importPaths.map(path => {
-          // eslint-disable-next-line no-useless-escape
-          return new RegExp(`('|")(${path.replace(/\./g, '\\.')})('|")`, 'g');
-        });
-
-        let replacedMatch = null;
-
-        for (const pattern of patterns) {
-          const newContent = handlerContent.replace(
-            pattern,
-            (_, p1, p2, p3) => {
-              return `${p1}${join(locationPrefix, p2)}${p3}`;
-            }
-          );
-
-          if (newContent !== handlerContent) {
-            debug(
-              `Replaced "${pattern}" inside "${entry}" to ensure correct import of user-provided request handler`
-            );
-
-            handlerContent = newContent;
-            replacedMatch = true;
-          }
-        }
-
-        if (!replacedMatch) {
-          new Error(
-            `No replacable matches for "${importPaths[0]}" or "${importPaths[1]}" found in "${fsPath}"`
-          );
-        }
-
-        await fs.writeFile(entry, handlerContent, encoding);
-      } else {
-        await fs.copy(handlerFile.fsPath, entry);
-      }
-
-      const newFilesEntrypoint: Array<string> = [];
-      const newDirectoriesEntrypoint: Array<string> = [];
-
-      const preBuildFiles = Object.values(sourceFilesPreBuild).map(file => {
-        return file.fsPath;
-      });
-
-      // Generate a list of directories and files that weren't present
-      // before the entrypoint was processed by the Legacy Runtime, so
-      // that we can perform a cleanup later. We need to divide into files
-      // and directories because only cleaning up files might leave empty
-      // directories, and listing directories separately also speeds up the
-      // build because we can just delete them, which wipes all of their nested
-      // paths, instead of iterating through all files that should be deleted.
-      for (const file in sourceFilesAfterBuild) {
-        if (!sourceFilesPreBuild[file]) {
-          const path = sourceFilesAfterBuild[file].fsPath;
-          const dirPath = dirname(path);
-
-          // If none of the files that were present before the entrypoint
-          // was processed are contained within the directory we're looking
-          // at right now, then we know it's a newly added directory
-          // and it can therefore be removed later on.
-          const isNewDir = !preBuildFiles.some(filePath => {
-            return dirname(filePath).startsWith(dirPath);
-          });
-
-          // Check out the list of tracked directories that were
-          // newly added and see if one of them contains the path
-          // we're looking at.
-          const hasParentDir = newDirectoriesEntrypoint.some(dir => {
-            return path.startsWith(dir);
-          });
-
-          // If we have already tracked a directory that was newly
-          // added that sits above the file or directory that we're
-          // looking at, we don't need to add more entries to the list
-          // because when the parent will get removed in the future,
-          // all of its children (and therefore the path we're looking at)
-          // will automatically get removed anyways.
-          if (hasParentDir) {
-            continue;
-          }
-
-          if (isNewDir) {
-            newDirectoriesEntrypoint.push(dirPath);
-          } else {
-            newFilesEntrypoint.push(path);
-          }
-        }
-      }
-
-      const nft = `${entry}.nft.json`;
-
-      const json = JSON.stringify({
-        version: 2,
-        files: Object.keys(lambdaFiles)
-          .map(file => {
-            const { fsPath } = lambdaFiles[file];
-
-            if (!fsPath) {
-              throw new Error(
-                `File "${file}" is missing valid \`fsPath\` property`
-              );
-            }
-
-            // The handler was already moved into position above.
-            if (file === handlerFileBase) {
-              return;
-            }
-
-            return normalizePath(relative(dirname(nft), fsPath));
-          })
-          .filter(Boolean),
-      });
-
-      await fs.ensureDir(dirname(nft));
-      await fs.writeFile(nft, json);
-
-      // Extend the list of directories and files that were created by the
-      // Legacy Runtime with the list of directories and files that were
-      // created for the entrypoint that was just processed above.
-      newPathsRuntime = new Set([
-        ...newPathsRuntime,
-        ...newFilesEntrypoint,
-        ...newDirectoriesEntrypoint,
-      ]);
-
-      // Add an entry that will later on be added to the `functions-manifest.json`
-      // file that is placed inside of the `.output` directory.
-      pages[normalizePath(entryPath)] = {
-        // Because the underlying file used as a handler was placed
-        // inside `.output/server/pages/api`, it no longer has the name it originally
-        // had and is now named after the API Route that it's responsible for,
-        // so we have to adjust the name of the Lambda handler accordingly.
-        handler: handler.replace(handlerFileName, parse(entry).name),
+      pages[entrypoint] = {
+        handler: output.handler,
         runtime: output.runtime,
         memory: output.memory,
         maxDuration: output.maxDuration,
         environment: output.environment,
         allowQuery: output.allowQuery,
       };
+
+      // @ts-ignore This symbol is a private API
+      const lambdaFiles: Files = output[FILES_SYMBOL];
+
+      const entry = join(workPath, '.output', 'server', 'pages', entrypoint);
+      await fs.ensureDir(dirname(entry));
+      await linkOrCopy(files[entrypoint].fsPath, entry);
+
+      const tracedFiles: {
+        absolutePath: string;
+        relativePath: string;
+      }[] = [];
+
+      Object.entries(lambdaFiles).forEach(async ([relPath, file]) => {
+        const newPath = join(traceDir, relPath);
+        tracedFiles.push({ absolutePath: newPath, relativePath: relPath });
+        if (file.fsPath) {
+          await linkOrCopy(file.fsPath, newPath);
+        } else if (file.type === 'FileBlob') {
+          const { data, mode } = file as FileBlob;
+          await fs.writeFile(newPath, data, { mode });
+        } else {
+          throw new Error(`Unknown file type: ${file.type}`);
+        }
+      });
+
+      const nft = join(
+        workPath,
+        '.output',
+        'server',
+        'pages',
+        `${entrypoint}.nft.json`
+      );
+      const json = JSON.stringify({
+        version: 1,
+        files: tracedFiles.map(f => ({
+          input: normalizePath(relative(nft, f.absolutePath)),
+          output: normalizePath(f.relativePath),
+        })),
+      });
+
+      await fs.ensureDir(dirname(nft));
+      await fs.writeFile(nft, json);
     }
 
-    // A list of all the files that were created by the Legacy Runtime,
-    // which we'd like to remove from the File System.
-    const toRemove = Array.from(newPathsRuntime).map(path => {
-      debug(`Removing ${path} as part of cleanup`);
-      return fs.remove(path);
-    });
-
-    // Once all the entrypoints have been processed, we'd like to
-    // remove all the files from `workPath` that originally weren't present
-    // before the Legacy Runtime began running, because the `workPath`
-    // is nowadays the directory in which the user keeps their source code, since
-    // we're no longer running separate parallel builds for every Legacy Runtime.
-    await Promise.all(toRemove);
-
-    // Add any Serverless Functions that were exposed by the Legacy Runtime
-    // to the `functions-manifest.json` file provided in `.output`.
     await updateFunctionsManifest({ workPath, pages });
   };
 }
 
+async function linkOrCopy(existingPath: string, newPath: string) {
+  try {
+    await fs.createLink(existingPath, newPath);
+  } catch (err: any) {
+    if (err.code !== 'EEXIST') {
+      await fs.copyFile(existingPath, newPath);
+    }
+  }
+}
+
 async function readJson(filePath: string): Promise<{ [key: string]: any }> {
   try {
     const str = await fs.readFile(filePath, 'utf8');
@@ -398,7 +174,7 @@ export async function updateFunctionsManifest({
   );
   const functionsManifest = await readJson(functionsManifestPath);
 
-  if (!functionsManifest.version) functionsManifest.version = 2;
+  if (!functionsManifest.version) functionsManifest.version = 1;
   if (!functionsManifest.pages) functionsManifest.pages = {};
 
   for (const [pageKey, pageConfig] of Object.entries(pages)) {

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, FileFsRef } from '../src';
+import { BuildOptions, createLambda } from '../src';
 import { convertRuntimeToPlugin } from '../src/convert-runtime-to-plugin';
 
 async function fsToJson(dir: string, output: Record<string, any> = {}) {
@@ -32,13 +32,9 @@ 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: `${handlerName}.vc_handler`,
+      handler: 'index.handler',
       runtime: 'python3.9',
       memory: 512,
       maxDuration: 5,
@@ -46,15 +42,6 @@ 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,
@@ -62,6 +49,10 @@ describe('convert-runtime-to-plugin', () => {
       return { output: lambda };
     };
 
+    const lambdaFiles = await fsToJson(workPath);
+    delete lambdaFiles['vercel.json'];
+
+    const ext = '.py';
     const packageName = 'vercel-plugin-python';
     const build = await convertRuntimeToPlugin(buildRuntime, packageName, ext);
 
@@ -71,15 +62,18 @@ describe('convert-runtime-to-plugin', () => {
 
     expect(output).toMatchObject({
       'functions-manifest.json': expect.stringContaining('{'),
+      inputs: {
+        'api-routes-python': lambdaFiles,
+      },
       server: {
         pages: {
           api: {
-            'index.py': expect.stringContaining('handler'),
+            'index.py': expect.stringContaining('index'),
             'index.py.nft.json': expect.stringContaining('{'),
             users: {
-              'get.py': expect.stringContaining('handler'),
+              'get.py': expect.stringContaining('get'),
               'get.py.nft.json': expect.stringContaining('{'),
-              'post.py': expect.stringContaining('handler'),
+              'post.py': expect.stringContaining('post'),
               'post.py.nft.json': expect.stringContaining('{'),
             },
           },
@@ -89,30 +83,50 @@ describe('convert-runtime-to-plugin', () => {
 
     const funcManifest = JSON.parse(output['functions-manifest.json']);
     expect(funcManifest).toMatchObject({
-      version: 2,
+      version: 1,
       pages: {
-        'api/index.py': { ...lambdaOptions, handler: 'index.vc_handler' },
-        'api/users/get.py': { ...lambdaOptions, handler: 'get.vc_handler' },
-        'api/users/post.py': {
-          ...lambdaOptions,
-          handler: 'post.vc_handler',
-          memory: 512,
-        },
+        'api/index.py': lambdaOptions,
+        'api/users/get.py': lambdaOptions,
+        'api/users/post.py': { ...lambdaOptions, memory: 512 },
       },
     });
 
     const indexJson = JSON.parse(output.server.pages.api['index.py.nft.json']);
     expect(indexJson).toMatchObject({
-      version: 2,
+      version: 1,
       files: [
-        '../../../../api/db/[id].py',
-        '../../../../api/index.py',
-        '../../../../api/project/[aid]/[bid]/index.py',
-        '../../../../api/users/get.py',
-        '../../../../api/users/post.py',
-        '../../../../file.txt',
-        '../../../../util/date.py',
-        '../../../../util/math.py',
+        {
+          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',
+        },
       ],
     });
 
@@ -120,16 +134,40 @@ describe('convert-runtime-to-plugin', () => {
       output.server.pages.api.users['get.py.nft.json']
     );
     expect(getJson).toMatchObject({
-      version: 2,
+      version: 1,
       files: [
-        '../../../../../api/db/[id].py',
-        '../../../../../api/index.py',
-        '../../../../../api/project/[aid]/[bid]/index.py',
-        '../../../../../api/users/get.py',
-        '../../../../../api/users/post.py',
-        '../../../../../file.txt',
-        '../../../../../util/date.py',
-        '../../../../../util/math.py',
+        {
+          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',
+        },
       ],
     });
 
@@ -137,16 +175,40 @@ describe('convert-runtime-to-plugin', () => {
       output.server.pages.api.users['post.py.nft.json']
     );
     expect(postJson).toMatchObject({
-      version: 2,
+      version: 1,
       files: [
-        '../../../../../api/db/[id].py',
-        '../../../../../api/index.py',
-        '../../../../../api/project/[aid]/[bid]/index.py',
-        '../../../../../api/users/get.py',
-        '../../../../../api/users/post.py',
-        '../../../../../file.txt',
-        '../../../../../util/date.py',
-        '../../../../../util/math.py',
+        {
+          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',
+        },
       ],
     });
 

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "23.1.3-canary.63",
+  "version": "23.1.3-canary.47",
   "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.40",
+    "@vercel/build-utils": "2.12.3-canary.28",
     "@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.10-canary.0",
+    "@vercel/ruby": "1.2.8-canary.6",
     "update-notifier": "4.1.0",
-    "vercel-plugin-middleware": "0.0.0-canary.16",
-    "vercel-plugin-node": "1.12.2-canary.32"
+    "vercel-plugin-middleware": "0.0.0-canary.7",
+    "vercel-plugin-node": "1.12.2-canary.19"
   },
   "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.17",
+    "@vercel/frameworks": "0.5.1-canary.16",
     "@vercel/ncc": "0.24.0",
     "@vercel/nft": "0.17.0",
     "@zeit/fun": "0.11.2",

packages/cli/src/commands/build.ts

@@ -5,16 +5,16 @@ import {
   GlobOptions,
   scanParentDirs,
   spawnAsync,
-  glob as buildUtilsGlob,
 } from '@vercel/build-utils';
 import { nodeFileTrace } from '@vercel/nft';
 import Sema from 'async-sema';
 import chalk from 'chalk';
 import { SpawnOptions } from 'child_process';
 import { assert } from 'console';
+import { createHash } from 'crypto';
 import fs from 'fs-extra';
 import ogGlob from 'glob';
-import { dirname, isAbsolute, join, parse, relative } from 'path';
+import { dirname, isAbsolute, join, parse, relative, resolve } from 'path';
 import pluralize from 'pluralize';
 import Client from '../util/client';
 import { VercelConfig } from '../util/dev/types';
@@ -353,19 +353,13 @@ export default async function main(client: Client) {
     }
 
     // We cannot rely on the `framework` alone, as it might be a static export,
-    // and the current build might use a different project that's not in the settings.
+    // and the current build might use a differnt project that's not in the settings.
     const isNextOutput = Boolean(dotNextDir);
-    const nextExport = await getNextExportStatus(dotNextDir);
-    const outputDir =
-      isNextOutput && !nextExport ? OUTPUT_DIR : join(OUTPUT_DIR, 'static');
-    const getDistDir = framework.getFsOutputDir || framework.getOutputDirName;
+    const outputDir = isNextOutput ? OUTPUT_DIR : join(OUTPUT_DIR, 'static');
     const distDir =
-      (nextExport?.exportDetail.outDirectory
-        ? relative(cwd, nextExport.exportDetail.outDirectory)
-        : false) ||
       dotNextDir ||
       userOutputDirectory ||
-      (await getDistDir(cwd));
+      (await framework.getFsOutputDir(cwd));
 
     await fs.ensureDir(join(cwd, outputDir));
 
@@ -449,53 +443,7 @@ export default async function main(client: Client) {
     }
 
     // Special Next.js processing.
-    if (nextExport) {
-      client.output.debug('Found `next export` output.');
-
-      const htmlFiles = await buildUtilsGlob(
-        '**/*.html',
-        join(cwd, OUTPUT_DIR, 'static')
-      );
-
-      if (nextExport.exportDetail.success !== true) {
-        client.output.error(
-          `Export of Next.js app failed. Please check your build logs.`
-        );
-        process.exit(1);
-      }
-
-      await fs.mkdirp(join(cwd, OUTPUT_DIR, 'server', 'pages'));
-      await fs.mkdirp(join(cwd, OUTPUT_DIR, 'static'));
-
-      await Promise.all(
-        Object.keys(htmlFiles).map(async fileName => {
-          await sema.acquire();
-
-          const input = join(cwd, OUTPUT_DIR, 'static', fileName);
-          const target = join(cwd, OUTPUT_DIR, 'server', 'pages', fileName);
-
-          await fs.mkdirp(dirname(target));
-
-          await fs.promises.rename(input, target).finally(() => {
-            sema.release();
-          });
-        })
-      );
-
-      for (const file of [
-        'BUILD_ID',
-        'images-manifest.json',
-        'routes-manifest.json',
-        'build-manifest.json',
-      ]) {
-        const input = join(nextExport.dotNextDir, file);
-
-        if (fs.existsSync(input)) {
-          // Do not use `smartCopy`, since we want to overwrite if they already exist.
-          await fs.copyFile(input, join(OUTPUT_DIR, file));
-        }
-      }
-    } else if (isNextOutput) {
+    if (isNextOutput) {
       // The contents of `.output/static` should be placed inside of `.output/static/_next/static`
       const tempStatic = '___static';
       await fs.rename(
@@ -636,42 +584,60 @@ export default async function main(client: Client) {
             ],
           });
           fileList.delete(relative(cwd, f));
-
-          const nftFileName = f.replace(ext, '.js.nft.json');
-          client.output.debug(`Creating ${nftFileName}`);
-
-          await fs.writeJSON(nftFileName, {
-            version: 2,
-            files: Array.from(fileList).map(fileListEntry =>
-              relative(dir, fileListEntry)
-            ),
+          await resolveNftToOutput({
+            client,
+            baseDir,
+            outputDir: OUTPUT_DIR,
+            nftFileName: f.replace(ext, '.js.nft.json'),
+            distDir,
+            nft: {
+              version: 1,
+              files: Array.from(fileList).map(fileListEntry =>
+                relative(dir, fileListEntry)
+              ),
+            },
+          });
+        }
+      } else {
+        for (let f of nftFiles) {
+          const json = await fs.readJson(f);
+          await resolveNftToOutput({
+            client,
+            baseDir,
+            outputDir: OUTPUT_DIR,
+            nftFileName: f,
+            nft: json,
+            distDir,
           });
         }
       }
 
+      client.output.debug(`Resolve ${param('required-server-files.json')}.`);
       const requiredServerFilesPath = join(
         OUTPUT_DIR,
         'required-server-files.json'
       );
+      const requiredServerFilesJson = await fs.readJSON(
+        requiredServerFilesPath
+      );
+      await fs.writeJSON(requiredServerFilesPath, {
+        ...requiredServerFilesJson,
+        appDir: '.',
+        files: requiredServerFilesJson.files.map((i: string) => {
+          const originalPath = join(requiredServerFilesJson.appDir, i);
+          const relPath = join(OUTPUT_DIR, relative(distDir, originalPath));
 
-      if (fs.existsSync(requiredServerFilesPath)) {
-        client.output.debug(`Resolve ${param('required-server-files.json')}.`);
+          const absolutePath = join(cwd, relPath);
+          const output = relative(baseDir, absolutePath);
 
-        const requiredServerFilesJson = await fs.readJSON(
-          requiredServerFilesPath
-        );
-
-        await fs.writeJSON(requiredServerFilesPath, {
-          ...requiredServerFilesJson,
-          appDir: '.',
-          files: requiredServerFilesJson.files.map((i: string) => {
-            const originalPath = join(requiredServerFilesJson.appDir, i);
-            const relPath = join(OUTPUT_DIR, relative(distDir, originalPath));
-
-            return relPath;
-          }),
-        });
-      }
+          return relPath === output
+            ? relPath
+            : {
+                input: relPath,
+                output,
+              };
+        }),
+      });
     }
   }
 
@@ -826,51 +792,83 @@ async function glob(pattern: string, options: GlobOptions): Promise<string[]> {
 }
 
 /**
- * Files will only exist when `next export` was used.
+ * Computes a hash for the given buf.
+ *
+ * @param {Buffer} file data
+ * @return {String} hex digest
  */
-async function getNextExportStatus(dotNextDir: string | null) {
-  if (!dotNextDir) {
-    return null;
-  }
-
-  const exportDetail: {
-    success: boolean;
-    outDirectory: string;
-  } | null = await fs
-    .readJson(join(dotNextDir, 'export-detail.json'))
-    .catch(error => {
-      if (error.code === 'ENOENT') {
-        return null;
-      }
-
-      throw error;
-    });
-
-  if (!exportDetail) {
-    return null;
-  }
-
-  const exportMarker: {
-    version: 1;
-    exportTrailingSlash: boolean;
-    hasExportPathMap: boolean;
-  } | null = await fs
-    .readJSON(join(dotNextDir, 'export-marker.json'))
-    .catch(error => {
-      if (error.code === 'ENOENT') {
-        return null;
-      }
-
-      throw error;
-    });
-
-  return {
-    dotNextDir,
-    exportDetail,
-    exportMarker: {
-      trailingSlash: exportMarker?.hasExportPathMap
-        ? exportMarker.exportTrailingSlash
-        : false,
-    },
-  };
+function hash(buf: Buffer): string {
+  return createHash('sha1').update(buf).digest('hex');
+}
+
+interface NftFile {
+  version: number;
+  files: (string | { input: string; output: string })[];
+}
+
+// resolveNftToOutput takes nft file and moves all of its trace files
+// into the specified directory + `inputs`, (renaming them to their hash + ext) and
+// subsequently updating the original nft file accordingly. This is done
+// to make the `.output` directory be self-contained, so that it works
+// properly with `vc --prebuilt`.
+async function resolveNftToOutput({
+  client,
+  baseDir,
+  outputDir,
+  nftFileName,
+  distDir,
+  nft,
+}: {
+  client: Client;
+  baseDir: string;
+  outputDir: string;
+  nftFileName: string;
+  distDir: string;
+  nft: NftFile;
+}) {
+  client.output.debug(`Processing and resolving ${nftFileName}`);
+  await fs.ensureDir(join(outputDir, 'inputs'));
+  const newFilesList: NftFile['files'] = [];
+
+  // If `distDir` is a subdirectory, then the input has to be resolved to where the `.output` directory will be.
+  const relNftFileName = relative(outputDir, nftFileName);
+  const origNftFilename = join(distDir, relNftFileName);
+
+  if (relNftFileName.startsWith('cache/')) {
+    // No need to process the `cache/` directory.
+    // Paths in it might also not be relative to `cache` itself.
+    return;
+  }
+
+  for (let fileEntity of nft.files) {
+    const relativeInput =
+      typeof fileEntity === 'string' ? fileEntity : fileEntity.input;
+    const fullInput = resolve(join(parse(origNftFilename).dir, relativeInput));
+
+    // if the resolved path is NOT in the .output directory we move in it there
+    if (!fullInput.includes(distDir)) {
+      const { ext } = parse(fullInput);
+      const raw = await fs.readFile(fullInput);
+      const newFilePath = join(outputDir, 'inputs', hash(raw) + ext);
+      smartCopy(client, fullInput, newFilePath);
+
+      // We have to use `baseDir` instead of `cwd`, because we want to
+      // mount everything from there (especially `node_modules`).
+      // This is important for NPM Workspaces where `node_modules` is not
+      // in the directory of the workspace.
+      const output = relative(baseDir, fullInput).replace('.output', '.next');
+
+      newFilesList.push({
+        input: relative(parse(nftFileName).dir, newFilePath),
+        output,
+      });
+    } else {
+      newFilesList.push(relativeInput);
+    }
+  }
+  // Update the .nft.json with new input and output mapping
+  await fs.writeJSON(nftFileName, {
+    ...nft,
+    files: newFilesList,
+  });
 }

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

@@ -968,7 +968,7 @@ export default class DevServer {
         socket.destroy();
         return;
       }
-      const target = `http://127.0.0.1:${this.devProcessPort}`;
+      const target = `http://localhost:${this.devProcessPort}`;
       this.output.debug(`Detected "upgrade" event, proxying to ${target}`);
       this.proxy.ws(req, socket, head, { target });
     });
@@ -1663,7 +1663,7 @@ export default class DevServer {
     if (!match) {
       // If the dev command is started, then proxy to it
       if (this.devProcessPort) {
-        const upstream = `http://127.0.0.1:${this.devProcessPort}`;
+        const upstream = `http://localhost:${this.devProcessPort}`;
         debug(`Proxying to frontend dev server: ${upstream}`);
 
         // Add the Vercel platform proxy request headers
@@ -1810,7 +1810,7 @@ export default class DevServer {
         return proxyPass(
           req,
           res,
-          `http://127.0.0.1:${port}`,
+          `http://localhost:${port}`,
           this,
           requestId,
           false
@@ -1847,7 +1847,7 @@ export default class DevServer {
       return proxyPass(
         req,
         res,
-        `http://127.0.0.1:${this.devProcessPort}`,
+        `http://localhost:${this.devProcessPort}`,
         this,
         requestId,
         false

packages/cli/test/fixtures/unit/edge-middleware-strict/_middleware.ts

@@ -1,6 +0,0 @@
-export default function (req) {
-  const isStrict = (function () {
-    return !this;
-  })();
-  return new Response('is strict mode? ' + (isStrict ? 'yes' : 'no'));
-}

packages/cli/test/util/dev/server.test.ts

@@ -385,13 +385,4 @@ describe('DevServer', () => {
       );
     })
   );
-
-  it(
-    'should run middleware in strict mode',
-    testFixture('edge-middleware-strict', async server => {
-      const response = await fetch(`${server.address}/index.html`);
-      const body = await response.text();
-      expect(body).toStrictEqual('is strict mode? yes');
-    })
-  );
 });

packages/client/package.json

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

packages/frameworks/package.json

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

packages/frameworks/src/frameworks.ts

@@ -141,6 +141,7 @@ export const frameworks = [
     },
     dependency: 'gatsby',
     getOutputDirName: async () => 'public',
+    getFsOutputDir: async () => 'public',
     defaultRoutes: async (dirPrefix: string) => {
       // This file could be generated by gatsby-plugin-now or gatsby-plugin-zeit-now
       try {
@@ -225,6 +226,7 @@ export const frameworks = [
       },
     },
     dependency: 'remix',
+    getFsOutputDir: async () => 'public',
     getOutputDirName: async () => 'public',
     defaultRoutes: [
       {
@@ -252,13 +254,10 @@ export const frameworks = [
         source: '/build/(.*)',
         regex: '/build/(.*)',
         headers: [
-          {
-            key: 'cache-control',
-            value: 'public, max-age=31536000, immutable',
-          },
+          { key: 'cache-control', value: 'public, max-age=31536000, immutable' },
         ],
       },
-    ],
+    ]
   },
   {
     name: 'Hexo',
@@ -295,6 +294,7 @@ export const frameworks = [
       },
     },
     dependency: 'hexo',
+    getFsOutputDir: async () => 'public',
     getOutputDirName: async () => 'public',
   },
   {
@@ -332,6 +332,7 @@ export const frameworks = [
       },
     },
     dependency: '@11ty/eleventy',
+    getFsOutputDir: async () => '_site',
     getOutputDirName: async () => '_site',
     cachePattern: '.cache/**',
   },
@@ -371,6 +372,22 @@ export const frameworks = [
       },
     },
     dependency: '@docusaurus/core',
+    getFsOutputDir: async (dirPrefix: string) => {
+      const base = 'build';
+      try {
+        const location = join(dirPrefix, base);
+        const content = await readdir(location, { withFileTypes: true });
+
+        // If there is only one file in it that is a dir we'll use it as dist dir
+        if (content.length === 1 && content[0].isDirectory()) {
+          return join(base, content[0].name);
+        }
+      } catch (error) {
+        console.error(`Error detecting output directory: `, error);
+      }
+
+      return base;
+    },
     getOutputDirName: async (dirPrefix: string) => {
       const base = 'build';
       try {
@@ -510,6 +527,21 @@ export const frameworks = [
       },
     },
     dependency: 'docusaurus',
+    getFsOutputDir: async (dirPrefix: string) => {
+      const base = 'build';
+      try {
+        const location = join(dirPrefix, base);
+        const content = await readdir(location, { withFileTypes: true });
+
+        // If there is only one file in it that is a dir we'll use it as dist dir
+        if (content.length === 1 && content[0].isDirectory()) {
+          return join(base, content[0].name);
+        }
+      } catch (error) {
+        console.error(`Error detecting output directory: `, error);
+      }
+      return base;
+    },
     getOutputDirName: async (dirPrefix: string) => {
       const base = 'build';
       try {
@@ -561,6 +593,7 @@ export const frameworks = [
       },
     },
     dependency: 'preact-cli',
+    getFsOutputDir: async () => 'build',
     getOutputDirName: async () => 'build',
     defaultRoutes: [
       {
@@ -617,6 +650,7 @@ export const frameworks = [
       },
     },
     dependency: '@dojo/cli',
+    getFsOutputDir: async () => 'output/dist',
     getOutputDirName: async () => join('output', 'dist'),
     defaultRoutes: [
       {
@@ -683,6 +717,7 @@ export const frameworks = [
       },
     },
     dependency: 'ember-cli',
+    getFsOutputDir: async () => 'dist',
     getOutputDirName: async () => 'dist',
     defaultRoutes: [
       {
@@ -737,6 +772,7 @@ export const frameworks = [
       },
     },
     dependency: '@vue/cli-service',
+    getFsOutputDir: async () => 'dist',
     getOutputDirName: async () => 'dist',
     defaultRoutes: [
       {
@@ -813,6 +849,7 @@ export const frameworks = [
       },
     },
     dependency: '@scullyio/init',
+    getFsOutputDir: async () => 'dist',
     getOutputDirName: async () => 'dist/static',
   },
   {
@@ -849,6 +886,7 @@ export const frameworks = [
       },
     },
     dependency: '@ionic/angular',
+    getFsOutputDir: async () => 'www',
     getOutputDirName: async () => 'www',
     defaultRoutes: [
       {
@@ -902,6 +940,7 @@ export const frameworks = [
       },
     },
     dependency: '@angular/cli',
+    getFsOutputDir: async () => 'dist',
     getOutputDirName: async (dirPrefix: string) => {
       const base = 'dist';
       try {
@@ -969,6 +1008,7 @@ export const frameworks = [
       },
     },
     dependency: 'polymer-cli',
+    getFsOutputDir: async () => 'build',
     getOutputDirName: async (dirPrefix: string) => {
       const base = 'build';
       try {
@@ -1038,6 +1078,7 @@ export const frameworks = [
       },
     },
     dependency: 'sirv-cli',
+    getFsOutputDir: async () => 'public',
     getOutputDirName: async () => 'public',
     defaultRoutes: [
       {
@@ -1087,9 +1128,10 @@ export const frameworks = [
         placeholder: 'svelte-kit dev',
       },
       outputDirectory: {
-        value: 'public',
+        placeholder: 'public',
       },
     },
+    getFsOutputDir: async () => '.output',
     getOutputDirName: async () => 'public',
   },
   {
@@ -1126,6 +1168,7 @@ export const frameworks = [
       },
     },
     dependency: '@ionic/react',
+    getFsOutputDir: async () => 'build',
     getOutputDirName: async () => 'build',
     defaultRoutes: [
       {
@@ -1233,6 +1276,7 @@ export const frameworks = [
       },
     },
     dependency: 'react-scripts',
+    getFsOutputDir: async () => 'build',
     getOutputDirName: async () => 'build',
     defaultRoutes: [
       {
@@ -1334,6 +1378,7 @@ export const frameworks = [
       },
     },
     dependency: 'gridsome',
+    getFsOutputDir: async () => 'dist',
     getOutputDirName: async () => 'dist',
   },
   {
@@ -1371,6 +1416,7 @@ export const frameworks = [
       },
     },
     dependency: 'umi',
+    getFsOutputDir: async () => 'dist',
     getOutputDirName: async () => 'dist',
     defaultRoutes: [
       {
@@ -1424,6 +1470,7 @@ export const frameworks = [
       },
     },
     dependency: 'sapper',
+    getFsOutputDir: async () => '__sapper__/export',
     getOutputDirName: async () => '__sapper__/export',
   },
   {
@@ -1461,6 +1508,7 @@ export const frameworks = [
       },
     },
     dependency: 'saber',
+    getFsOutputDir: async () => 'public',
     getOutputDirName: async () => 'public',
     defaultRoutes: [
       {
@@ -1529,6 +1577,7 @@ export const frameworks = [
       },
     },
     dependency: '@stencil/core',
+    getFsOutputDir: async () => 'www',
     getOutputDirName: async () => 'www',
     defaultRoutes: [
       {
@@ -1617,6 +1666,7 @@ export const frameworks = [
       },
     },
     dependency: 'nuxt',
+    getFsOutputDir: async () => '.output',
     getOutputDirName: async () => 'dist',
     cachePattern: '.nuxt/**',
     defaultRoutes: [
@@ -1674,6 +1724,7 @@ export const frameworks = [
         placeholder: 'RedwoodJS default',
       },
     },
+    getFsOutputDir: async () => 'public',
     getOutputDirName: async () => 'public',
   },
   {
@@ -1717,6 +1768,16 @@ export const frameworks = [
         placeholder: '`public` or `publishDir` from the `config` file',
       },
     },
+    getFsOutputDir: async (dirPrefix: string): Promise<string> => {
+      type HugoConfig = { publishDir?: string };
+      const config = await readConfigFile<HugoConfig>(
+        ['config.json', 'config.yaml', 'config.toml'].map(fileName => {
+          return join(dirPrefix, fileName);
+        })
+      );
+
+      return (config && config.publishDir) || 'public';
+    },
     getOutputDirName: async (dirPrefix: string): Promise<string> => {
       type HugoConfig = { publishDir?: string };
       const config = await readConfigFile<HugoConfig>(
@@ -1761,6 +1822,13 @@ export const frameworks = [
         placeholder: '`_site` or `destination` from `_config.yml`',
       },
     },
+    getFsOutputDir: async (dirPrefix: string): Promise<string> => {
+      type JekyllConfig = { destination?: string };
+      const config = await readConfigFile<JekyllConfig>(
+        join(dirPrefix, '_config.yml')
+      );
+      return (config && config.destination) || '_site';
+    },
     getOutputDirName: async (dirPrefix: string): Promise<string> => {
       type JekyllConfig = { destination?: string };
       const config = await readConfigFile<JekyllConfig>(
@@ -1802,6 +1870,7 @@ export const frameworks = [
         value: 'public',
       },
     },
+    getFsOutputDir: async () => 'public',
     getOutputDirName: async () => 'public',
   },
   {
@@ -1836,6 +1905,7 @@ export const frameworks = [
         value: 'build',
       },
     },
+    getFsOutputDir: async () => 'build',
     getOutputDirName: async () => 'build',
     cachePattern: '{vendor/bin,vendor/cache,vendor/bundle}/**',
   },
@@ -1870,6 +1940,7 @@ export const frameworks = [
         value: 'public',
       },
     },
+    getFsOutputDir: async () => 'public',
     getOutputDirName: async () => 'public',
     defaultVersion: '0.13.0',
   },
@@ -1909,6 +1980,7 @@ export const frameworks = [
       },
     },
     dependency: 'vite',
+    getFsOutputDir: async () => 'dist',
     getOutputDirName: async () => 'dist',
   },
   {
@@ -1946,6 +2018,7 @@ export const frameworks = [
       },
     },
     dependency: 'parcel',
+    getFsOutputDir: async () => 'dist',
     getOutputDirName: async () => 'dist',
     defaultRoutes: [
       {

packages/frameworks/src/types.ts

@@ -162,9 +162,9 @@ export interface Framework {
   dependency?: string;
   /**
    * Function that returns the name of the directory that the framework outputs
-   * its File System API build results to, usually called `.output`.
+   * its build results to. In some cases this is read from a configuration file.
    */
-  getFsOutputDir?: (dirPrefix: string) => Promise<string>;
+  getFsOutputDir: (dirPrefix: string) => Promise<string>;
   /**
    * Function that returns the name of the directory that the framework outputs
    * its STATIC build results to. In some cases this is read from a configuration file.

packages/middleware/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel-plugin-middleware",
-  "version": "0.0.0-canary.16",
+  "version": "0.0.0-canary.7",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "",
@@ -30,7 +30,6 @@
     "@types/node-fetch": "^2",
     "@types/ua-parser-js": "0.7.36",
     "@types/uuid": "8.3.1",
-    "@vercel/build-utils": "2.12.3-canary.40",
     "@vercel/ncc": "0.24.0",
     "cookie": "0.4.1",
     "formdata-node": "4.3.1",

packages/middleware/src/entries.js

@@ -1,4 +1,4 @@
-import * as middleware from './_temp_middleware';
+import * as middleware from './_middleware';
 _ENTRIES = typeof _ENTRIES === 'undefined' ? {} : _ENTRIES;
 _ENTRIES['middleware_pages/_middleware'] = {
   default: async function (ev) {

packages/middleware/src/index.ts

@@ -5,7 +5,6 @@ import { promises as fsp } from 'fs';
 import { IncomingMessage, ServerResponse } from 'http';
 import libGlob from 'glob';
 import Proxy from 'http-proxy';
-import { updateFunctionsManifest } from '@vercel/build-utils';
 
 import { run } from './websandbox';
 import type { FetchEventResult } from './websandbox/types';
@@ -23,8 +22,7 @@ const SUPPORTED_EXTENSIONS = ['.js', '.ts'];
 
 // File name of the `entries.js` file that gets copied into the
 // project directory. Use a name that is unlikely to conflict.
-const TMP_ENTRIES_NAME = '.output/inputs/middleware/___vc_entries.js';
-const TMP_MIDDLEWARE_BUNDLE = '.output/inputs/middleware/_temp_middleware.js';
+const ENTRIES_NAME = '___vc_entries.js';
 
 async function getMiddlewareFile(workingDirectory: string) {
   // Only the root-level `_middleware.*` files are considered.
@@ -54,36 +52,17 @@ async function getMiddlewareFile(workingDirectory: string) {
 }
 
 export async function build({ workPath }: { workPath: string }) {
-  const entriesPath = join(workPath, TMP_ENTRIES_NAME);
-  const transientFilePath = join(workPath, TMP_MIDDLEWARE_BUNDLE);
+  const entriesPath = join(workPath, ENTRIES_NAME);
   const middlewareFile = await getMiddlewareFile(workPath);
   if (!middlewareFile) return;
 
   console.log('Compiling middleware file: %j', middlewareFile);
 
-  /**
-   * Two builds happen here, because esbuild doesn't offer a way to add a banner
-   * to individual input files, and the entries wrapper relies on running in
-   * non-strict mode to access the ENTRIES global.
-   *
-   * To work around this, we bundle the middleware directly and add
-   * 'use strict'; to make the entire bundle run in strict mode. We then bundle
-   * a second time, adding the global ENTRIES wrapper and preserving the
-   * 'use strict' for the entire scope of the original bundle.
-   */
+  // Create `_ENTRIES` wrapper
+  await fsp.copyFile(join(__dirname, 'entries.js'), entriesPath);
+
+  // Build
   try {
-    await esbuild.build({
-      entryPoints: [middlewareFile],
-      bundle: true,
-      absWorkingDir: workPath,
-      outfile: transientFilePath,
-      banner: {
-        js: '"use strict";',
-      },
-      format: 'cjs',
-    });
-    // Create `_ENTRIES` wrapper
-    await fsp.copyFile(join(__dirname, 'entries.js'), entriesPath);
     await esbuild.build({
       entryPoints: [entriesPath],
       bundle: true,
@@ -91,24 +70,29 @@ export async function build({ workPath }: { workPath: string }) {
       outfile: join(workPath, '.output/server/pages/_middleware.js'),
     });
   } finally {
-    await fsp.unlink(transientFilePath);
     await fsp.unlink(entriesPath);
   }
 
-  const fileName = basename(middlewareFile);
-  const pages: { [key: string]: any } = {};
-
-  pages[fileName] = {
-    runtime: 'web',
-    env: [],
-    files: ['server/pages/_middleware.js'],
-    name: 'pages/_middleware',
-    page: '/',
-    regexp: '^/.*$',
-    sortingIndex: 1,
+  // Write middleware manifest
+  const middlewareManifest = {
+    version: 1,
+    sortedMiddleware: ['/'],
+    middleware: {
+      '/': {
+        env: [],
+        files: ['server/pages/_middleware.js'],
+        name: 'pages/_middleware',
+        page: '/',
+        regexp: '^/.*$',
+      },
+    },
   };
-
-  await updateFunctionsManifest({ workPath, pages });
+  const middlewareManifestData = JSON.stringify(middlewareManifest, null, 2);
+  const middlewareManifestPath = join(
+    workPath,
+    '.output/server/middleware-manifest.json'
+  );
+  await fsp.writeFile(middlewareManifestPath, middlewareManifestData);
 }
 
 const stringifyQuery = (req: IncomingMessage, query: ParsedUrlQuery) => {

packages/middleware/src/websandbox/sandbox/sandbox.ts

@@ -114,7 +114,6 @@ export async function run(params: {
     const content = readFileSync(params.path, 'utf-8');
     const esBuildResult = esbuild.transformSync(content, {
       format: 'cjs',
-      banner: '"use strict";',
     });
     const x = vm.runInNewContext(m.wrap(esBuildResult.code), cache.sandbox, {
       filename: params.path,
@@ -164,7 +163,6 @@ function sandboxRequire(referrer: string, specifier: string) {
 
   const transformOptions: esbuild.TransformOptions = {
     format: 'cjs',
-    banner: '"use strict";',
   };
   if (extname(resolved) === '.json') {
     transformOptions.loader = 'json';

packages/middleware/test/__snapshots__/build.test.ts.snap

@@ -2,8 +2,8 @@
 
 exports[`build() should build simple middleware 1`] = `
 Object {
-  "pages": Object {
-    "_middleware.js": Object {
+  "middleware": Object {
+    "/": Object {
       "env": Array [],
       "files": Array [
         "server/pages/_middleware.js",
@@ -11,10 +11,11 @@ Object {
       "name": "pages/_middleware",
       "page": "/",
       "regexp": "^/.*$",
-      "runtime": "web",
-      "sortingIndex": 1,
     },
   },
-  "version": 2,
+  "sortedMiddleware": Array [
+    "/",
+  ],
+  "version": 1,
 }
 `;

packages/middleware/test/build.test.ts

@@ -3,30 +3,6 @@ import { promises as fsp } from 'fs';
 import { build } from '../src';
 import { Response } from 'node-fetch';
 
-const setupFixture = async (fixture: string) => {
-  const fixturePath = join(__dirname, `fixtures/${fixture}`);
-  await build({
-    workPath: fixturePath,
-  });
-
-  const functionsManifest = JSON.parse(
-    await fsp.readFile(
-      join(fixturePath, '.output/functions-manifest.json'),
-      'utf8'
-    )
-  );
-
-  const outputFile = join(fixturePath, '.output/server/pages/_middleware.js');
-  expect(await fsp.stat(outputFile)).toBeTruthy();
-  require(outputFile);
-  //@ts-ignore
-  const middleware = global._ENTRIES['middleware_pages/_middleware'].default;
-  return {
-    middleware,
-    functionsManifest,
-  };
-};
-
 describe('build()', () => {
   beforeEach(() => {
     //@ts-ignore
@@ -39,9 +15,25 @@ describe('build()', () => {
     delete global._ENTRIES;
   });
   it('should build simple middleware', async () => {
-    const { functionsManifest, middleware } = await setupFixture('simple');
+    const fixture = join(__dirname, 'fixtures/simple');
+    await build({
+      workPath: fixture,
+    });
 
-    expect(functionsManifest).toMatchSnapshot();
+    const middlewareManifest = JSON.parse(
+      await fsp.readFile(
+        join(fixture, '.output/server/middleware-manifest.json'),
+        'utf8'
+      )
+    );
+    expect(middlewareManifest).toMatchSnapshot();
+
+    const outputFile = join(fixture, '.output/server/pages/_middleware.js');
+    expect(await fsp.stat(outputFile)).toBeTruthy();
+
+    require(outputFile);
+    //@ts-ignore
+    const middleware = global._ENTRIES['middleware_pages/_middleware'].default;
     expect(typeof middleware).toStrictEqual('function');
     const handledResponse = await middleware({
       request: {
@@ -62,12 +54,4 @@ describe('build()', () => {
       (unhandledResponse.response as Response).headers.get('x-middleware-next')
     ).toEqual('1');
   });
-
-  it('should create a middleware that runs in strict mode', async () => {
-    const { middleware } = await setupFixture('use-strict');
-    const response = await middleware({
-      request: {},
-    });
-    expect(String(response.response.body)).toEqual('is strict mode? yes');
-  });
 });

packages/middleware/test/fixtures/use-strict/_middleware.js

@@ -1,6 +0,0 @@
-export default function (req) {
-  const isStrict = (function () {
-    return !this;
-  })();
-  return new Response('is strict mode? ' + (isStrict ? 'yes' : 'no'));
-}

packages/plugin-go/package.json

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

packages/plugin-go/src/index.ts

@@ -1,6 +1,7 @@
 import { convertRuntimeToPlugin } from '@vercel/build-utils';
 import * as go from '@vercel/go';
+import { name } from '../package.json';
 
-export const build = convertRuntimeToPlugin(go.build, 'vercel-plugin-go', '.go');
+export const build = convertRuntimeToPlugin(go.build, name, '.go');
 
 export const startDevServer = go.startDevServer;

packages/plugin-go/tsconfig.json

@@ -12,6 +12,7 @@
     "noUnusedParameters": true,
     "outDir": "dist",
     "strict": true,
-    "target": "esnext"
+    "target": "esnext",
+    "resolveJsonModule": true
   }
 }

packages/plugin-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel-plugin-node",
-  "version": "1.12.2-canary.32",
+  "version": "1.12.2-canary.19",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -34,12 +34,12 @@
     "@types/node-fetch": "2",
     "@types/test-listen": "1.1.0",
     "@types/yazl": "2.4.2",
-    "@vercel/build-utils": "2.12.3-canary.40",
+    "@vercel/build-utils": "2.12.3-canary.28",
     "@vercel/fun": "1.0.3",
     "@vercel/ncc": "0.24.0",
     "@vercel/nft": "0.14.0",
     "@vercel/node-bridge": "2.1.1-canary.2",
-    "@vercel/static-config": "0.0.1-canary.1",
+    "@vercel/static-config": "0.0.1-canary.0",
     "abort-controller": "3.0.0",
     "content-type": "1.0.4",
     "cookie": "0.4.0",

packages/plugin-node/src/index.ts

@@ -401,9 +401,9 @@ export async function build({ workPath }: { workPath: string }) {
       getConfig(project, absEntrypoint, FunctionConfigSchema) || {};
 
     // No config exported means "node", but if there is a config
-    // and "use" is defined, but it is not "node" then don't
+    // and "runtime" is defined, but it is not "node" then don't
     // compile this file.
-    if (config.use && config.use !== 'node') {
+    if (config.runtime && config.runtime !== 'node') {
       continue;
     }
 

packages/plugin-python/package.json

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

packages/plugin-python/src/index.ts

@@ -1,6 +1,7 @@
 import { convertRuntimeToPlugin } from '@vercel/build-utils';
 import * as python from '@vercel/python';
+import { name } from '../package.json';
 
-export const build = convertRuntimeToPlugin(python.build, 'vercel-plugin-python', '.py');
+export const build = convertRuntimeToPlugin(python.build, name, '.py');
 
 //export const startDevServer = python.startDevServer;

packages/plugin-python/tsconfig.json

@@ -13,6 +13,7 @@
     "outDir": "dist",
     "types": ["node"],
     "strict": true,
-    "target": "esnext"
+    "target": "esnext",
+    "resolveJsonModule": true
   }
 }

packages/plugin-ruby/package.json

@@ -1,8 +1,8 @@
 {
   "private": false,
   "name": "vercel-plugin-ruby",
-  "version": "1.0.0-canary.28",
-  "main": "dist/index.js",
+  "version": "1.0.0-canary.13",
+  "main": "dist/src/index.js",
   "license": "MIT",
   "files": [
     "dist"
@@ -17,8 +17,8 @@
     "prepublishOnly": "tsc"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.12.3-canary.40",
-    "@vercel/ruby": "1.2.10-canary.0"
+    "@vercel/build-utils": "2.12.3-canary.28",
+    "@vercel/ruby": "1.2.8-canary.6"
   },
   "devDependencies": {
     "@types/node": "*",

packages/plugin-ruby/src/index.ts

@@ -1,6 +1,7 @@
 import { convertRuntimeToPlugin } from '@vercel/build-utils';
 import * as ruby from '@vercel/ruby';
+import { name } from '../package.json';
 
-export const build = convertRuntimeToPlugin(ruby.build, 'vercel-plugin-ruby', '.rb');
+export const build = convertRuntimeToPlugin(ruby.build, name, '.rb');
 
 //export const startDevServer = ruby.startDevServer;

packages/plugin-ruby/tsconfig.json

@@ -13,6 +13,7 @@
     "outDir": "dist",
     "types": ["node"],
     "strict": true,
-    "target": "esnext"
+    "target": "esnext",
+    "resolveJsonModule": true
   }
 }

packages/ruby/install-ruby.ts

@@ -9,24 +9,13 @@ interface RubyVersion extends NodeVersion {
 
 const allOptions: RubyVersion[] = [
   { major: 2, minor: 7, range: '2.7.x', runtime: 'ruby2.7' },
-  {
-    major: 2,
-    minor: 5,
-    range: '2.5.x',
-    runtime: 'ruby2.5',
-    discontinueDate: new Date('2021-11-30'),
-  },
+  { major: 2, minor: 5, range: '2.5.x', runtime: 'ruby2.5' },
 ];
 
 function getLatestRubyVersion(): RubyVersion {
   return allOptions[0];
 }
 
-function isDiscontinued({ discontinueDate }: RubyVersion): boolean {
-  const today = Date.now();
-  return discontinueDate !== undefined && discontinueDate.getTime() <= today;
-}
-
 function getRubyPath(meta: Meta, gemfileContents: string) {
   let selection = getLatestRubyVersion();
   if (meta.isDev) {
@@ -48,20 +37,8 @@ function getRubyPath(meta: Meta, gemfileContents: string) {
       if (!found) {
         throw new NowBuildError({
           code: 'RUBY_INVALID_VERSION',
-          message: `Found \`Gemfile\` with invalid Ruby version: \`${line}.\``,
-          link: 'http://vercel.link/ruby-version',
-        });
-      }
-      if (isDiscontinued(selection)) {
-        const latest = getLatestRubyVersion();
-        const intro = `Found \`Gemfile\` with discontinued Ruby version: \`${line}.\``;
-        const hint = `Please set \`ruby "~> ${latest.range}"\` in your \`Gemfile\` to use Ruby ${latest.range}.`;
-        const upstream =
-          'This change is the result of a decision made by an upstream infrastructure provider (AWS).';
-        throw new NowBuildError({
-          code: 'RUBY_DISCONTINUED_VERSION',
-          link: 'http://vercel.link/ruby-version',
-          message: `${intro} ${hint} ${upstream}`,
+          message: 'Found `Gemfile` with invalid Ruby version: `' + line + '`.',
+          link: 'https://vercel.com/docs/runtimes#official-runtimes/ruby/ruby-version',
         });
       }
     }

packages/ruby/package.json

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

packages/ruby/test/fixtures/02-cowsay-vendored/now.json

@@ -1,5 +1,6 @@
 {
   "version": 2,
   "builds": [{ "src": "index.rb", "use": "@vercel/ruby" }],
+  "build": { "env": { "RUBY_VERSION": "2.7.x" } },
   "probes": [{ "path": "/", "mustContain": "gem:RANDOMNESS_PLACEHOLDER" }]
 }

packages/ruby/test/fixtures/04-cowsay-vendored-nested/now.json

@@ -1,6 +1,7 @@
 {
   "version": 2,
   "builds": [{ "src": "project/index.rb", "use": "@vercel/ruby" }],
+  "build": { "env": { "RUBY_VERSION": "2.7.x" } },
   "probes": [
     { "path": "/project/", "mustContain": "gem:RANDOMNESS_PLACEHOLDER" }
   ]

packages/ruby/test/fixtures/05-sinatra/now.json

@@ -1,5 +1,6 @@
 {
   "version": 2,
   "builds": [{ "src": "index.ru", "use": "@vercel/ruby" }],
+  "build": { "env": { "RUBY_VERSION": "2.7.x" } },
   "probes": [{ "path": "/", "mustContain": "gem:RANDOMNESS_PLACEHOLDER" }]
 }

packages/ruby/test/fixtures/11-version-2-5-error/Gemfile

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-ruby "~> 2.5.x"
-
-gem "cowsay", "~> 0.3.0"

packages/ruby/test/fixtures/11-version-2-5-error/Gemfile.lock

@@ -1,16 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    cowsay (0.3.0)
-
-PLATFORMS
-  x86_64-linux
-
-DEPENDENCIES
-  cowsay (~> 0.3.0)
-
-RUBY VERSION
-   ruby 2.5.5p157
-
-BUNDLED WITH
-   2.2.22

packages/ruby/test/fixtures/11-version-2-5-error/index.rb

@@ -1,9 +0,0 @@
-require 'cowsay'
-
-Handler = Proc.new do |req, res|
-  name = req.query['name'] || 'World'
-
-  res.status = 200
-  res['Content-Type'] = 'text/text; charset=utf-8'
-  res.body = Cowsay.say("Hello #{name}", 'cow')
-end

packages/ruby/test/fixtures/11-version-2-5-error/vercel.json

@@ -1,4 +0,0 @@
-{
-  "version": 2,
-  "builds": [{ "src": "index.rb", "use": "@vercel/ruby" }]
-}

packages/ruby/test/test.js

@@ -23,32 +23,8 @@ beforeAll(async () => {
 
 const fixturesPath = path.resolve(__dirname, 'fixtures');
 
-const testsThatFailToBuild = new Map([
-  [
-    '11-version-2-5-error',
-    'Found `Gemfile` with discontinued Ruby version: `ruby "~> 2.5.x".` Please set `ruby "~> 2.7.x"` in your `Gemfile` to use Ruby 2.7.x. This change is the result of a decision made by an upstream infrastructure provider (AWS).',
-  ],
-]);
-
 // eslint-disable-next-line no-restricted-syntax
 for (const fixture of fs.readdirSync(fixturesPath)) {
-  const errMsg = testsThatFailToBuild.get(fixture);
-  if (errMsg) {
-    // eslint-disable-next-line no-loop-func
-    it(`should fail to build ${fixture}`, async () => {
-      try {
-        await testDeployment(
-          { builderUrl, buildUtilsUrl },
-          path.join(fixturesPath, fixture)
-        );
-      } catch (err) {
-        expect(err).toBeTruthy();
-        expect(err.deployment).toBeTruthy();
-        expect(err.deployment.errorMessage).toBe(errMsg);
-      }
-    });
-    continue; //eslint-disable-line
-  }
   // eslint-disable-next-line no-loop-func
   it(`should build ${fixture}`, async () => {
     await expect(

packages/static-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-config",
-  "version": "0.0.1-canary.1",
+  "version": "0.0.1-canary.0",
   "license": "MIT",
   "main": "./dist/index",
   "repository": {

packages/static-config/src/index.ts

@@ -15,7 +15,7 @@ const ajv = new Ajv();
 export const BaseFunctionConfigSchema = {
   type: 'object',
   properties: {
-    use: { type: 'string' },
+    runtime: { type: 'string' },
     memory: { type: 'number' },
     maxDuration: { type: 'number' },
     regions: {

packages/static-config/test/fixtures/deno.ts

@@ -2,7 +2,7 @@ import ms from 'https://denopkg.com/TooTallNate/ms';
 import { readerFromStreamReader } from 'https://deno.land/std@0.107.0/io/streams.ts';
 
 export const config = {
-  use: 'deno',
+  runtime: 'deno',
   location: 'https://example.com/page',
 };
 

packages/static-config/test/fixtures/invalid-schema.js

@@ -1,3 +1,3 @@
 export const config = {
-  use: 0,
+  runtime: 0,
 };

packages/static-config/test/fixtures/node.js

@@ -1,7 +1,7 @@
 import fs from 'fs';
 
 export const config = {
-  use: 'node',
+  runtime: 'node',
   memory: 1024,
 };
 

packages/static-config/test/index.test.ts

@@ -10,7 +10,7 @@ describe('getConfig()', () => {
     expect(config).toMatchInlineSnapshot(`
       Object {
         "memory": 1024,
-        "use": "node",
+        "runtime": "node",
       }
     `);
   });
@@ -27,7 +27,7 @@ describe('getConfig()', () => {
     expect(config).toMatchInlineSnapshot(`
       Object {
         "location": "https://example.com/page",
-        "use": "deno",
+        "runtime": "deno",
       }
     `);
   });