Publish Canary

- @vercel/build-utils@2.15.2-canary.3
 - vercel@24.1.1-canary.5
 - @vercel/client@10.4.2-canary.4
 - @vercel/frameworks@0.7.2-canary.0
 - @vercel/go@1.3.3-canary.3
 - @vercel/node@1.14.2-canary.4
 - @vercel/python@2.2.3-canary.3
 - @vercel/redwood@0.7.1-canary.3
 - @vercel/ruby@1.3.3-canary.3
 - @vercel/static-build@0.23.2-canary.3

.eslintignore

@@ -1,7 +1,12 @@
 node_modules
 dist
 examples
+
+packages/node/src/bridge.ts
+
 packages/*/test/fixtures
+
+# cli
 packages/cli/@types
 packages/cli/download
 packages/cli/dist
@@ -9,9 +14,24 @@ packages/cli/test/dev/fixtures
 packages/cli/bin
 packages/cli/link
 packages/cli/src/util/dev/templates/*.ts
+
+# client
 packages/client/tests/fixtures
 packages/client/lib
-packages/node/src/bridge.ts
+
+# node-bridge
 packages/node-bridge/bridge.js
 packages/node-bridge/launcher.js
+packages/node-bridge/helpers.js
+packages/node-bridge/source-map-support.js
+
+# middleware
 packages/middleware/src/entries.js
+
+# static-build
+packages/static-build/test/fixtures
+packages/static-build/test/build-fixtures
+packages/static-build/test/cache-fixtures
+
+# redwood
+packages/redwood/test/fixtures

.github/CONTRIBUTING.md

@@ -16,17 +16,17 @@ yarn install
 yarn bootstrap
 yarn build
 yarn lint
-yarn test
+yarn test-unit
 ```
 
 Make sure all the tests pass before making changes.
 
 ## Verifying your change
 
-Once you are done with your changes (we even suggest doing it along the way), make sure all the test still run by running:
+Once you are done with your changes (we even suggest doing it along the way), make sure all the test still pass by running:
 
 ```
-yarn build && yarn test
+yarn test-unit
 ```
 
 from the root of the project.

.github/workflows/test-integration-cli.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   test:
     name: CLI
-    timeout-minutes: 30
+    timeout-minutes: 40
     strategy:
       fail-fast: false
       matrix:

.vercelignore

@@ -6,6 +6,7 @@
 !.yarnrc
 !yarn.lock
 !package.json
+!turbo.json
 
 # api
 !api/
@@ -14,4 +15,4 @@
 # packages
 !packages/
 !packages/frameworks
-!packages/frameworks/**
+!packages/frameworks/**

DEVELOPING_A_RUNTIME.md

@@ -9,7 +9,6 @@ A Runtime is an npm module that implements the following interface:
 interface Runtime {
   version: number;
   build: (options: BuildOptions) => Promise<BuildResult>;
-  analyze?: (options: AnalyzeOptions) => Promise<string>;
   prepareCache?: (options: PrepareCacheOptions) => Promise<CacheOutputs>;
   shouldServe?: (options: ShouldServeOptions) => Promise<boolean>;
   startDevServer?: (
@@ -72,26 +71,6 @@ export async function build(options: BuildOptions) {
 }
 ```
 
-### `analyze()`
-
-An **optional** exported function that returns a unique fingerprint used for the
-purpose of [build
-de-duplication](https://vercel.com/docs/v2/platform/deployments#deduplication).
-If the `analyze()` function is not supplied, then a random fingerprint is
-assigned to each build.
-
-**Example:**
-
-```typescript
-import { AnalyzeOptions } from '@vercel/build-utils';
-
-export async function analyze(options: AnalyzeOptions) {
-  // Do calculations to generate a fingerprint based off the source code here…
-
-  return 'fingerprint goes here';
-}
-```
-
 ### `prepareCache()`
 
 An **optional** exported function that is executed after [`build()`](#build) is
@@ -328,15 +307,15 @@ This is a [class](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Refere
 
 This is an abstract enumeration type that is implemented by one of the following possible `String` values:
 
+- `nodejs14.x`
 - `nodejs12.x`
-- `nodejs10.x`
 - `go1.x`
 - `java11`
 - `python3.9`
-- `python3.6`
-- `dotnetcore2.1`
-- `ruby2.5`
-- `provided`
+- `dotnet6`
+- `dotnetcore3.1`
+- `ruby2.7`
+- `provided.al2`
 
 ## `@vercel/build-utils` Helper Functions
 

api/_lib/script/build.ts

@@ -0,0 +1,46 @@
+import fs from 'fs/promises';
+import { join } from 'path';
+import { getExampleList } from '../examples/example-list';
+import { mapOldToNew } from '../examples/map-old-to-new';
+
+const repoRoot = join(__dirname, '..', '..', '..');
+const pubDir = join(repoRoot, 'public');
+
+async function main() {
+  console.log(`Building static frontend ${repoRoot}...`);
+
+  await fs.rm(pubDir, { recursive: true, force: true });
+  await fs.mkdir(pubDir);
+
+  const examples = await getExampleList();
+  const pathListAll = join(pubDir, 'list-all.json');
+  await fs.writeFile(pathListAll, JSON.stringify(examples));
+
+  const exampleDirs = await fs.readdir(join(repoRoot, 'examples'), {
+    withFileTypes: true,
+  });
+
+  const existingExamples = exampleDirs
+    .filter(dir => dir.isDirectory())
+    .map(dir => ({
+      name: dir.name,
+      visible: true,
+      suggestions: [],
+    }));
+
+  const oldExamples = Object.keys(mapOldToNew).map(key => ({
+    name: key,
+    visible: false,
+    suggestions: mapOldToNew[key],
+  }));
+
+  const pathList = join(pubDir, 'list.json');
+  await fs.writeFile(
+    pathList,
+    JSON.stringify([...existingExamples, ...oldExamples])
+  );
+
+  console.log('Completed building static frontend.');
+}
+
+main().catch(console.error);

api/examples/list-all.ts

@@ -1,10 +0,0 @@
-import { VercelRequest, VercelResponse } from '@vercel/node';
-import { getExampleList } from '../_lib/examples/example-list';
-import { withApiHandler } from '../_lib/util/with-api-handler';
-
-export default withApiHandler(async function (
-  req: VercelRequest,
-  res: VercelResponse
-) {
-  res.status(200).json(await getExampleList());
-});

api/examples/list.ts

@@ -1,27 +0,0 @@
-import { extract } from '../_lib/examples/extract';
-import { summary } from '../_lib/examples/summary';
-import { VercelRequest, VercelResponse } from '@vercel/node';
-import { mapOldToNew } from '../_lib/examples/map-old-to-new';
-import { withApiHandler } from '../_lib/util/with-api-handler';
-
-export default withApiHandler(async function (
-  req: VercelRequest,
-  res: VercelResponse
-) {
-  await extract('https://github.com/vercel/vercel/archive/main.zip', '/tmp');
-  const exampleList = summary('/tmp/vercel-main/examples');
-
-  const existingExamples = Array.from(exampleList).map(key => ({
-    name: key,
-    visible: true,
-    suggestions: [],
-  }));
-
-  const oldExamples = Object.keys(mapOldToNew).map(key => ({
-    name: key,
-    visible: false,
-    suggestions: mapOldToNew[key],
-  }));
-
-  res.status(200).json([...existingExamples, ...oldExamples]);
-});

errors/domain-verification.md

@@ -16,4 +16,4 @@ If you would not like to verify your domain, you can remove it from your account
 
 #### Resources
 
-- [Vercel Custom Domains Documentation](https://vercel.com/docs/v2/custom-domains)
+- [Vercel Custom Domains Documentation](https://vercel.com/docs/concepts/projects/custom-domains)

errors/missing-env-file.md

@@ -2,7 +2,7 @@
 
 #### Why This Error Occurred
 
-You ran `vercel dev` inside a project that contains a `vercel.json` file with `env` or `build.env` properties that use [Vercel Secrets](https://vercel.com/docs/v2/build-step#environment-variables).
+You ran `vercel dev` inside a project that contains a `vercel.json` file with `env` or `build.env` properties that use [Vercel Secrets](https://vercel.com/docs/concepts/projects/environment-variables).
 
 In order to use environment variables in your project locally that have values defined using the Vercel Secrets format (e.g. `@my-secret-value`), you will need to provide the value as an environment variable using a `.env`.
 
@@ -24,4 +24,4 @@ TEST=value
 
 In the above example, `TEST` represents the name of the environment variable and `value` its value.
 
-For more information on Environment Variables in development, [see the documentation](https://vercel.com/docs/v2/build-step#environment-variables).
+For more information on Environment Variables in development, [see the documentation](https://vercel.com/docs/concepts/projects/environment-variables).

examples/amp/.gitignore

@@ -1 +0,0 @@
-.env

examples/amp/README.md

@@ -1,19 +0,0 @@
-# AMP Example
-
-This directory is a brief example of an [AMP](https://amp.dev/) site that can be deployed to Vercel with zero configuration.
-
-## Deploy Your Own
-
-Deploy your own AMP project with Vercel.
-
-[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https://github.com/vercel/vercel/tree/main/examples/amp)
-
-_Live Example: https://amp-template.vercel.app_
-
-### How We Created This Example
-
-To get started deploying AMP with Vercel, you can use the [Vercel CLI](https://vercel.com/download) to initialize the project:
-
-```shell
-$ vercel init amp
-```

examples/amp/index.html

@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<html ⚡>
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width,minimum-scale=1" />
-    <link rel="shortcut icon" href="favicon.png">
-    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
-    <link rel="canonical" href="index.html" />
-    <title>AMP Website</title>
-    <script async src="https://cdn.ampproject.org/v0.js"></script>
-    <style amp-custom>
-      body > * {
-        margin: 3rem 1rem;
-        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-        color: #525252;
-      }
-
-      h3 {
-        font-size: 2rem;
-      }
-
-      h4 {
-        margin-top: 2rem;
-      }
-
-      p {
-        font-size: 1.2rem;
-        line-height: 2rem;
-      }
-
-      .links {
-        display: flex;
-        justify-content: center;
-        margin-bottom: 3rem;
-      }
-
-      .links a {
-        margin: 0 10px;
-        font-size: 1rem;
-        color: #005af0;
-      }
-    </style>
-  </head>
-  <body>
-    <center>
-      <amp-img width=150 height=150 layout="fixed" class="logo" src="logo.png"></amp-img>
-      <h3>Welcome to your AMP page</h3>
-      <p>AMP is a web component framework to <br> easily create user-first websites, stories, ads and emails.</p>
-
-      <h4>Links</h4>
-      <div class="links">
-        <a href="https://amp.dev/">Homepage</a>
-        <a href="https://amp.dev/documentation/guides-and-tutorials/?format=websites">Tutorials</a>
-        <a href="https://amp.dev/documentation/examples/">Examples</a>
-        <a href="https://blog.amp.dev">Blog</a>
-      </div>
-
-      <h4>Ready to get started?</h4>
-      <div class="links">
-        <a href="https://amp.dev/documentation/guides-and-tutorials/start/create/?format=websites">Create your first AMP page</a>
-      </div>
-
-      <h4>Get involved</h4>
-      <div class="links">
-        <a href="https://twitter.com/amphtml">Twitter</a>
-        <a href="https://amphtml.slack.com">Slack</a>
-        <a href="https://amp.dev/events/amp-conf-2019">AMP Conf</a>
-        <a href="https://amp.dev/events/amp-roadshow">AMP Roadshow</a>
-      </div>
-    </center>
-  </body>
-</html>

examples/angular/README.md

@@ -10,7 +10,7 @@ Deploy your own Angular project with Vercel.
 
 [![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https://github.com/vercel/vercel/tree/main/examples/angular&template=angular)
 
-_Live Example: https://angular-now-examples.vercel.app_
+_Live Example: https://angular-template.vercel.app_
 
 ## Development server
 

examples/dojo/README.md

@@ -6,7 +6,7 @@ This directory is a brief example of a [Dojo](https://dojo.io) site that can be
 
 Deploy your own Dojo project with Vercel.
 
-[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https://github.com/vercel/vercel/tree/main/dojo&template=dojo)
+[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https://github.com/vercel/vercel/tree/main/examples/dojo&template=dojo)
 
 ### How We Created This Example
 

examples/eleventy/LICENSE.md

@@ -0,0 +1,20 @@
+MIT License
+Copyright (c) 2022 Zach Leatherman @zachleat
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

examples/eleventy/package.json

@@ -1,5 +1,19 @@
 {
   "private": true,
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/11ty/eleventy-base-blog.git"
+  },
+  "author": {
+    "name": "Zach Leatherman",
+    "email": "zachleatherman@gmail.com",
+    "url": "https://zachleat.com/"
+  },
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/11ty/eleventy-base-blog/issues"
+  },
+  "homepage": "https://github.com/11ty/eleventy-base-blog#readme",
   "scripts": {
     "build": "eleventy",
     "watch": "eleventy --watch",

examples/ionic-angular/generate-h2-push.js

@@ -56,7 +56,7 @@ async function main() {
     // if it's an empty string, just ignore it
     if (!formatted) return false;
 
-    let type = url.substr(-3) == 'css' ? 'style' : 'script';
+    let type = url.slice(-3) == 'css' ? 'style' : 'script';
     results += `</${formatted}>;rel=preload;as=${type},`;
 
   });

examples/nextjs/.gitignore

@@ -23,6 +23,7 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+.pnpm-debug.log*
 
 # local env files
 .env.local

examples/nextjs/next.config.js

@@ -1,3 +1,6 @@
-module.exports = {
+/** @type {import('next').NextConfig} */
+const nextConfig = {
   reactStrictMode: true,
 }
+
+module.exports = nextConfig

examples/nextjs/package.json

@@ -7,12 +7,12 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "next": "^12.0.8",
-    "react": "17.0.2",
-    "react-dom": "17.0.2"
+    "next": "12.1.4",
+    "react": "18.0.0",
+    "react-dom": "18.0.0"
   },
   "devDependencies": {
-    "eslint": "8.7.0",
-    "eslint-config-next": "^12.0.8"
+    "eslint": "8.12.0",
+    "eslint-config-next": "12.1.4"
   }
 }

examples/remix/app/routes/demos/about.tsx

@@ -31,7 +31,7 @@ export default function Index() {
         <p>
           Wait a sec...<em>its children</em>? To understand what we mean by
           this,{" "}
-          <a href="https://remix.run/tutorial/4-nested-routes-params">
+          <a href="https://remix.run/docs/en/v1/guides/routing">
             read all about nested routes in the docs
           </a>
           .

examples/sanity/.env.template

@@ -0,0 +1,3 @@
+# Run `vercel env pull` to generate a .env file from your Vercel project
+SANITY_STUDIO_API_PROJECT_ID=
+SANITY_STUDIO_API_DATASET=

examples/sanity/.npmignore

@@ -0,0 +1,12 @@
+# Logs
+/logs
+*.log
+
+# Coverage directory used by tools like istanbul
+/coverage
+
+# Dependency directories
+node_modules
+
+# Compiled sanity studio
+/dist

examples/sanity/README.md

@@ -0,0 +1,29 @@
+# Sanity Blogging Content Studio
+
+Congratulations, you have now installed Sanity Studio, an open source real-time content editing environment connected to the Sanity backend.
+
+Now you can do the following things:
+
+- [Read “getting started” in the docs](https://www.sanity.io/docs/introduction/getting-started?utm_source=readme)
+- Check out the example frontend: [React/Next.js](https://github.com/sanity-io/tutorial-sanity-blog-react-next)
+- [Read the blog post about this template](https://www.sanity.io/blog/build-your-own-blog-with-sanity-and-next-js?utm_source=readme)
+- [Join the community Slack](https://slack.sanity.io/?utm_source=readme)
+- [Extend and build plugins](https://www.sanity.io/docs/content-studio/extending?utm_source=readme)
+
+## Develop locally
+
+Install dependencies:
+
+```sh
+npx @sanity/cli install
+```
+
+Pull down environment variables from your Vercel project (requires the [Vercel CLI](https://vercel.com/cli)):
+
+```sh
+vercel env pull
+```
+
+
+
+You can also run `npx @sanity/init` in this repo and agree to reconfigure it. You'll then be able to select from existing projects. The CLI will update `sanity.json` with the project ID and dataset name.

examples/sanity/config/.checksums

@@ -0,0 +1,7 @@
+{
+  "#": "Used by Sanity to keep track of configuration file checksums, do not delete or modify!",
+  "@sanity/default-layout": "bb034f391ba508a6ca8cd971967cbedeb131c4d19b17b28a0895f32db5d568ea",
+  "@sanity/default-login": "6fb6d3800aa71346e1b84d95bbcaa287879456f2922372bb0294e30b968cd37f",
+  "@sanity/form-builder": "b38478227ba5e22c91981da4b53436df22e48ff25238a55a973ed620be5068aa",
+  "@sanity/data-aspects": "d199e2c199b3e26cd28b68dc84d7fc01c9186bf5089580f2e2446994d36b3cb6"
+}

examples/sanity/config/@sanity/data-aspects.json

@@ -0,0 +1,3 @@
+{
+  "listOptions": {}
+}

examples/sanity/config/@sanity/default-layout.json

@@ -0,0 +1,6 @@
+{
+  "toolSwitcher": {
+    "order": [],
+    "hidden": []
+  }
+}

examples/sanity/config/@sanity/default-login.json

@@ -0,0 +1,7 @@
+{
+  "providers": {
+    "mode": "append",
+    "redirectOnSingle": false,
+    "entries": []
+  }
+}

examples/sanity/config/@sanity/form-builder.json

@@ -0,0 +1,5 @@
+{
+  "images": {
+    "directUploads": true
+  }
+}

examples/sanity/package.json

@@ -0,0 +1,30 @@
+{
+  "name": "verceltemplateblogstudio",
+  "private": true,
+  "version": "1.0.0",
+  "description": "This is the public list of examples for **Vercel**",
+  "main": "package.json",
+  "author": "Knut Melvær <knut@sanity.io>",
+  "license": "UNLICENSED",
+  "scripts": {
+    "start": "sanity start",
+    "build": "sanity build"
+  },
+  "keywords": [
+    "sanity"
+  ],
+  "dependencies": {
+    "@sanity/core": "^2.26",
+    "@sanity/default-layout": "^2.26",
+    "@sanity/default-login": "^2.26",
+    "@sanity/desk-tool": "^2.26",
+    "@sanity/vision": "^2.26",
+    "prop-types": "^15.7",
+    "react": "^17.0",
+    "react-dom": "^17.0",
+    "styled-components": "^5.2"
+  },
+  "devDependencies": {
+    "@sanity/cli": "^2.26"
+  }
+}

examples/sanity/plugins/.gitkeep

@@ -0,0 +1 @@
+User-specific packages can be placed here

examples/sanity/sanity.json

@@ -0,0 +1,29 @@
+{
+  "root": true,
+  "project": {
+    "name": "vercel-template-blog-studio"
+  },
+  "api": {
+    "projectId": "YOUR_PROJECT_ID",
+    "dataset": "YOUR_DATASET_NAME"
+  },
+  "plugins": [
+    "@sanity/base",
+    "@sanity/default-layout",
+    "@sanity/default-login",
+    "@sanity/desk-tool"
+  ],
+  "env": {
+    "development": {
+      "plugins": [
+        "@sanity/vision"
+      ]
+    }
+  },
+  "parts": [
+    {
+      "name": "part:@sanity/base/schema",
+      "path": "./schemas/schema"
+    }
+  ]
+}

examples/sanity/schemas/author.js

@@ -0,0 +1,48 @@
+export default {
+  name: 'author',
+  title: 'Author',
+  type: 'document',
+  fields: [
+    {
+      name: 'name',
+      title: 'Name',
+      type: 'string',
+    },
+    {
+      name: 'slug',
+      title: 'Slug',
+      type: 'slug',
+      options: {
+        source: 'name',
+        maxLength: 96,
+      },
+    },
+    {
+      name: 'image',
+      title: 'Image',
+      type: 'image',
+      options: {
+        hotspot: true,
+      },
+    },
+    {
+      name: 'bio',
+      title: 'Bio',
+      type: 'array',
+      of: [
+        {
+          title: 'Block',
+          type: 'block',
+          styles: [{title: 'Normal', value: 'normal'}],
+          lists: [],
+        },
+      ],
+    },
+  ],
+  preview: {
+    select: {
+      title: 'name',
+      media: 'image',
+    },
+  },
+}

examples/sanity/schemas/blockContent.js

@@ -0,0 +1,65 @@
+/**
+ * This is the schema definition for the rich text fields used for
+ * for this blog studio. When you import it in schemas.js it can be
+ * reused in other parts of the studio with:
+ *  {
+ *    name: 'someName',
+ *    title: 'Some title',
+ *    type: 'blockContent'
+ *  }
+ */
+export default {
+  title: 'Block Content',
+  name: 'blockContent',
+  type: 'array',
+  of: [
+    {
+      title: 'Block',
+      type: 'block',
+      // Styles let you set what your user can mark up blocks with. These
+      // correspond with HTML tags, but you can set any title or value
+      // you want and decide how you want to deal with it where you want to
+      // use your content.
+      styles: [
+        {title: 'Normal', value: 'normal'},
+        {title: 'H1', value: 'h1'},
+        {title: 'H2', value: 'h2'},
+        {title: 'H3', value: 'h3'},
+        {title: 'H4', value: 'h4'},
+        {title: 'Quote', value: 'blockquote'},
+      ],
+      lists: [{title: 'Bullet', value: 'bullet'}],
+      // Marks let you mark up inline text in the block editor.
+      marks: {
+        // Decorators usually describe a single property – e.g. a typographic
+        // preference or highlighting by editors.
+        decorators: [
+          {title: 'Strong', value: 'strong'},
+          {title: 'Emphasis', value: 'em'},
+        ],
+        // Annotations can be any object structure – e.g. a link or a footnote.
+        annotations: [
+          {
+            title: 'URL',
+            name: 'link',
+            type: 'object',
+            fields: [
+              {
+                title: 'URL',
+                name: 'href',
+                type: 'url',
+              },
+            ],
+          },
+        ],
+      },
+    },
+    // You can add additional types here. Note that you can't use
+    // primitive types such as 'string' and 'number' in the same array
+    // as a block type.
+    {
+      type: 'image',
+      options: {hotspot: true},
+    },
+  ],
+}

examples/sanity/schemas/category.js

@@ -0,0 +1,17 @@
+export default {
+  name: 'category',
+  title: 'Category',
+  type: 'document',
+  fields: [
+    {
+      name: 'title',
+      title: 'Title',
+      type: 'string',
+    },
+    {
+      name: 'description',
+      title: 'Description',
+      type: 'text',
+    },
+  ],
+}

examples/sanity/schemas/post.js

@@ -0,0 +1,65 @@
+export default {
+  name: 'post',
+  title: 'Post',
+  type: 'document',
+  fields: [
+    {
+      name: 'title',
+      title: 'Title',
+      type: 'string',
+    },
+    {
+      name: 'slug',
+      title: 'Slug',
+      type: 'slug',
+      options: {
+        source: 'title',
+        maxLength: 96,
+      },
+    },
+    {
+      name: 'author',
+      title: 'Author',
+      type: 'reference',
+      to: {type: 'author'},
+    },
+    {
+      name: 'mainImage',
+      title: 'Main image',
+      type: 'image',
+      options: {
+        hotspot: true,
+      },
+    },
+    {
+      name: 'categories',
+      title: 'Categories',
+      type: 'array',
+      of: [{type: 'reference', to: {type: 'category'}}],
+    },
+    {
+      name: 'publishedAt',
+      title: 'Published at',
+      type: 'datetime',
+    },
+    {
+      name: 'body',
+      title: 'Body',
+      type: 'blockContent',
+    },
+  ],
+
+  preview: {
+    select: {
+      title: 'title',
+      author: 'author.name',
+      media: 'mainImage',
+    },
+    prepare(selection) {
+      const {author} = selection
+      return Object.assign({}, selection, {
+        subtitle: author && `by ${author}`,
+      })
+    },
+  },
+}

examples/sanity/schemas/schema.js

@@ -0,0 +1,29 @@
+// First, we must import the schema creator
+import createSchema from 'part:@sanity/base/schema-creator'
+
+// Then import schema types from any plugins that might expose them
+import schemaTypes from 'all:part:@sanity/base/schema-type'
+
+// We import object and document schemas
+import blockContent from './blockContent'
+import category from './category'
+import post from './post'
+import author from './author'
+
+// Then we give our schema to the builder and provide the result to Sanity
+export default createSchema({
+  // We name our schema
+  name: 'default',
+  // Then proceed to concatenate our document type
+  // to the ones provided by any plugins that are installed
+  types: schemaTypes.concat([
+    // The following are document types which will appear
+    // in the studio.
+    post,
+    author,
+    category,
+    // When added to this list, object types can be used as
+    // { type: 'typename' } in other document schemas
+    blockContent,
+  ]),
+})

examples/sanity/static/.gitkeep

@@ -0,0 +1 @@
+Files placed here will be served by the Sanity server under the `/static`-prefix

examples/sanity/tsconfig.json

@@ -0,0 +1,6 @@
+{
+  // Note: This config is only used to help editors like VS Code understand/resolve
+  // parts, the actual transpilation is done by babel. Any compiler configuration in
+  // here will be ignored.
+  "include": ["./node_modules/@sanity/base/types/**/*.ts", "./**/*.ts", "./**/*.tsx"]
+}

examples/stencil/src/components/app-profile/app-profile.tsx

@@ -11,7 +11,7 @@ export class AppProfile {
 
   normalize(name: string): string {
     if (name) {
-      return name.substr(0, 1).toUpperCase() + name.substr(1).toLowerCase();
+      return name.slice(0, 1).toUpperCase() + name.slice(1).toLowerCase();
     }
     return '';
   }

examples/sveltekit/package.json

@@ -1,5 +1,7 @@
 {
   "private": true,
+  "name": "sveltekit",
+  "version": "0.0.1",
   "scripts": {
     "dev": "svelte-kit dev",
     "build": "svelte-kit build",
@@ -9,7 +11,7 @@
   "devDependencies": {
     "@sveltejs/adapter-auto": "next",
     "@sveltejs/kit": "next",
-    "svelte": "^3.44.0"
+    "svelte": "^3.46.0"
   },
   "type": "module",
   "dependencies": {

examples/sveltekit/src/app.html

@@ -8,6 +8,6 @@
 		%svelte.head%
 	</head>
 	<body>
-		<div id="svelte">%svelte.body%</div>
+		<div>%svelte.body%</div>
 	</body>
 </html>

examples/sveltekit/src/global.d.ts

@@ -1 +0,0 @@
-/// <reference types="@sveltejs/kit" />

examples/sveltekit/src/hooks.js

@@ -1,19 +1,22 @@
 import cookie from 'cookie';
 import { v4 as uuid } from '@lukeed/uuid';
 
-export const handle = async ({ request, resolve }) => {
-	const cookies = cookie.parse(request.headers.cookie || '');
-	request.locals.userid = cookies.userid || uuid();
+export const handle = async ({ event, resolve }) => {
+	const cookies = cookie.parse(event.request.headers.get('cookie') || '');
+	event.locals.userid = cookies.userid || uuid();
 
-	const response = await resolve(request);
+	const response = await resolve(event);
 
 	if (!cookies.userid) {
 		// if this is the first time the user has visited this app,
 		// set a cookie so that we recognise them when they return
-		response.headers['set-cookie'] = cookie.serialize('userid', request.locals.userid, {
-			path: '/',
-			httpOnly: true
-		});
+		response.headers.set(
+			'set-cookie',
+			cookie.serialize('userid', event.locals.userid, {
+				path: '/',
+				httpOnly: true
+			})
+		);
 	}
 
 	return response;

examples/sveltekit/src/lib/Counter.svelte

@@ -22,7 +22,7 @@
 
 	<div class="counter-viewport">
 		<div class="counter-digits" style="transform: translate(0, {100 * offset}%)">
-			<strong style="top: -100%" aria-hidden="true">{Math.floor($displayed_count + 1)}</strong>
+			<strong class="hidden" aria-hidden="true">{Math.floor($displayed_count + 1)}</strong>
 			<strong>{Math.floor($displayed_count)}</strong>
 		</div>
 	</div>
@@ -94,4 +94,9 @@
 		width: 100%;
 		height: 100%;
 	}
+
+	.hidden {
+		top: -100%;
+		user-select: none;
+	}
 </style>

examples/sveltekit/src/lib/form.js

@@ -1,6 +1,8 @@
+import { invalidate } from '$app/navigation';
+
 // this action (https://svelte.dev/tutorial/actions) allows us to
 // progressively enhance a <form> that already works without JS
-export function enhance(form, { pending, error, result }) {
+export function enhance(form, { pending, error, result } = {}) {
 	let current_token;
 
 	async function handle_submit(e) {
@@ -8,31 +10,35 @@ export function enhance(form, { pending, error, result }) {
 
 		e.preventDefault();
 
-		const body = new FormData(form);
+		const data = new FormData(form);
 
-		if (pending) pending(body, form);
+		if (pending) pending({ data, form });
 
 		try {
-			const res = await fetch(form.action, {
+			const response = await fetch(form.action, {
 				method: form.method,
 				headers: {
 					accept: 'application/json'
 				},
-				body
+				body: data
 			});
 
 			if (token !== current_token) return;
 
-			if (res.ok) {
-				result(res, form);
+			if (response.ok) {
+				if (result) result({ data, form, response });
+
+				const url = new URL(form.action);
+				url.search = url.hash = '';
+				invalidate(url.href);
 			} else if (error) {
-				error(res, null, form);
+				error({ data, form, error: null, response });
 			} else {
-				console.error(await res.text());
+				console.error(await response.text());
 			}
 		} catch (e) {
 			if (error) {
-				error(null, e, form);
+				error({ data, form, error: e, response: null });
 			} else {
 				throw e;
 			}

examples/sveltekit/src/routes/todos/[uid].json.js

@@ -1,14 +0,0 @@
-import { api } from './_api';
-
-// PATCH /todos/:uid.json
-export const patch = async (request) => {
-	return api(request, `todos/${request.locals.userid}/${request.params.uid}`, {
-		text: request.body.get('text'),
-		done: request.body.has('done') ? !!request.body.get('done') : undefined
-	});
-};
-
-// DELETE /todos/:uid.json
-export const del = async (request) => {
-	return api(request, `todos/${request.locals.userid}/${request.params.uid}`);
-};

examples/sveltekit/src/routes/todos/_api.js

@@ -1,6 +1,6 @@
 /*
-	This module is used by the /todos.json and /todos/[uid].json
-	endpoints to make calls to api.svelte.dev, which stores todos
+	This module is used by the /todos endpoint to
+	make calls to api.svelte.dev, which stores todos
 	for each user. The leading underscore indicates that this is
 	a private module, _not_ an endpoint — visiting /todos/_api
 	will net you a 404 response.
@@ -11,35 +11,12 @@
 
 const base = 'https://api.svelte.dev';
 
-export async function api(request, resource, data) {
-	// user must have a cookie set
-	if (!request.locals.userid) {
-		return { status: 401 };
-	}
-
-	const res = await fetch(`${base}/${resource}`, {
-		method: request.method,
+export function api(method, resource, data) {
+	return fetch(`${base}/${resource}`, {
+		method,
 		headers: {
 			'content-type': 'application/json'
 		},
 		body: data && JSON.stringify(data)
 	});
-
-	// if the request came from a <form> submission, the browser's default
-	// behaviour is to show the URL corresponding to the form's "action"
-	// attribute. in those cases, we want to redirect them back to the
-	// /todos page, rather than showing the response
-	if (res.ok && request.method !== 'GET' && request.headers.accept !== 'application/json') {
-		return {
-			status: 303,
-			headers: {
-				location: '/todos'
-			}
-		};
-	}
-
-	return {
-		status: res.status,
-		body: await res.json()
-	};
 }

examples/sveltekit/src/routes/todos/index.js

@@ -0,0 +1,66 @@
+import { api } from './_api';
+
+export const get = async ({ locals }) => {
+	// locals.userid comes from src/hooks.js
+	const response = await api('get', `todos/${locals.userid}`);
+
+	if (response.status === 404) {
+		// user hasn't created a todo list.
+		// start with an empty array
+		return {
+			body: {
+				todos: []
+			}
+		};
+	}
+
+	if (response.status === 200) {
+		return {
+			body: {
+				todos: await response.json()
+			}
+		};
+	}
+
+	return {
+		status: response.status
+	};
+};
+
+export const post = async ({ request, locals }) => {
+	const form = await request.formData();
+
+	await api('post', `todos/${locals.userid}`, {
+		text: form.get('text')
+	});
+
+	return {};
+};
+
+// If the user has JavaScript disabled, the URL will change to
+// include the method override unless we redirect back to /todos
+const redirect = {
+	status: 303,
+	headers: {
+		location: '/todos'
+	}
+};
+
+export const patch = async ({ request, locals }) => {
+	const form = await request.formData();
+
+	await api('patch', `todos/${locals.userid}/${form.get('uid')}`, {
+		text: form.has('text') ? form.get('text') : undefined,
+		done: form.has('done') ? !!form.get('done') : undefined
+	});
+
+	return redirect;
+};
+
+export const del = async ({ request, locals }) => {
+	const form = await request.formData();
+
+	await api('delete', `todos/${locals.userid}/${form.get('uid')}`);
+
+	return redirect;
+};

examples/sveltekit/src/routes/todos/index.json.js

@@ -1,28 +0,0 @@
-import { api } from './_api';
-
-// GET /todos.json
-export const get = async (request) => {
-	// request.locals.userid comes from src/hooks.js
-	const response = await api(request, `todos/${request.locals.userid}`);
-
-	if (response.status === 404) {
-		// user hasn't created a todo list.
-		// start with an empty array
-		return { body: [] };
-	}
-
-	return response;
-};
-
-// POST /todos.json
-export const post = async (request) => {
-	const response = await api(request, `todos/${request.locals.userid}`, {
-		// because index.svelte posts a FormData object,
-		// request.body is _also_ a (readonly) FormData
-		// object, which allows us to get form data
-		// with the `body.get(key)` method
-		text: request.body.get('text')
-	});
-
-	return response;
-};

examples/sveltekit/src/routes/todos/index.svelte

@@ -1,40 +1,9 @@
-<script context="module">
-	import { enhance } from '$lib/form';
-
-	// see https://kit.svelte.dev/docs#loading
-	export const load = async ({ fetch }) => {
-		const res = await fetch('/todos.json');
-
-		if (res.ok) {
-			const todos = await res.json();
-
-			return {
-				props: { todos }
-			};
-		}
-
-		const { message } = await res.json();
-
-		return {
-			error: new Error(message)
-		};
-	};
-</script>
-
 <script>
+	import { enhance } from '$lib/form';
 	import { scale } from 'svelte/transition';
 	import { flip } from 'svelte/animate';
 
 	export let todos;
-
-	async function patch(res) {
-		const todo = await res.json();
-
-		todos = todos.map((t) => {
-			if (t.uid === todo.uid) return todo;
-			return t;
-		});
-	}
 </script>
 
 <svelte:head>
@@ -46,13 +15,10 @@
 
 	<form
 		class="new"
-		action="/todos.json"
+		action="/todos"
 		method="post"
 		use:enhance={{
-			result: async (res, form) => {
-				const created = await res.json();
-				todos = [...todos, created];
-
+			result: async ({ form }) => {
 				form.reset();
 			}
 		}}
@@ -68,41 +34,33 @@
 			animate:flip={{ duration: 200 }}
 		>
 			<form
-				action="/todos/{todo.uid}.json?_method=PATCH"
+				action="/todos?_method=PATCH"
 				method="post"
 				use:enhance={{
-					pending: (data) => {
+					pending: ({ data }) => {
 						todo.done = !!data.get('done');
-					},
-					result: patch
+					}
 				}}
 			>
+				<input type="hidden" name="uid" value={todo.uid} />
 				<input type="hidden" name="done" value={todo.done ? '' : 'true'} />
 				<button class="toggle" aria-label="Mark todo as {todo.done ? 'not done' : 'done'}" />
 			</form>
 
-			<form
-				class="text"
-				action="/todos/{todo.uid}.json?_method=PATCH"
-				method="post"
-				use:enhance={{
-					result: patch
-				}}
-			>
+			<form class="text" action="/todos?_method=PATCH" method="post" use:enhance>
+				<input type="hidden" name="uid" value={todo.uid} />
 				<input aria-label="Edit todo" type="text" name="text" value={todo.text} />
 				<button class="save" aria-label="Save todo" />
 			</form>
 
 			<form
-				action="/todos/{todo.uid}.json?_method=DELETE"
+				action="/todos?_method=DELETE"
 				method="post"
 				use:enhance={{
-					pending: () => (todo.pending_delete = true),
-					result: () => {
-						todos = todos.filter((t) => t.uid !== todo.uid);
-					}
+					pending: () => (todo.pending_delete = true)
 				}}
 			>
+				<input type="hidden" name="uid" value={todo.uid} />
 				<button class="delete" aria-label="Delete todo" disabled={todo.pending_delete} />
 			</form>
 		</div>
@@ -158,7 +116,7 @@
 	.done {
 		transform: none;
 		opacity: 0.4;
-		filter: drop-shadow(0px 0px 1px rgba(0, 0, 0, 0.1));
+		filter: drop-shadow(0 0 1px rgba(0, 0, 0, 0.1));
 	}
 
 	form.text {

examples/sveltekit/svelte.config.js

@@ -5,8 +5,10 @@ const config = {
 	kit: {
 		adapter: adapter(),
 
-		// hydrate the <div id="svelte"> element in src/app.html
-		target: '#svelte'
+		// Override http methods in the Todo forms
+		methodOverride: {
+			allowed: ['PATCH', 'DELETE']
+		}
 	}
 };
 

package.json

@@ -14,25 +14,11 @@
   "dependencies": {
     "lerna": "3.16.4"
   },
-  "turbo": {
-    "baseBranch": "origin/main",
-    "pipeline": {
-      "build": {
-        "dependsOn": [
-          "^build"
-        ],
-        "outputs": [
-          "dist/**"
-        ]
-      }
-    }
-  },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "4.28.0",
     "@typescript-eslint/parser": "4.28.0",
     "async-retry": "1.2.3",
     "buffer-replace": "1.0.0",
-    "cheerio": "1.0.0-rc.3",
     "eslint": "7.29.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-jest": "24.3.6",
@@ -43,8 +29,9 @@
     "node-fetch": "2.6.1",
     "npm-package-arg": "6.1.0",
     "prettier": "2.3.1",
+    "ts-eager": "2.0.2",
     "ts-jest": "27.0.4",
-    "turbo": "1.0.18"
+    "turbo": "1.2.2"
   },
   "scripts": {
     "lerna": "lerna",
@@ -54,9 +41,10 @@
     "publish-from-github": "./utils/publish.sh",
     "changelog": "node utils/changelog.js",
     "build": "turbo run build",
-    "vercel-build": "mkdir -p public && echo '<a href=\"https://vercel.com/import\">Import</a>' > public/output.html",
+    "vercel-build": "yarn build && cd api && node -r ts-eager/register ./_lib/script/build.ts",
     "pre-commit": "lint-staged",
-    "test-unit": "node utils/run.js test-unit",
+    "test": "jest --rootDir=\"test\" --testPathPattern=\"\\.test.js\"",
+    "test-unit": "yarn test && node utils/run.js test-unit",
     "test-integration-cli": "node utils/run.js test-integration-cli",
     "test-integration-once": "node utils/run.js test-integration-once",
     "test-integration-dev": "node utils/run.js test-integration-dev",
@@ -102,6 +90,14 @@
       "es6": true
     },
     "rules": {
+      "no-restricted-syntax": [
+        "warn",
+        "WithStatement",
+        {
+          "message": "substr() is deprecated, use slice() or substring() instead",
+          "selector": "MemberExpression > Identifier[name='substr']"
+        }
+      ],
       "require-atomic-updates": 0,
       "@typescript-eslint/ban-ts-comment": 0,
       "@typescript-eslint/camelcase": 0,

packages/build-utils/.npmignore

@@ -1,3 +1,6 @@
 /src
 /test
-tmp
+/tsconfig.json
+/.turbo
+/jest.config.js
+tmp

packages/build-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.14.0",
+  "version": "2.15.2-canary.3",
   "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.6.0",
+    "@vercel/frameworks": "0.7.2-canary.0",
     "@vercel/ncc": "0.24.0",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",

packages/build-utils/src/detect-builders.ts

@@ -67,8 +67,7 @@ function getPublicBuilder(
       typeof builder.src === 'string' &&
       isOfficialRuntime('static', builder.use) &&
       /^.*\/\*\*\/\*$/.test(builder.src) &&
-      builder.config &&
-      builder.config.zeroConfig === true
+      builder.config?.zeroConfig === true
     ) {
       return builder as Builder & { src: string };
     }
@@ -539,7 +538,7 @@ function getMissingBuildScriptError() {
     code: 'missing_build_script',
     message:
       'Your `package.json` file is missing a `build` property inside the `scripts` property.' +
-      '\nLearn More: https://vercel.com/docs/v2/platform/frequently-asked-questions#missing-build-script',
+      '\nLearn More: https://vercel.link/missing-build-script',
   };
 }
 

packages/build-utils/src/edge-function.ts

@@ -0,0 +1,44 @@
+import type { Files } from './types';
+
+/**
+ * An Edge Functions output
+ */
+export class EdgeFunction {
+  type: 'EdgeFunction';
+
+  /**
+   * A display name for the edge function.
+   */
+  name: string;
+
+  /**
+   * The deployment target.
+   * Only v8-worker is currently supported.
+   */
+  deploymentTarget: 'v8-worker';
+
+  /**
+   * The entrypoint for the edge function.
+   */
+  entrypoint: string;
+
+  /**
+   * The list of files to be included in the edge function bundle.
+   */
+  files: Files;
+
+  /**
+   * Extra environment variables in use for the user code, to be
+   * assigned to the edge function.
+   */
+  envVarsInUse?: string[];
+
+  constructor(params: Omit<EdgeFunction, 'type'>) {
+    this.type = 'EdgeFunction';
+    this.name = params.name;
+    this.deploymentTarget = params.deploymentTarget;
+    this.entrypoint = params.entrypoint;
+    this.files = params.files;
+    this.envVarsInUse = params.envVarsInUse;
+  }
+}

packages/build-utils/src/file-blob.ts

@@ -1,6 +1,6 @@
 import assert from 'assert';
 import intoStream from 'into-stream';
-import { File } from './types';
+import { FileBase } from './types';
 
 interface FileBlobOptions {
   mode?: number;
@@ -14,7 +14,7 @@ interface FromStreamOptions {
   stream: NodeJS.ReadableStream;
 }
 
-export default class FileBlob implements File {
+export default class FileBlob implements FileBase {
   public type: 'FileBlob';
   public mode: number;
   public data: string | Buffer;
@@ -48,6 +48,10 @@ export default class FileBlob implements File {
     return new FileBlob({ mode, contentType, data });
   }
 
+  async toStreamAsync(): Promise<NodeJS.ReadableStream> {
+    return this.toStream();
+  }
+
   toStream(): NodeJS.ReadableStream {
     return intoStream(this.data);
   }

packages/build-utils/src/file-fs-ref.ts

@@ -3,7 +3,7 @@ import fs from 'fs-extra';
 import multiStream from 'multistream';
 import path from 'path';
 import Sema from 'async-sema';
-import { File } from './types';
+import { FileBase } from './types';
 
 const semaToPreventEMFILE = new Sema(20);
 
@@ -20,7 +20,7 @@ interface FromStreamOptions {
   fsPath: string;
 }
 
-class FileFsRef implements File {
+class FileFsRef implements FileBase {
   public type: 'FileFsRef';
   public mode: number;
   public fsPath: string;

packages/build-utils/src/file-ref.ts

@@ -3,7 +3,7 @@ import fetch from 'node-fetch';
 import multiStream from 'multistream';
 import retry from 'async-retry';
 import Sema from 'async-sema';
-import { File } from './types';
+import { FileBase } from './types';
 
 interface FileRefOptions {
   mode?: number;
@@ -23,7 +23,7 @@ class BailableError extends Error {
   }
 }
 
-export default class FileRef implements File {
+export default class FileRef implements FileBase {
   public type: 'FileRef';
   public mode: number;
   public digest: string;

packages/build-utils/src/fs/download.ts

@@ -3,6 +3,7 @@ import debug from '../debug';
 import FileFsRef from '../file-fs-ref';
 import { File, Files, Meta } from '../types';
 import { remove, mkdirp, readlink, symlink } from 'fs-extra';
+import streamToBuffer from './stream-to-buffer';
 
 export interface DownloadedFiles {
   [filePath: string]: FileFsRef;
@@ -15,19 +16,44 @@ export function isSymbolicLink(mode: number): boolean {
   return (mode & S_IFMT) === S_IFLNK;
 }
 
+async function prepareSymlinkTarget(
+  file: File,
+  fsPath: string
+): Promise<string> {
+  const mkdirPromise = mkdirp(path.dirname(fsPath));
+  if (file.type === 'FileFsRef') {
+    const [target] = await Promise.all([readlink(file.fsPath), mkdirPromise]);
+    return target;
+  }
+
+  if (file.type === 'FileRef' || file.type === 'FileBlob') {
+    const targetPathBufferPromise = await streamToBuffer(
+      await file.toStreamAsync()
+    );
+    const [targetPathBuffer] = await Promise.all([
+      targetPathBufferPromise,
+      mkdirPromise,
+    ]);
+    return targetPathBuffer.toString('utf8');
+  }
+
+  throw new Error(
+    `file.type "${(file as any).type}" not supported for symlink`
+  );
+}
+
 async function downloadFile(file: File, fsPath: string): Promise<FileFsRef> {
   const { mode } = file;
-  if (mode && isSymbolicLink(mode) && file.type === 'FileFsRef') {
-    const [target] = await Promise.all([
-      readlink((file as FileFsRef).fsPath),
-      mkdirp(path.dirname(fsPath)),
-    ]);
+
+  if (isSymbolicLink(mode)) {
+    const target = await prepareSymlinkTarget(file, fsPath);
+
     await symlink(target, fsPath);
     return FileFsRef.fromFsPath({ mode, fsPath });
-  } else {
-    const stream = file.toStream();
-    return FileFsRef.fromStream({ mode, stream, fsPath });
   }
+
+  const stream = file.toStream();
+  return FileFsRef.fromStream({ mode, stream, fsPath });
 }
 
 async function removeFile(basePath: string, fileMatched: string) {

packages/build-utils/src/fs/glob.ts

@@ -46,8 +46,8 @@ export default async function glob(
   const files = await vanillaGlob(pattern, options);
 
   for (const relativePath of files) {
-    const fsPath = normalizePath(path.join(options.cwd!, relativePath));
-    let stat: Stats = options.statCache![fsPath] as Stats;
+    const fsPath = normalizePath(path.join(options.cwd, relativePath));
+    let stat: Stats = options.statCache[fsPath] as Stats;
     assert(
       stat,
       `statCache does not contain value for ${relativePath} (resolved to ${fsPath})`

packages/build-utils/src/fs/node-version.ts

@@ -44,6 +44,10 @@ export async function getSupportedNodeVersion(
 ): Promise<NodeVersion> {
   let selection: NodeVersion = getLatestNodeVersion();
 
+  if (process.env.ENABLE_EXPERIMENTAL_NODE16 === '1') {
+    return { major: 16, range: '16.x', runtime: 'nodejs16.x' };
+  }
+
   if (engineRange) {
     const found =
       validRange(engineRange) &&

packages/build-utils/src/fs/run-user-scripts.ts

@@ -1,21 +1,31 @@
 import assert from 'assert';
 import fs from 'fs-extra';
 import path from 'path';
-import debug from '../debug';
+import Sema from 'async-sema';
 import spawn from 'cross-spawn';
 import { SpawnOptions } from 'child_process';
 import { deprecate } from 'util';
+import debug from '../debug';
 import { NowBuildError } from '../errors';
 import { Meta, PackageJson, NodeVersion, Config } from '../types';
 import { getSupportedNodeVersion, getLatestNodeVersion } from './node-version';
+import { readConfigFile } from './read-config-file';
 
-export type CliType = 'yarn' | 'npm';
+// Only allow one `runNpmInstall()` invocation to run concurrently
+const runNpmInstallSema = new Sema(1);
+
+export type CliType = 'yarn' | 'npm' | 'pnpm';
 
 export interface ScanParentDirsResult {
   /**
-   * "yarn" or "npm", depending on the presence of lockfiles.
+   * "yarn", "npm", or "pnpm" depending on the presence of lockfiles.
    */
   cliType: CliType;
+  /**
+   * The file path of found `package.json` file, or `undefined` if none was
+   * found.
+   */
+  packageJsonPath?: string;
   /**
    * The contents of found `package.json` file, when the `readPackageJson`
    * option is enabled.
@@ -236,12 +246,13 @@ export async function scanParentDirs(
 
   let cliType: CliType = 'yarn';
   let packageJson: PackageJson | undefined;
+  let packageJsonPath: string | undefined;
   let currentDestPath = destPath;
   let lockfileVersion: number | undefined;
 
   // eslint-disable-next-line no-constant-condition
   while (true) {
-    const packageJsonPath = path.join(currentDestPath, 'package.json');
+    packageJsonPath = path.join(currentDestPath, 'package.json');
     // eslint-disable-next-line no-await-in-loop
     if (await fs.pathExists(packageJsonPath)) {
       // Only read the contents of the *first* `package.json` file found,
@@ -252,7 +263,7 @@ export async function scanParentDirs(
       }
 
       // eslint-disable-next-line no-await-in-loop
-      const [packageLockJson, hasYarnLock] = await Promise.all([
+      const [packageLockJson, hasYarnLock, pnpmLockYaml] = await Promise.all([
         fs
           .readJson(path.join(currentDestPath, 'package-lock.json'))
           .catch(error => {
@@ -263,17 +274,26 @@ export async function scanParentDirs(
             throw error;
           }),
         fs.pathExists(path.join(currentDestPath, 'yarn.lock')),
+        readConfigFile<{ lockfileVersion: number }>(
+          path.join(currentDestPath, 'pnpm-lock.yaml')
+        ),
       ]);
 
-      if (packageLockJson && !hasYarnLock) {
+      if (packageLockJson && !hasYarnLock && !pnpmLockYaml) {
         cliType = 'npm';
         lockfileVersion = packageLockJson.lockfileVersion;
       }
 
+      if (!packageLockJson && !hasYarnLock && pnpmLockYaml) {
+        cliType = 'pnpm';
+        // just ensure that it is read as a number and not a string
+        lockfileVersion = Number(pnpmLockYaml.lockfileVersion);
+      }
+
       // Only stop iterating if a lockfile was found, because it's possible
       // that the lockfile is in a higher path than where the `package.json`
       // file was found.
-      if (packageLockJson || hasYarnLock) {
+      if (packageLockJson || hasYarnLock || pnpmLockYaml) {
         break;
       }
     }
@@ -283,7 +303,7 @@ export async function scanParentDirs(
     currentDestPath = newDestPath;
   }
 
-  return { cliType, packageJson, lockfileVersion };
+  return { cliType, packageJson, lockfileVersion, packageJsonPath };
 }
 
 export async function walkParentDirs({
@@ -309,48 +329,87 @@ export async function walkParentDirs({
   return null;
 }
 
+function isSet<T>(v: any): v is Set<T> {
+  return v?.constructor?.name === 'Set';
+}
+
 export async function runNpmInstall(
   destPath: string,
   args: string[] = [],
   spawnOpts?: SpawnOptions,
   meta?: Meta,
   nodeVersion?: NodeVersion
-) {
+): Promise<boolean> {
   if (meta?.isDev) {
     debug('Skipping dependency installation because dev mode is enabled');
-    return;
+    return false;
   }
 
   assert(path.isAbsolute(destPath));
-  debug(`Installing to ${destPath}`);
 
-  const { cliType, lockfileVersion } = await scanParentDirs(destPath);
-  const opts: SpawnOptionsExtended = { cwd: destPath, ...spawnOpts };
-  const env = opts.env ? { ...opts.env } : { ...process.env };
-  delete env.NODE_ENV;
-  opts.env = getEnvForPackageManager({
-    cliType,
-    lockfileVersion,
-    nodeVersion,
-    env,
-  });
-  let commandArgs: string[];
+  try {
+    await runNpmInstallSema.acquire();
+    const { cliType, packageJsonPath, lockfileVersion } = await scanParentDirs(
+      destPath
+    );
 
-  if (cliType === 'npm') {
-    opts.prettyCommand = 'npm install';
-    commandArgs = args
-      .filter(a => a !== '--prefer-offline')
-      .concat(['install', '--no-audit', '--unsafe-perm']);
-  } else {
-    opts.prettyCommand = 'yarn install';
-    commandArgs = ['install', ...args];
+    // Only allow `runNpmInstall()` to run once per `package.json`
+    // when doing a default install (no additional args)
+    if (meta && packageJsonPath && args.length === 0) {
+      if (!isSet<string>(meta.runNpmInstallSet)) {
+        meta.runNpmInstallSet = new Set<string>();
+      }
+      if (isSet<string>(meta.runNpmInstallSet)) {
+        if (meta.runNpmInstallSet.has(packageJsonPath)) {
+          return false;
+        } else {
+          meta.runNpmInstallSet.add(packageJsonPath);
+        }
+      }
+    }
+
+    const installTime = Date.now();
+    console.log('Installing dependencies...');
+    debug(`Installing to ${destPath}`);
+
+    const opts: SpawnOptionsExtended = { cwd: destPath, ...spawnOpts };
+    const env = opts.env ? { ...opts.env } : { ...process.env };
+    delete env.NODE_ENV;
+    opts.env = getEnvForPackageManager({
+      cliType,
+      lockfileVersion,
+      nodeVersion,
+      env,
+    });
+    let commandArgs: string[];
+
+    if (cliType === 'npm') {
+      opts.prettyCommand = 'npm install';
+      commandArgs = args
+        .filter(a => a !== '--prefer-offline')
+        .concat(['install', '--no-audit', '--unsafe-perm']);
+    } else if (cliType === 'pnpm') {
+      // PNPM's install command is similar to NPM's but without the audit nonsense
+      // @see options https://pnpm.io/cli/install
+      opts.prettyCommand = 'pnpm install';
+      commandArgs = args
+        .filter(a => a !== '--prefer-offline')
+        .concat(['install', '--unsafe-perm']);
+    } else {
+      opts.prettyCommand = 'yarn install';
+      commandArgs = ['install', ...args];
+    }
+
+    if (process.env.NPM_ONLY_PRODUCTION) {
+      commandArgs.push('--production');
+    }
+
+    await spawnAsync(cliType, commandArgs, opts);
+    debug(`Install complete [${Date.now() - installTime}ms]`);
+    return true;
+  } finally {
+    runNpmInstallSema.release();
   }
-
-  if (process.env.NPM_ONLY_PRODUCTION) {
-    commandArgs.push('--production');
-  }
-
-  return spawnAsync(cliType, commandArgs, opts);
 }
 
 export function getEnvForPackageManager({
@@ -448,6 +507,8 @@ export async function runPackageJsonScript(
 
   if (cliType === 'npm') {
     opts.prettyCommand = `npm run ${scriptName}`;
+  } else if (cliType === 'pnpm') {
+    opts.prettyCommand = `pnpm run ${scriptName}`;
   } else {
     opts.prettyCommand = `yarn run ${scriptName}`;
   }

packages/build-utils/src/index.ts

@@ -81,6 +81,7 @@ export {
   getIgnoreFilter,
 };
 
+export { EdgeFunction } from './edge-function';
 export {
   detectBuilders,
   detectOutputDirectory,

packages/build-utils/src/lambda.ts

@@ -3,17 +3,17 @@ import Sema from 'async-sema';
 import { ZipFile } from 'yazl';
 import minimatch from 'minimatch';
 import { readlink } from 'fs-extra';
-import { Files, Config } from './types';
-import FileFsRef from './file-fs-ref';
 import { isSymbolicLink } from './fs/download';
 import streamToBuffer from './fs/stream-to-buffer';
+import type { Files, Config } from './types';
 
 interface Environment {
   [key: string]: string;
 }
 
-export interface LambdaOptions {
-  files: Files;
+export type LambdaOptions = LambdaOptionsWithFiles | LambdaOptionsWithZipBuffer;
+
+export interface LambdaOptionsBase {
   handler: string;
   runtime: string;
   memory?: number;
@@ -21,10 +21,21 @@ export interface LambdaOptions {
   environment?: Environment;
   allowQuery?: string[];
   regions?: string[];
+  supportsMultiPayloads?: boolean;
+}
+
+export interface LambdaOptionsWithFiles extends LambdaOptionsBase {
+  files: Files;
+}
+
+/**
+ * @deprecated Use `LambdaOptionsWithFiles` instead.
+ */
+export interface LambdaOptionsWithZipBuffer extends LambdaOptionsBase {
   /**
    * @deprecated Use `files` property instead.
    */
-  zipBuffer?: Buffer;
+  zipBuffer: Buffer;
 }
 
 interface GetLambdaOptionsFromFunctionOptions {
@@ -34,7 +45,7 @@ interface GetLambdaOptionsFromFunctionOptions {
 
 export class Lambda {
   type: 'Lambda';
-  files: Files;
+  files?: Files;
   handler: string;
   runtime: string;
   memory?: number;
@@ -46,20 +57,24 @@ export class Lambda {
    * @deprecated Use `await lambda.createZip()` instead.
    */
   zipBuffer?: Buffer;
+  supportsMultiPayloads?: boolean;
 
-  constructor({
-    files,
-    handler,
-    runtime,
-    maxDuration,
-    memory,
-    environment = {},
-    allowQuery,
-    regions,
-    zipBuffer,
-  }: LambdaOptions) {
-    if (!zipBuffer) {
-      assert(typeof files === 'object', '"files" must be an object');
+  constructor(opts: LambdaOptions) {
+    const {
+      handler,
+      runtime,
+      maxDuration,
+      memory,
+      environment = {},
+      allowQuery,
+      regions,
+      supportsMultiPayloads,
+    } = opts;
+    if ('files' in opts) {
+      assert(typeof opts.files === 'object', '"files" must be an object');
+    }
+    if ('zipBuffer' in opts) {
+      assert(Buffer.isBuffer(opts.zipBuffer), '"zipBuffer" must be a Buffer');
     }
     assert(typeof handler === 'string', '"handler" is not a string');
     assert(typeof runtime === 'string', '"runtime" is not a string');
@@ -81,6 +96,13 @@ export class Lambda {
       );
     }
 
+    if (supportsMultiPayloads !== undefined) {
+      assert(
+        typeof supportsMultiPayloads === 'boolean',
+        '"supportsMultiPayloads" is not a boolean'
+      );
+    }
+
     if (regions !== undefined) {
       assert(Array.isArray(regions), '"regions" is not an Array');
       assert(
@@ -89,7 +111,7 @@ export class Lambda {
       );
     }
     this.type = 'Lambda';
-    this.files = files;
+    this.files = 'files' in opts ? opts.files : undefined;
     this.handler = handler;
     this.runtime = runtime;
     this.memory = memory;
@@ -97,12 +119,16 @@ export class Lambda {
     this.environment = environment;
     this.allowQuery = allowQuery;
     this.regions = regions;
-    this.zipBuffer = zipBuffer;
+    this.zipBuffer = 'zipBuffer' in opts ? opts.zipBuffer : undefined;
+    this.supportsMultiPayloads = supportsMultiPayloads;
   }
 
   async createZip(): Promise<Buffer> {
     let { zipBuffer } = this;
     if (!zipBuffer) {
+      if (!this.files) {
+        throw new Error('`files` is not defined');
+      }
       await sema.acquire();
       try {
         zipBuffer = await createZip(this.files);
@@ -136,7 +162,7 @@ export async function createZip(files: Files): Promise<Buffer> {
   for (const name of names) {
     const file = files[name];
     if (file.mode && isSymbolicLink(file.mode) && file.type === 'FileFsRef') {
-      const symlinkTarget = await readlink((file as FileFsRef).fsPath);
+      const symlinkTarget = await readlink(file.fsPath);
       symlinkTargets.set(name, symlinkTarget);
     }
   }
@@ -150,7 +176,7 @@ export async function createZip(files: Files): Promise<Buffer> {
       if (typeof symlinkTarget === 'string') {
         zipFile.addBuffer(Buffer.from(symlinkTarget, 'utf8'), name, opts);
       } else {
-        const stream = file.toStream() as import('stream').Readable;
+        const stream = file.toStream();
         stream.on('error', reject);
         zipFile.addReadStream(stream, name, opts);
       }

packages/build-utils/src/nodejs-lambda.ts

@@ -1,6 +1,6 @@
-import { Lambda, LambdaOptions } from './lambda';
+import { Lambda, LambdaOptionsWithFiles } from './lambda';
 
-interface NodejsLambdaOptions extends LambdaOptions {
+interface NodejsLambdaOptions extends LambdaOptionsWithFiles {
   shouldAddHelpers: boolean;
   shouldAddSourcemapSupport: boolean;
   awsLambdaHandler?: string;

packages/build-utils/src/prerender.ts

@@ -1,12 +1,10 @@
-import FileBlob from './file-blob';
-import FileFsRef from './file-fs-ref';
-import FileRef from './file-ref';
+import { File } from './types';
 import { Lambda } from './lambda';
 
 interface PrerenderOptions {
   expiration: number | false;
   lambda: Lambda;
-  fallback: FileBlob | FileFsRef | FileRef | null;
+  fallback: File | null;
   group?: number;
   bypassToken?: string | null /* optional to be non-breaking change */;
   allowQuery?: string[];
@@ -16,7 +14,7 @@ export class Prerender {
   public type: 'Prerender';
   public expiration: number | false;
   public lambda: Lambda;
-  public fallback: FileBlob | FileFsRef | FileRef | null;
+  public fallback: File | null;
   public group?: number;
   public bypassToken: string | null;
   public allowQuery?: string[];

packages/build-utils/src/types.ts

@@ -1,21 +1,21 @@
-import FileRef from './file-ref';
-import FileFsRef from './file-fs-ref';
-import { Lambda } from './lambda';
+import type FileRef from './file-ref';
+import type FileFsRef from './file-fs-ref';
+import type FileBlob from './file-blob';
+import type { Lambda } from './lambda';
+import type { Prerender } from './prerender';
+import type { EdgeFunction } from './edge-function';
 
 export interface Env {
   [name: string]: string | undefined;
 }
 
-export interface File {
+export type File = FileRef | FileFsRef | FileBlob;
+export interface FileBase {
   type: string;
   mode: number;
   contentType?: string;
   toStream: () => NodeJS.ReadableStream;
   toStreamAsync?: () => Promise<NodeJS.ReadableStream>;
-  /**
-   * The absolute path to the file in the filesystem
-   */
-  fsPath?: string;
 }
 
 export interface Files {
@@ -23,16 +23,6 @@ export interface Files {
 }
 
 export interface Config {
-  [key: string]:
-    | string
-    | string[]
-    | boolean
-    | number
-    | { [key: string]: string }
-    | BuilderFunctions
-    | ProjectSettings
-    | undefined
-    | null;
   maxLambdaSize?: string;
   includeFiles?: string | string[];
   excludeFiles?: string | string[];
@@ -51,6 +41,7 @@ export interface Config {
   devCommand?: string;
   framework?: string | null;
   nodeVersion?: string;
+  [key: string]: unknown;
 }
 
 export interface Meta {
@@ -63,35 +54,7 @@ export interface Meta {
   env?: Env;
   buildEnv?: Env;
   avoidTopLevelInstall?: boolean;
-}
-
-export interface AnalyzeOptions {
-  /**
-   * All source files of the project
-   */
-  files: {
-    [filePath: string]: FileRef;
-  };
-
-  /**
-   * Name of entrypoint file for this particular build job. Value
-   * `files[entrypoint]` is guaranteed to exist and be a valid File reference.
-   * `entrypoint` is always a discrete file and never a glob, since globs are
-   * expanded into separate builds at deployment time.
-   */
-  entrypoint: string;
-
-  /**
-   * A writable temporary directory where you are encouraged to perform your
-   * build process. This directory will be populated with the restored cache.
-   */
-  workPath: string;
-
-  /**
-   * An arbitrary object passed by the user in the build definition defined
-   * in `vercel.json`.
-   */
-  config: Config;
+  [key: string]: unknown;
 }
 
 export interface BuildOptions {
@@ -156,10 +119,11 @@ export interface PrepareCacheOptions {
   workPath: string;
 
   /**
-   * A writable temporary directory where you can build a cache to use for
-   * the next run.
+   * The "Root Directory" is assigned to the `workPath` so the `repoRootPath`
+   * is the Git Repository Root. This is only relevant for Monorepos.
+   * See https://vercel.com/blog/monorepos
    */
-  cachePath: string;
+  repoRootPath?: string;
 
   /**
    * An arbitrary object passed by the user in the build definition defined
@@ -368,6 +332,7 @@ export interface ProjectSettings {
   sourceFilesOutsideRootDirectory?: boolean;
   directoryListing?: boolean;
   gitForkProtection?: boolean;
+  commandForIgnoringBuildStep?: string | null;
 }
 
 export interface BuilderV2 {
@@ -392,12 +357,34 @@ export interface Images {
   formats?: ImageFormat[];
 }
 
-export interface BuildResultV2 {
+/**
+ * If a Builder ends up creating filesystem outputs conforming to
+ * the Build Output API, then the Builder should return this type.
+ */
+export interface BuildResultBuildOutput {
+  /**
+   * Version number of the Build Output API that was created.
+   * Currently only `3` is a valid value.
+   * @example 3
+   */
+  buildOutputVersion: 3;
+  /**
+   * Filesystem path to the Build Output directory.
+   * @example "/path/to/.vercel/output"
+   */
+  buildOutputPath: string;
+}
+
+/**
+ * When a Builder implements `version: 2`, the `build()` function is expected
+ * to return this type.
+ */
+export interface BuildResultV2Typical {
   // TODO: use proper `Route` type from `routing-utils` (perhaps move types to a common package)
-  routes: any[];
+  routes?: any[];
   images?: Images;
   output: {
-    [key: string]: File | Lambda;
+    [key: string]: File | Lambda | Prerender | EdgeFunction;
   };
   wildcard?: Array<{
     domain: string;
@@ -405,6 +392,8 @@ export interface BuildResultV2 {
   }>;
 }
 
+export type BuildResultV2 = BuildResultV2Typical | BuildResultBuildOutput;
+
 export interface BuildResultV3 {
   output: Lambda;
 }

packages/build-utils/test/fixtures/02-zero-config-api/yarn.lock

@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+

packages/build-utils/test/fixtures/22-pnpm/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "22-pnpm",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "build": "mkdir -p public && (printf \"pnpm version: \" && pnpm -v) > public/index.txt"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "once": "^1.4.0"
+  }
+}

packages/build-utils/test/fixtures/22-pnpm/pnpm-lock.yaml

@@ -0,0 +1,19 @@
+lockfileVersion: 5.3
+
+specifiers:
+  once: ^1.4.0
+
+dependencies:
+  once: 1.4.0
+
+packages:
+
+  /once/1.4.0:
+    resolution: {integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E=}
+    dependencies:
+      wrappy: 1.0.2
+    dev: false
+
+  /wrappy/1.0.2:
+    resolution: {integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=}
+    dev: false

packages/build-utils/test/fixtures/22-pnpm/vercel.json

@@ -0,0 +1,11 @@
+{
+  "version": 2,
+  "builds": [{ "src": "package.json", "use": "@vercel/static-build" }],
+  "probes": [
+    {
+      "path": "/",
+      "mustContain": "pnpm version: 6",
+      "logMustContain": "pnpm run build"
+    }
+  ]
+}

packages/build-utils/test/fixtures/23-pnpm-workspaces/c/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "c",
+  "license": "MIT",
+  "version": "0.1.0"
+}

packages/build-utils/test/fixtures/23-pnpm-workspaces/d/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "d",
+  "license": "MIT",
+  "version": "0.1.0",
+  "devDependencies": {
+    "once": "1.4.0"
+  }
+}

packages/build-utils/test/fixtures/23-pnpm-workspaces/package.json

@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "name": "23-pnpm-workspaces",
+  "license": "MIT",
+  "version": "1.0.0"
+}

packages/build-utils/test/fixtures/23-pnpm-workspaces/pnpm-lock.yaml

@@ -0,0 +1,27 @@
+lockfileVersion: 5.3
+
+importers:
+
+  .:
+    specifiers: {}
+
+  c:
+    specifiers: {}
+
+  d:
+    specifiers:
+      once: 1.4.0
+    devDependencies:
+      once: 1.4.0
+
+packages:
+
+  /once/1.4.0:
+    resolution: {integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E=}
+    dependencies:
+      wrappy: 1.0.2
+    dev: true
+
+  /wrappy/1.0.2:
+    resolution: {integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=}
+    dev: true

packages/build-utils/test/fixtures/23-pnpm-workspaces/pnpm-workspace.yaml

@@ -0,0 +1,3 @@
+packages:
+  - 'c'
+  - 'd'

packages/build-utils/test/fixtures/24-pnpm-hoisted/.gitignore

@@ -0,0 +1 @@
+.vercel

packages/build-utils/test/fixtures/24-pnpm-hoisted/.npmrc

@@ -0,0 +1 @@
+node-linker=hoisted

packages/build-utils/test/fixtures/24-pnpm-hoisted/a/index.js

@@ -0,0 +1,5 @@
+const once = require('once');
+
+module.exports = () => {
+  once(() => {});
+};

packages/build-utils/test/fixtures/24-pnpm-hoisted/b/index.js

@@ -0,0 +1,5 @@
+const once = require('once');
+
+module.exports = () => {
+  once(() => {});
+};

packages/build-utils/test/fixtures/24-pnpm-hoisted/index.js

@@ -0,0 +1,10 @@
+const { exec } = require('exeggcute');
+
+const a = require('./a');
+const b = require('./b');
+
+a();
+b();
+
+exec('mkdir public', __dirname);
+exec('echo "Hello, World!" > public/index.html', __dirname);

packages/build-utils/test/fixtures/24-pnpm-hoisted/package.json

@@ -0,0 +1,11 @@
+{
+  "private": "true",
+  "name": "24-pnpm-hoisted",
+  "scripts": {
+    "build": "ls -Al node_modules && node index.js"
+  },
+  "dependencies": {
+    "exeggcute": "^1.0.0",
+    "once": "^1.4.0"
+  }
+}

packages/build-utils/test/fixtures/24-pnpm-hoisted/pnpm-lock.yaml

@@ -0,0 +1,25 @@
+lockfileVersion: 5.3
+
+specifiers:
+  exeggcute: ^1.0.0
+  once: ^1.4.0
+
+dependencies:
+  exeggcute: 1.0.0
+  once: 1.4.0
+
+packages:
+
+  /exeggcute/1.0.0:
+    resolution: {integrity: sha1-qLXakIhjGCDm9ggx4CvEc5mnbBU=}
+    dev: false
+
+  /once/1.4.0:
+    resolution: {integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E=}
+    dependencies:
+      wrappy: 1.0.2
+    dev: false
+
+  /wrappy/1.0.2:
+    resolution: {integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=}
+    dev: false

packages/build-utils/test/fixtures/24-pnpm-hoisted/vercel.json

@@ -0,0 +1,20 @@
+{
+  "probes": [
+    {
+      "path": "/",
+      "mustContain": "Hello, World!"
+    },
+    {
+      "path": "/",
+      "logMustContain": "once"
+    },
+    {
+      "path": "/",
+      "logMustContain": "exeggcute"
+    },
+    {
+      "path": "/",
+      "logMustContain": "wrappy"
+    }
+  ]
+}

packages/build-utils/test/integration.test.ts

@@ -31,6 +31,7 @@ const skipFixtures: string[] = [
   '07-zero-config-jekyll',
   '08-zero-config-middleman',
   '21-npm-workspaces',
+  '23-pnpm-workspaces',
 ];
 
 // eslint-disable-next-line no-restricted-syntax

packages/build-utils/test/unit.test.ts

@@ -1,7 +1,7 @@
 import ms from 'ms';
 import path from 'path';
-import fs from 'fs-extra';
-import { strict as assert } from 'assert';
+import fs, { readlink } from 'fs-extra';
+import { strict as assert, strictEqual } from 'assert';
 import { createZip } from '../src/lambda';
 import { getSupportedNodeVersion } from '../src/fs/node-version';
 import download from '../src/fs/download';
@@ -14,6 +14,8 @@ import {
   runNpmInstall,
   runPackageJsonScript,
   scanParentDirs,
+  FileBlob,
+  Meta,
 } from '../src';
 
 async function expectBuilderError(promise: Promise<any>, pattern: string) {
@@ -47,7 +49,7 @@ afterEach(() => {
   console.warn = originalConsoleWarn;
 });
 
-it('should re-create symlinks properly', async () => {
+it('should re-create FileFsRef symlinks properly', async () => {
   if (process.platform === 'win32') {
     console.log('Skipping test on windows');
     return;
@@ -69,6 +71,72 @@ it('should re-create symlinks properly', async () => {
   assert(linkStat.isSymbolicLink());
   assert(linkDirStat.isSymbolicLink());
   assert(aStat.isFile());
+
+  const [linkDirContents, linkTextContents] = await Promise.all([
+    readlink(path.join(outDir, 'link-dir')),
+    readlink(path.join(outDir, 'link.txt')),
+  ]);
+
+  strictEqual(linkDirContents, 'dir');
+  strictEqual(linkTextContents, './a.txt');
+});
+
+it('should re-create FileBlob symlinks properly', async () => {
+  if (process.platform === 'win32') {
+    console.log('Skipping test on windows');
+    return;
+  }
+
+  const files = {
+    'a.txt': new FileBlob({
+      mode: 33188,
+      contentType: undefined,
+      data: 'a text',
+    }),
+    'dir/b.txt': new FileBlob({
+      mode: 33188,
+      contentType: undefined,
+      data: 'b text',
+    }),
+    'link-dir': new FileBlob({
+      mode: 41453,
+      contentType: undefined,
+      data: 'dir',
+    }),
+    'link.txt': new FileBlob({
+      mode: 41453,
+      contentType: undefined,
+      data: 'a.txt',
+    }),
+  };
+
+  strictEqual(Object.keys(files).length, 4);
+
+  const outDir = path.join(__dirname, 'symlinks-out');
+  await fs.remove(outDir);
+
+  const files2 = await download(files, outDir);
+  strictEqual(Object.keys(files2).length, 4);
+
+  const [linkStat, linkDirStat, aStat, dirStat] = await Promise.all([
+    fs.lstat(path.join(outDir, 'link.txt')),
+    fs.lstat(path.join(outDir, 'link-dir')),
+    fs.lstat(path.join(outDir, 'a.txt')),
+    fs.lstat(path.join(outDir, 'dir')),
+  ]);
+
+  assert(linkStat.isSymbolicLink());
+  assert(linkDirStat.isSymbolicLink());
+  assert(aStat.isFile());
+  assert(dirStat.isDirectory());
+
+  const [linkDirContents, linkTextContents] = await Promise.all([
+    readlink(path.join(outDir, 'link-dir')),
+    readlink(path.join(outDir, 'link.txt')),
+  ]);
+
+  strictEqual(linkDirContents, 'dir');
+  strictEqual(linkTextContents, 'a.txt');
 });
 
 it('should create zip files with symlinks properly', async () => {
@@ -209,6 +277,14 @@ it('should not warn when package.json engines matches project setting from confi
   expect(warningMessages).toStrictEqual([]);
 });
 
+it('should select nodejs16.x with ENABLE_EXPERIMENTAL_NODE16', async () => {
+  process.env.ENABLE_EXPERIMENTAL_NODE16 = '1';
+  const result = await getNodeVersion('/tmp', undefined, {}, {});
+  delete process.env.ENABLE_EXPERIMENTAL_NODE16;
+  expect(result).toEqual({ major: 16, range: '16.x', runtime: 'nodejs16.x' });
+  expect(warningMessages).toStrictEqual([]);
+});
+
 it('should get latest node version', async () => {
   expect(getLatestNodeVersion()).toHaveProperty('major', 14);
 });
@@ -332,3 +408,53 @@ it('should detect npm Workspaces', async () => {
   expect(result.cliType).toEqual('npm');
   expect(result.lockfileVersion).toEqual(2);
 });
+
+it('should detect pnpm', async () => {
+  const fixture = path.join(__dirname, 'fixtures', '22-pnpm');
+  const result = await scanParentDirs(fixture);
+  expect(result.cliType).toEqual('pnpm');
+  expect(result.lockfileVersion).toEqual(5.3);
+});
+
+it('should detect pnpm Workspaces', async () => {
+  const fixture = path.join(__dirname, 'fixtures', '23-pnpm-workspaces/a');
+  const result = await scanParentDirs(fixture);
+  expect(result.cliType).toEqual('pnpm');
+  expect(result.lockfileVersion).toEqual(5.3);
+});
+
+it('should only invoke `runNpmInstall()` once per `package.json` file (serial)', async () => {
+  const meta: Meta = {};
+  const fixture = path.join(__dirname, 'fixtures', '02-zero-config-api');
+  const apiDir = path.join(fixture, 'api');
+  const run1 = await runNpmInstall(apiDir, [], undefined, meta);
+  expect(run1).toEqual(true);
+  expect(
+    (meta.runNpmInstallSet as Set<string>).has(
+      path.join(fixture, 'package.json')
+    )
+  ).toEqual(true);
+  const run2 = await runNpmInstall(apiDir, [], undefined, meta);
+  expect(run2).toEqual(false);
+  const run3 = await runNpmInstall(fixture, [], undefined, meta);
+  expect(run3).toEqual(false);
+});
+
+it('should only invoke `runNpmInstall()` once per `package.json` file (parallel)', async () => {
+  const meta: Meta = {};
+  const fixture = path.join(__dirname, 'fixtures', '02-zero-config-api');
+  const apiDir = path.join(fixture, 'api');
+  const [run1, run2, run3] = await Promise.all([
+    runNpmInstall(apiDir, [], undefined, meta),
+    runNpmInstall(apiDir, [], undefined, meta),
+    runNpmInstall(fixture, [], undefined, meta),
+  ]);
+  expect(run1).toEqual(true);
+  expect(run2).toEqual(false);
+  expect(run3).toEqual(false);
+  expect(
+    (meta.runNpmInstallSet as Set<string>).has(
+      path.join(fixture, 'package.json')
+    )
+  ).toEqual(true);
+});

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "24.0.0",
+  "version": "24.1.1-canary.5",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -43,14 +43,15 @@
     "node": ">= 12"
   },
   "dependencies": {
-    "@vercel/build-utils": "2.14.0",
-    "@vercel/go": "1.3.0",
-    "@vercel/node": "1.13.0",
-    "@vercel/python": "2.2.0",
-    "@vercel/ruby": "1.3.0",
+    "@vercel/build-utils": "2.15.2-canary.3",
+    "@vercel/go": "1.3.3-canary.3",
+    "@vercel/node": "1.14.2-canary.4",
+    "@vercel/python": "2.2.3-canary.3",
+    "@vercel/ruby": "1.3.3-canary.3",
     "update-notifier": "4.1.0"
   },
   "devDependencies": {
+    "@alex_neo/jest-expect-message": "1.0.5",
     "@next/env": "11.1.2",
     "@sentry/node": "5.5.0",
     "@sindresorhus/slugify": "0.11.0",
@@ -69,6 +70,7 @@
     "@types/http-proxy": "1.16.2",
     "@types/inquirer": "7.3.1",
     "@types/jest": "27.0.1",
+    "@types/jest-expect-message": "1.0.3",
     "@types/load-json-file": "2.0.7",
     "@types/mime-types": "2.1.0",
     "@types/minimatch": "3.0.3",
@@ -88,11 +90,10 @@
     "@types/update-notifier": "5.1.0",
     "@types/which": "1.3.2",
     "@types/write-json-file": "2.2.1",
-    "@vercel/client": "10.3.0",
+    "@vercel/client": "10.4.2-canary.4",
     "@vercel/fetch-retry": "5.0.3",
-    "@vercel/frameworks": "0.6.0",
+    "@vercel/frameworks": "0.7.2-canary.0",
     "@vercel/ncc": "0.24.0",
-    "@vercel/nft": "0.17.5",
     "@zeit/fun": "0.11.2",
     "@zeit/source-map-support": "0.6.2",
     "ajv": "6.12.2",
@@ -161,7 +162,6 @@
     "title": "3.4.1",
     "tmp-promise": "1.0.3",
     "tree-kill": "1.2.2",
-    "ts-eager": "2.0.2",
     "ts-node": "8.3.0",
     "typescript": "4.3.4",
     "universal-analytics": "0.4.20",
@@ -178,6 +178,9 @@
         "isolatedModules": true
       }
     },
+    "setupFilesAfterEnv": [
+      "@alex_neo/jest-expect-message"
+    ],
     "verbose": false,
     "testEnvironment": "node",
     "testMatch": [

packages/cli/src/commands/alias/set.ts

@@ -73,7 +73,7 @@ export default async function set(
   if (args.length === 0) {
     output.error(
       `To ship to production, optionally configure your domains (${link(
-        'https://vercel.com/docs/v2/custom-domains'
+        'https://vercel.link/domain-configuration'
       )}) and run ${getCommandName(`--prod`)}.`
     );
     return 1;

packages/cli/src/commands/deploy/args.ts

@@ -42,6 +42,7 @@ export const help = () => `
 
     -h, --help                     Output usage information
     -v, --version                  Output the version number
+    --cwd                          Current working directory
     -V, --platform-version         Set the platform version to deploy to
     -A ${chalk.bold.underline('FILE')}, --local-config=${chalk.bold.underline(
   'FILE'

packages/cli/src/commands/deploy/index.ts

@@ -181,6 +181,21 @@ export default async (client: Client) => {
     );
   }
 
+  // build `--prebuilt`
+  if (argv['--prebuilt']) {
+    const prebuiltExists = await fs.pathExists(join(path, '.vercel/output'));
+    if (!prebuiltExists) {
+      error(
+        `The ${param(
+          '--prebuilt'
+        )} option was used, but no prebuilt output found in ".vercel/output". Run ${getCommandName(
+          'build'
+        )} to generate a local build.`
+      );
+      return 1;
+    }
+  }
+
   // retrieve `project` and `org` from .vercel
   const link = await getLinkedProject(client, path);
 
@@ -892,8 +907,8 @@ const parseEnv = (env?: string[] | Dictionary<string>) => {
       if (equalsSign === -1) {
         key = e;
       } else {
-        key = e.substr(0, equalsSign);
-        value = e.substr(equalsSign + 1);
+        key = e.slice(0, equalsSign);
+        value = e.slice(equalsSign + 1);
       }
 
       o[key] = value;

packages/cli/src/commands/env/index.ts

@@ -1,4 +1,5 @@
 import chalk from 'chalk';
+import { ProjectEnvTarget } from '../../types';
 import Client from '../../util/client';
 import { getEnvTargetPlaceholder } from '../../util/env/env-target';
 import getArgs from '../../util/get-args';
@@ -114,9 +115,11 @@ export default async function main(client: Client) {
     return 2;
   }
 
-  const { subcommand, args } = getSubcommand(argv._.slice(1), COMMAND_CONFIG);
+  const cwd = argv['--cwd'] || process.cwd();
+  const subArgs = argv._.slice(1);
+  const { subcommand, args } = getSubcommand(subArgs, COMMAND_CONFIG);
   const { output, config } = client;
-  const link = await getLinkedProject(client);
+  const link = await getLinkedProject(client, cwd);
   if (link.status === 'error') {
     return link.exitCode;
   } else if (link.status === 'not_linked') {
@@ -137,14 +140,15 @@ export default async function main(client: Client) {
       case 'rm':
         return rm(client, project, argv, args, output);
       case 'pull':
-        output.warn(
-          `${getCommandName(
-            'env pull'
-          )} is deprecated and will be removed in future releases. Run ${getCommandName(
-            'pull'
-          )} instead.`
+        return pull(
+          client,
+          project,
+          ProjectEnvTarget.Development,
+          argv,
+          args,
+          output,
+          cwd
         );
-        return pull(client, project, argv, args, output);
       default:
         output.error(getInvalidSubcommand(COMMAND_CONFIG));
         help();