Publish Canary

- @vercel/build-utils@2.16.1-canary.1 - vercel@24.2.1-canary.1 - @vercel/client@11.0.1-canary.1 - @vercel/go@1.4.1-canary.1 - @vercel/node@1.15.1-canary.1 - @vercel/python@2.3.1-canary.1 - @vercel/redwood@0.8.1-canary.1 - @vercel/ruby@1.3.4-canary.1 - @vercel/static-build@0.24.1-canary.1
[build-utils] Add ShouldServe type (#7755 )
2026-01-01 04:09:15 +00:00 · 2022-05-05 14:11:13 -04:00 · 2022-05-05 17:06:20 +00:00 · 2022-05-05 14:44:34 +00:00 · 2022-05-04 17:15:54 +00:00 · 2022-05-02 11:33:22 -06:00
70 changed files with 9869 additions and 1399 deletions
--- a/examples/ember/.travis.yml
+++ b/examples/ember/.travis.yml
@@ -15,7 +15,7 @@ cache:

 env:
  global:
-    # See https://git.io/vdao3 for details.
+    # See https://github.com/ember-cli/ember-cli/blob/master/docs/build-concurrency.md
    - JOBS=1

 script:
--- a/package.json
+++ b/package.json
@@ -15,23 +15,23 @@
    "lerna": "3.16.4"
  },
  "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "4.28.0",
-    "@typescript-eslint/parser": "4.28.0",
+    "@typescript-eslint/eslint-plugin": "5.21.0",
+    "@typescript-eslint/parser": "5.21.0",
    "async-retry": "1.2.3",
    "buffer-replace": "1.0.0",
-    "eslint": "7.29.0",
-    "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-jest": "24.3.6",
-    "husky": "6.0.0",
-    "jest": "27.3.1",
+    "eslint": "8.14.0",
+    "eslint-config-prettier": "8.5.0",
+    "eslint-plugin-jest": "26.1.5",
+    "husky": "7.0.4",
+    "jest": "28.0.2",
    "json5": "2.1.1",
    "lint-staged": "9.2.5",
    "node-fetch": "2.6.1",
    "npm-package-arg": "6.1.0",
-    "prettier": "2.3.1",
+    "prettier": "2.6.2",
    "ts-eager": "2.0.2",
-    "ts-jest": "27.0.4",
-    "turbo": "1.2.2"
+    "ts-jest": "28.0.0-next.1",
+    "turbo": "1.2.5"
  },
  "scripts": {
    "lerna": "lerna",
--- a/packages/build-utils/package.json
+++ b/packages/build-utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/build-utils",
-  "version": "2.15.2-canary.4",
+  "version": "2.16.1-canary.1",
  "license": "MIT",
  "main": "./dist/index.js",
  "types": "./dist/index.d.js",
@@ -23,14 +23,14 @@
    "@types/end-of-stream": "^1.4.0",
    "@types/fs-extra": "9.0.13",
    "@types/glob": "^7.1.1",
-    "@types/jest": "27.0.1",
+    "@types/jest": "27.4.1",
    "@types/js-yaml": "3.12.1",
    "@types/ms": "0.7.31",
    "@types/multistream": "2.1.1",
    "@types/node-fetch": "^2.1.6",
    "@types/semver": "6.0.0",
-    "@types/yazl": "^2.4.1",
-    "@vercel/frameworks": "0.7.2-canary.0",
+    "@types/yazl": "2.4.2",
+    "@vercel/frameworks": "0.8.0",
    "@vercel/ncc": "0.24.0",
    "aggregate-error": "3.0.1",
    "async-retry": "1.2.3",
@@ -47,6 +47,6 @@
    "node-fetch": "2.6.1",
    "semver": "6.1.1",
    "typescript": "4.3.4",
-    "yazl": "2.4.3"
+    "yazl": "2.5.1"
  }
 }
--- a/packages/build-utils/src/fs/run-user-scripts.ts
+++ b/packages/build-utils/src/fs/run-user-scripts.ts
@@ -285,15 +285,17 @@ export async function scanParentDirs(
        ),
      ]);

-      if (packageLockJson && !hasYarnLock && !pnpmLockYaml) {
-        cliType = 'npm';
-        lockfileVersion = packageLockJson.lockfileVersion;
-      }
-
-      if (!packageLockJson && !hasYarnLock && pnpmLockYaml) {
+      // Priority order is Yarn > pnpm > npm
+      // - find highest priority lock file and use that
+      if (hasYarnLock) {
+        cliType = 'yarn';
+      } else if (pnpmLockYaml) {
        cliType = 'pnpm';
        // just ensure that it is read as a number and not a string
        lockfileVersion = Number(pnpmLockYaml.lockfileVersion);
+      } else if (packageLockJson) {
+        cliType = 'npm';
+        lockfileVersion = packageLockJson.lockfileVersion;
      }

      // Only stop iterating if a lockfile was found, because it's possible
@@ -550,7 +552,7 @@ export async function runPipInstall(
  meta?: Meta
 ) {
  if (meta && meta.isDev) {
-    debug('Skipping dependency installation because dev mode is enabled');
+    debug('Skipping dependency installation because dev mode is enabled');
    return;
  }

--- a/packages/build-utils/src/index.ts
+++ b/packages/build-utils/src/index.ts
@@ -33,7 +33,6 @@ import {
  getDiscontinuedNodeVersions,
 } from './fs/node-version';
 import streamToBuffer from './fs/stream-to-buffer';
-import shouldServe from './should-serve';
 import debug from './debug';
 import getIgnoreFilter from './get-ignore-filter';
 import { getPlatformEnv } from './get-platform-env';
@@ -73,7 +72,6 @@ export {
  getSpawnOptions,
  getPlatformEnv,
  streamToBuffer,
-  shouldServe,
  debug,
  isSymbolicLink,
  getLambdaOptionsFromFunction,
@@ -94,6 +92,7 @@ export { DetectorFilesystem } from './detectors/filesystem';
 export { readConfigFile } from './fs/read-config-file';
 export { normalizePath } from './fs/normalize-path';

+export * from './should-serve';
 export * from './schemas';
 export * from './types';
 export * from './errors';
@@ -116,3 +115,5 @@ export const isOfficialRuntime = (desired: string, name?: string): boolean => {
 export const isStaticRuntime = (name?: string): boolean => {
  return isOfficialRuntime('static', name);
 };
+
+export { workspaceManagers } from './workspaces/workspace-managers';
--- a/packages/build-utils/src/should-serve.ts
+++ b/packages/build-utils/src/should-serve.ts
@@ -1,12 +1,12 @@
 import { parse } from 'path';
-import { ShouldServeOptions } from './types';
-import FileFsRef from './file-fs-ref';
+import type FileFsRef from './file-fs-ref';
+import type { ShouldServe } from './types';

-export default function shouldServe({
+export const shouldServe: ShouldServe = ({
  entrypoint,
  files,
  requestPath,
-}: ShouldServeOptions): boolean {
+}) => {
  requestPath = requestPath.replace(/\/$/, ''); // sanitize trailing '/'
  entrypoint = entrypoint.replace(/\\/, '/'); // windows compatibility

@@ -20,7 +20,7 @@ export default function shouldServe({
  }

  return false;
-}
+};

 function hasProp(obj: { [path: string]: FileFsRef }, key: string): boolean {
  return Object.hasOwnProperty.call(obj, key);
--- a/packages/build-utils/src/types.ts
+++ b/packages/build-utils/src/types.ts
@@ -345,6 +345,7 @@ export interface BuilderV3 {
  version: 3;
  build: BuildV3;
  prepareCache?: PrepareCache;
+  shouldServe?: ShouldServe;
  startDevServer?: StartDevServer;
 }

@@ -401,6 +402,9 @@ export interface BuildResultV3 {
 export type BuildV2 = (options: BuildOptions) => Promise<BuildResultV2>;
 export type BuildV3 = (options: BuildOptions) => Promise<BuildResultV3>;
 export type PrepareCache = (options: PrepareCacheOptions) => Promise<Files>;
+export type ShouldServe = (
+  options: ShouldServeOptions
+) => boolean | Promise<boolean>;
 export type StartDevServer = (
  options: StartDevServerOptions
 ) => Promise<StartDevServerResult>;
--- a/packages/build-utils/src/workspaces/workspace-managers.ts
+++ b/packages/build-utils/src/workspaces/workspace-managers.ts
@@ -0,0 +1,129 @@
+import type { Framework } from '@vercel/frameworks';
+
+/**
+ * The supported list of workspace managers.
+ *
+ * This list is designed to work with the @see {@link detectFramework} function.
+ *
+ * @example
+ *   import { workspaceManagers as frameworkList } from '@vercel/build-utils/workspaces'
+ *   import { detectFramework } from '@vercel/build-utils'
+ *
+ *   const fs = new GitDetectorFilesystem(...)
+ *   detectFramwork({ fs, frameworkList }) // returns the 'slug' field if detected, otherwise null
+ *
+ * @todo Will be used by the detect-eligible-projects API endpoint for a given git url.
+ */
+export const workspaceManagers: Array<Framework> = [
+  {
+    name: 'Yarn',
+    slug: 'yarn',
+    detectors: {
+      every: [
+        {
+          path: 'package.json',
+          matchContent:
+            '"workspaces":\\s*(?:\\[[^\\]]*]|{[^}]*"packages":[^}]*})',
+        },
+        {
+          path: 'yarn.lock',
+        },
+      ],
+    },
+    // unused props - needed for typescript
+    description: '',
+    logo: '',
+    settings: {
+      buildCommand: {
+        value: '',
+        placeholder: '',
+      },
+      devCommand: {
+        value: '',
+        placeholder: '',
+      },
+      installCommand: {
+        value: '',
+        placeholder: '',
+      },
+      outputDirectory: {
+        value: '',
+        placeholder: '',
+      },
+    },
+    getOutputDirName: () => Promise.resolve(''),
+  },
+  {
+    name: 'pnpm',
+    slug: 'pnpm',
+    detectors: {
+      every: [
+        {
+          path: 'pnpm-workspace.yaml',
+        },
+      ],
+    },
+    // unused props - needed for typescript
+    description: '',
+    logo: '',
+    settings: {
+      buildCommand: {
+        value: '',
+        placeholder: '',
+      },
+      devCommand: {
+        value: '',
+        placeholder: '',
+      },
+      installCommand: {
+        value: '',
+        placeholder: '',
+      },
+      outputDirectory: {
+        value: '',
+        placeholder: '',
+      },
+    },
+    getOutputDirName: () => Promise.resolve(''),
+  },
+  {
+    name: 'npm',
+    slug: 'npm',
+    detectors: {
+      every: [
+        {
+          path: 'package.json',
+          matchContent:
+            '"workspaces":\\s*(?:\\[[^\\]]*]|{[^}]*"packages":[^}]*})',
+        },
+        {
+          path: 'package-lock.json',
+        },
+      ],
+    },
+    // unused props - needed for typescript
+    description: '',
+    logo: '',
+    settings: {
+      buildCommand: {
+        value: '',
+        placeholder: '',
+      },
+      devCommand: {
+        value: '',
+        placeholder: '',
+      },
+      installCommand: {
+        value: '',
+        placeholder: '',
+      },
+      outputDirectory: {
+        value: '',
+        placeholder: '',
+      },
+    },
+    getOutputDirName: () => Promise.resolve(''),
+  },
+];
+
+export default workspaceManagers;
--- a/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/package-lock.json
+++ b/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/package-lock.json
--- a/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/package.json
+++ b/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/package.json
@@ -0,0 +1,14 @@
+{
+  "private": "true",
+  "name": "25-multiple-lock-files-yarn",
+  "workspaces": [
+    "a",
+    "b"
+  ],
+  "scripts": {
+    "build": "mkdir -p public && (printf \"yarn version: \" && yarn -v) > public/index.txt"
+  },
+  "dependencies": {
+    "once": "^1.4.0"
+  }
+}
--- a/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/pnpm-lock.yaml
+++ b/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/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
--- a/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/vercel.json
+++ b/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/vercel.json
@@ -0,0 +1,11 @@
+{
+  "version": 2,
+  "builds": [{ "src": "package.json", "use": "@vercel/static-build" }],
+  "probes": [
+    {
+      "path": "/",
+      "mustContain": "yarn version: 1",
+      "logMustContain": "yarn run build"
+    }
+  ]
+}
--- a/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/yarn.lock
+++ b/packages/build-utils/test/fixtures/25-multiple-lock-files-yarn/yarn.lock
@@ -0,0 +1,15 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
--- a/packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/package-lock.json
+++ b/packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/package-lock.json
@@ -0,0 +1,44 @@
+{
+  "name": "26-multiple-lock-files-pnpm",
+  "version": "1.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "26-multiple-lock-files-pnpm",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    }
+  },
+  "dependencies": {
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    }
+  }
+}
--- a/packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/package.json
+++ b/packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/package.json
@@ -0,0 +1,14 @@
+{
+  "private": "true",
+  "name": "26-multiple-lock-files-pnpm",
+  "workspaces": [
+    "a",
+    "b"
+  ],
+  "scripts": {
+    "build": "mkdir -p public && (printf \"pnpm version: \" && pnpm -v) > public/index.txt"
+  },
+  "dependencies": {
+    "once": "^1.4.0"
+  }
+}
--- a/packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/pnpm-lock.yaml
+++ b/packages/build-utils/test/fixtures/26-multiple-lock-files-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
--- a/packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/pnpm-workspace.yaml
+++ b/packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/pnpm-workspace.yaml
@@ -0,0 +1,3 @@
+packages:
+  - 'a'
+  - 'b'
--- a/packages/build-utils/test/fixtures/26-multiple-lock-files-pnpm/vercel.json
+++ b/packages/build-utils/test/fixtures/26-multiple-lock-files-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"
+    }
+  ]
+}
--- a/packages/build-utils/test/fixtures/27-yarn-workspaces/a/package.json
+++ b/packages/build-utils/test/fixtures/27-yarn-workspaces/a/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "a",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "debug": "^4.3.2"
+  }
+}
--- a/packages/build-utils/test/fixtures/27-yarn-workspaces/b/package.json
+++ b/packages/build-utils/test/fixtures/27-yarn-workspaces/b/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "b",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "cowsay": "^1.5.0"
+  }
+}
--- a/packages/build-utils/test/fixtures/27-yarn-workspaces/package.json
+++ b/packages/build-utils/test/fixtures/27-yarn-workspaces/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "21-npm-workspaces",
+  "version": "1.0.0",
+  "private": true,
+  "workspaces": [
+    "a",
+    "b"
+  ]
+}
--- a/packages/build-utils/test/fixtures/27-yarn-workspaces/yarn.lock
+++ b/packages/build-utils/test/fixtures/27-yarn-workspaces/yarn.lock
@@ -0,0 +1,232 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+ansi-regex@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
+  integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
+
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
+ansi-styles@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+camelcase@^5.0.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
+cliui@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
+  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^6.2.0"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+cowsay@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/cowsay/-/cowsay-1.5.0.tgz#4a2a453b8b59383c7d7a50e44d765c5de0bf615f"
+  integrity sha512-8Ipzr54Z8zROr/62C8f0PdhQcDusS05gKTS87xxdji8VbWefWly0k8BwGK7+VqamOrkv3eGsCkPtvlHzrhWsCA==
+  dependencies:
+    get-stdin "8.0.0"
+    string-width "~2.1.1"
+    strip-final-newline "2.0.0"
+    yargs "15.4.1"
+
+debug@^4.3.2:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
+decamelize@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-stdin@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
+  integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
+set-blocking@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+
+string-width@^4.1.0, string-width@^4.2.0:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@~2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-final-newline@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+
+which-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+y18n@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
+  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
+
+yargs-parser@^18.1.2:
+  version "18.1.3"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs@15.4.1:
+  version "15.4.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
+  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
+  dependencies:
+    cliui "^6.0.0"
+    decamelize "^1.2.0"
+    find-up "^4.1.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^4.2.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^18.1.2"
--- a/packages/build-utils/test/integration.test.ts
+++ b/packages/build-utils/test/integration.test.ts
@@ -32,6 +32,7 @@ const skipFixtures: string[] = [
  '08-zero-config-middleman',
  '21-npm-workspaces',
  '23-pnpm-workspaces',
+  '27-yarn-workspaces',
 ];

 // eslint-disable-next-line no-restricted-syntax
--- a/packages/build-utils/test/unit.detect-workspace-managers.test.ts
+++ b/packages/build-utils/test/unit.detect-workspace-managers.test.ts
@@ -0,0 +1,31 @@
+import path from 'path';
+import { detectFramework } from '../src/detect-framework';
+import workspaceManagers from '../src/workspaces/workspace-managers';
+import { FixtureFilesystem } from './utils/fixture-filesystem';
+
+describe('workspace-managers', () => {
+  describe.each([
+    ['npm', '21-npm-workspaces'],
+    ['pnpm', '23-pnpm-workspaces'],
+    ['yarn', '27-yarn-workspaces'],
+    ['yarn', '25-multiple-lock-files-yarn'],
+    ['pnpm', '26-multiple-lock-files-pnpm'],
+    [null, '22-pnpm'],
+  ])('with detectFramework', (frameworkSlug, fixturePath) => {
+    const testName = frameworkSlug
+      ? `should detect a ${frameworkSlug} workspace for ${fixturePath}`
+      : `should not detect framework for ${fixturePath}`;
+
+    it(testName, async () => {
+      const fixture = path.join(__dirname, 'fixtures', fixturePath);
+      const fs = new FixtureFilesystem(fixture);
+
+      const result = await detectFramework({
+        fs,
+        frameworkList: workspaceManagers,
+      });
+
+      expect(result).toBe(frameworkSlug);
+    });
+  });
+});
--- a/packages/build-utils/test/utils/fixture-filesystem.ts
+++ b/packages/build-utils/test/utils/fixture-filesystem.ts
@@ -0,0 +1,35 @@
+import { promises } from 'fs';
+import path from 'path';
+
+import { DetectorFilesystem } from '../../src';
+
+const { stat, readFile } = promises;
+
+export class FixtureFilesystem extends DetectorFilesystem {
+  private rootPath: string;
+
+  constructor(fixturePath: string) {
+    super();
+
+    this.rootPath = fixturePath;
+  }
+
+  async _hasPath(name: string): Promise<boolean> {
+    try {
+      const filePath = path.join(this.rootPath, name);
+      await stat(filePath);
+
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  async _readFile(name: string): Promise<Buffer> {
+    const filePath = path.join(this.rootPath, name);
+    return readFile(filePath);
+  }
+  async _isFile(name: string): Promise<boolean> {
+    const filePath = path.join(this.rootPath, name);
+    return (await stat(filePath)).isFile();
+  }
+}
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vercel",
-  "version": "24.1.1-canary.6",
+  "version": "24.2.1-canary.1",
  "preferGlobal": true,
  "license": "Apache-2.0",
  "description": "The command-line interface for Vercel",
@@ -43,11 +43,11 @@
    "node": ">= 12"
  },
  "dependencies": {
-    "@vercel/build-utils": "2.15.2-canary.4",
-    "@vercel/go": "1.3.3-canary.4",
-    "@vercel/node": "1.14.2-canary.5",
-    "@vercel/python": "2.2.3-canary.4",
-    "@vercel/ruby": "1.3.3-canary.4",
+    "@vercel/build-utils": "2.16.1-canary.1",
+    "@vercel/go": "1.4.1-canary.1",
+    "@vercel/node": "1.15.1-canary.1",
+    "@vercel/python": "2.3.1-canary.1",
+    "@vercel/ruby": "1.3.4-canary.1",
    "update-notifier": "4.1.0"
  },
  "devDependencies": {
@@ -69,7 +69,7 @@
    "@types/glob": "7.1.1",
    "@types/http-proxy": "1.16.2",
    "@types/inquirer": "7.3.1",
-    "@types/jest": "27.0.1",
+    "@types/jest": "27.4.1",
    "@types/jest-expect-message": "1.0.3",
    "@types/load-json-file": "2.0.7",
    "@types/mime-types": "2.1.0",
@@ -90,9 +90,8 @@
    "@types/update-notifier": "5.1.0",
    "@types/which": "1.3.2",
    "@types/write-json-file": "2.2.1",
-    "@vercel/client": "10.4.2-canary.5",
-    "@vercel/fetch-retry": "5.0.3",
-    "@vercel/frameworks": "0.7.2-canary.0",
+    "@vercel/client": "11.0.1-canary.1",
+    "@vercel/frameworks": "0.8.0",
    "@vercel/ncc": "0.24.0",
    "@zeit/fun": "0.11.2",
    "@zeit/source-map-support": "0.6.2",
--- a/packages/cli/test/dev/fixtures/24-ember/.travis.yml
+++ b/packages/cli/test/dev/fixtures/24-ember/.travis.yml
@@ -15,7 +15,7 @@ cache:

 env:
  global:
-    # See https://git.io/vdao3 for details.
+    # See https://github.com/ember-cli/ember-cli/blob/master/docs/build-concurrency.md
    - JOBS=1

 script:
--- a/packages/cli/test/integration.js
+++ b/packages/cli/test/integration.js
@@ -7,10 +7,9 @@ import { Readable } from 'stream';
 import { homedir } from 'os';
 import _execa from 'execa';
 import XDGAppPaths from 'xdg-app-paths';
-import nodeFetch from 'node-fetch';
+import fetch from 'node-fetch';
 import tmp from 'tmp-promise';
 import retry from 'async-retry';
-import createFetchRetry from '@vercel/fetch-retry';
 import fs, {
  writeFile,
  readFile,
@@ -25,8 +24,6 @@ import pkg from '../package';
 import prepareFixtures from './helpers/prepare';
 import { fetchTokenWithRetry } from '../../../test/lib/deployment/now-deploy';

-const fetch = createFetchRetry(nodeFetch);
-
 // log command when running `execa`
 function execa(file, args, options) {
  console.log(`$ vercel ${args.join(' ')}`);
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/client",
-  "version": "10.4.2-canary.5",
+  "version": "11.0.1-canary.1",
  "main": "dist/index.js",
  "typings": "dist/index.d.ts",
  "homepage": "https://vercel.com",
@@ -24,7 +24,7 @@
  "devDependencies": {
    "@types/async-retry": "1.4.1",
    "@types/fs-extra": "7.0.0",
-    "@types/jest": "27.0.1",
+    "@types/jest": "27.4.1",
    "@types/minimatch": "3.0.5",
    "@types/ms": "0.7.30",
    "@types/node": "12.0.4",
@@ -41,7 +41,7 @@
    ]
  },
  "dependencies": {
-    "@vercel/build-utils": "2.15.2-canary.4",
+    "@vercel/build-utils": "2.16.1-canary.1",
    "@zeit/fetch": "5.2.0",
    "async-retry": "1.2.3",
    "async-sema": "3.0.0",
--- a/packages/frameworks/package.json
+++ b/packages/frameworks/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/frameworks",
-  "version": "0.7.2-canary.0",
+  "version": "0.8.0",
  "main": "./dist/frameworks.js",
  "types": "./dist/frameworks.d.ts",
  "files": [
@@ -16,11 +16,11 @@
    "js-yaml": "3.13.1"
  },
  "devDependencies": {
-    "@types/jest": "27.0.1",
+    "@types/jest": "27.4.1",
    "@types/js-yaml": "3.12.1",
    "@types/node": "12.0.4",
    "@types/node-fetch": "2.5.8",
-    "@vercel/routing-utils": "1.13.1",
+    "@vercel/routing-utils": "1.13.2",
    "ajv": "6.12.2",
    "typescript": "4.3.4"
  }
--- a/packages/go/package.json
+++ b/packages/go/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/go",
-  "version": "1.3.3-canary.4",
+  "version": "1.4.1-canary.1",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/go",
@@ -24,7 +24,7 @@
    "@types/fs-extra": "^5.0.5",
    "@types/node-fetch": "^2.3.0",
    "@types/tar": "^4.0.0",
-    "@vercel/build-utils": "2.15.2-canary.4",
+    "@vercel/build-utils": "2.16.1-canary.1",
    "@vercel/ncc": "0.24.0",
    "async-retry": "1.3.1",
    "execa": "^1.0.0",
--- a/packages/node-bridge/package.json
+++ b/packages/node-bridge/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/node-bridge",
-  "version": "2.2.1-canary.0",
+  "version": "2.2.1",
  "license": "MIT",
  "main": "./index.js",
  "repository": {
--- a/packages/node/.gitignore
+++ b/packages/node/.gitignore
@@ -1,3 +1,4 @@
 /dist
 /test/fixtures/**/types.d.ts
 /test/fixtures/11-symlinks/symlink
+!test/cache-fixtures/**
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/node",
-  "version": "1.14.2-canary.5",
+  "version": "1.15.1-canary.1",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -12,6 +12,7 @@
  "scripts": {
    "build": "node build",
    "test-integration-once": "jest --env node --verbose --runInBand --bail test/integration.test.js",
+    "test-unit": "jest --env node --verbose --bail test/prepare-cache.test.js",
    "prepublishOnly": "node build"
  },
  "files": [
@@ -19,7 +20,7 @@
  ],
  "dependencies": {
    "@types/node": "*",
-    "@vercel/node-bridge": "2.2.1-canary.0",
+    "@vercel/node-bridge": "2.2.1",
    "ts-node": "8.9.1",
    "typescript": "4.3.4"
  },
@@ -32,7 +33,7 @@
    "@types/cookie": "0.3.3",
    "@types/etag": "1.8.0",
    "@types/test-listen": "1.1.0",
-    "@vercel/build-utils": "2.15.2-canary.4",
+    "@vercel/build-utils": "2.16.1-canary.1",
    "@vercel/ncc": "0.24.0",
    "@vercel/nft": "0.18.1",
    "content-type": "1.0.4",
--- a/packages/node/src/index.ts
+++ b/packages/node/src/index.ts
@@ -380,9 +380,8 @@ export const build: BuildV3 = async ({
  return { output: lambda };
 };

-export const prepareCache: PrepareCache = async ({ workPath }) => {
-  const cache = await glob('node_modules/**', workPath);
-  return cache;
+export const prepareCache: PrepareCache = ({ repoRootPath, workPath }) => {
+  return glob('**/node_modules/**', repoRootPath || workPath);
 };

 export const startDevServer: StartDevServer = async opts => {
--- a/packages/node/test/cache-fixtures/foo/node_modules/file
+++ b/packages/node/test/cache-fixtures/foo/node_modules/file
--- a/packages/node/test/cache-fixtures/index.js
+++ b/packages/node/test/cache-fixtures/index.js
--- a/packages/node/test/cache-fixtures/node_modules/file
+++ b/packages/node/test/cache-fixtures/node_modules/file
--- a/packages/node/test/prepare-cache.test.js
+++ b/packages/node/test/prepare-cache.test.js
@@ -0,0 +1,28 @@
+const path = require('path');
+const { prepareCache } = require('../dist');
+
+describe('prepareCache()', () => {
+  test('should cache **/node_modules/**', async () => {
+    const files = await prepareCache({
+      repoRootPath: path.resolve(__dirname, './cache-fixtures/'),
+    });
+
+    expect(files['foo/node_modules/file']).toBeDefined();
+    expect(files['node_modules/file']).toBeDefined();
+    expect(files['index.js']).toBeUndefined();
+  });
+
+  test('should ignore root modules', async () => {
+    const files = await prepareCache({
+      workPath: path.resolve(__dirname, './cache-fixtures/foo/'),
+    });
+
+    expect(files['node_modules/file']).toBeDefined();
+    expect(
+      files['node_modules/file'].fsPath.includes(
+        'cache-fixtures/foo/node_modules/file'
+      )
+    ).toBeTruthy();
+    expect(files['index.js']).toBeUndefined();
+  });
+});
--- a/packages/python/jest.config.js
+++ b/packages/python/jest.config.js
@@ -0,0 +1,5 @@
+/** @type {import('@ts-jest/dist/types').InitialOptionsTsJest} */
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+};
--- a/packages/python/package.json
+++ b/packages/python/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/python",
-  "version": "2.2.3-canary.4",
+  "version": "2.3.1-canary.1",
  "main": "./dist/index.js",
  "license": "MIT",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
@@ -15,12 +15,14 @@
  },
  "scripts": {
    "build": "node build",
-    "test-integration-once": "jest --env node --verbose --runInBand --bail",
+    "test-unit": "jest --env node --verbose --runInBand --bail test/unit.test.ts ",
+    "test-integration-once": "jest --env node --verbose --runInBand --bail test/integration.test.ts",
    "prepublishOnly": "node build"
  },
  "devDependencies": {
    "@types/execa": "^0.9.0",
-    "@vercel/build-utils": "2.15.2-canary.4",
+    "@types/jest": "27.4.1",
+    "@vercel/build-utils": "2.16.1-canary.1",
    "@vercel/ncc": "0.24.0",
    "execa": "^1.0.0",
    "typescript": "4.3.4"
--- a/packages/python/src/index.ts
+++ b/packages/python/src/index.ts
@@ -16,6 +16,7 @@ import {
  NowBuildError,
 } from '@vercel/build-utils';
 import { installRequirement, installRequirementsFile } from './install';
+import { getLatestPythonVersion, getSupportedPythonVersion } from './version';

 async function pipenvConvert(cmd: string, srcDir: string) {
  debug('Running pipfile2req...');
@@ -59,9 +60,7 @@ export const build = async ({
  meta = {},
  config,
 }: BuildOptions) => {
-  let pipPath = meta.isDev ? 'pip3' : 'pip3.9';
-  let pythonPath = meta.isDev ? 'python3' : 'python3.9';
-  let pythonRuntime = meta.isDev ? 'python3' : 'python3.9';
+  let pythonVersion = getLatestPythonVersion(meta);

  workPath = await downloadFilesInWorkPath({
    workPath,
@@ -91,8 +90,8 @@ export const build = async ({
  console.log('Installing required dependencies...');

  await installRequirement({
-    pythonPath,
-    pipPath,
+    pythonPath: pythonVersion.pythonPath,
+    pipPath: pythonVersion.pipPath,
    dependency: 'werkzeug',
    version: '1.0.1',
    workPath,
@@ -114,25 +113,10 @@ export const build = async ({
    try {
      const json = await readFile(join(pipfileLockDir, 'Pipfile.lock'), 'utf8');
      const obj = JSON.parse(json);
-      const version = obj?._meta?.requires?.python_version;
-      if (!meta.isDev) {
-        if (version === '3.6') {
-          pipPath = 'pip3.6';
-          pythonPath = 'python3.6';
-          pythonRuntime = 'python3.6';
-          console.warn(
-            `Warning: Python version "${version}" detected in Pipfile.lock will reach End-Of-Life December 2021. Please upgrade. http://vercel.link/python-version`
-          );
-        } else if (version === '3.9') {
-          pipPath = 'pip3.9';
-          pythonPath = 'python3.9';
-          pythonRuntime = 'python3.9';
-        } else {
-          console.warn(
-            `Warning: Invalid Python version "${version}" detected in Pipfile.lock will be ignored. http://vercel.link/python-version`
-          );
-        }
-      }
+      pythonVersion = getSupportedPythonVersion({
+        isDev: meta.isDev,
+        pipLockPythonVersion: obj?._meta?.requires?.python_version,
+      });
    } catch (err) {
      throw new NowBuildError({
        code: 'INVALID_PIPFILE_LOCK',
@@ -146,8 +130,8 @@ export const build = async ({
    // it into a separate folder.
    const tempDir = await getWriteableDirectory();
    await installRequirement({
-      pythonPath,
-      pipPath,
+      pythonPath: pythonVersion.pythonPath,
+      pipPath: pythonVersion.pipPath,
      dependency: 'pipfile-requirements',
      version: '0.3.0',
      workPath: tempDir,
@@ -169,8 +153,8 @@ export const build = async ({
    debug('Found local "requirements.txt"');
    const requirementsTxtPath = fsFiles[requirementsTxt].fsPath;
    await installRequirementsFile({
-      pythonPath,
-      pipPath,
+      pythonPath: pythonVersion.pythonPath,
+      pipPath: pythonVersion.pipPath,
      filePath: requirementsTxtPath,
      workPath,
      meta,
@@ -179,8 +163,8 @@ export const build = async ({
    debug('Found global "requirements.txt"');
    const requirementsTxtPath = fsFiles['requirements.txt'].fsPath;
    await installRequirementsFile({
-      pythonPath,
-      pipPath,
+      pythonPath: pythonVersion.pythonPath,
+      pipPath: pythonVersion.pipPath,
      filePath: requirementsTxtPath,
      workPath,
      meta,
@@ -205,9 +189,6 @@ export const build = async ({

  await writeFile(join(workPath, `${handlerPyFilename}.py`), handlerPyContents);

-  // Use the system-installed version of `python3` when running via `vercel dev`
-  const runtime = meta.isDev ? 'python3' : pythonRuntime;
-
  const globOptions: GlobOptions = {
    cwd: workPath,
    ignore:
@@ -219,7 +200,7 @@ export const build = async ({
  const lambda = await createLambda({
    files: await glob('**', globOptions),
    handler: `${handlerPyFilename}.vc_handler`,
-    runtime,
+    runtime: pythonVersion.runtime,
    environment: {},
  });

--- a/packages/python/src/version.ts
+++ b/packages/python/src/version.ts
@@ -0,0 +1,95 @@
+import { NowBuildError } from '@vercel/build-utils';
+
+interface PythonVersion {
+  version: string;
+  pipPath: string;
+  pythonPath: string;
+  runtime: string;
+  discontinueDate?: Date;
+}
+
+// The order must be most recent first
+const allOptions: PythonVersion[] = [
+  {
+    version: '3.9',
+    pipPath: 'pip3.9',
+    pythonPath: 'python3.9',
+    runtime: 'python3.9',
+  },
+  {
+    version: '3.6',
+    pipPath: 'pip3.6',
+    pythonPath: 'python3.6',
+    runtime: 'python3.6',
+    discontinueDate: new Date('2022-07-18'),
+  },
+];
+
+const upstreamProvider =
+  'This change is the result of a decision made by an upstream infrastructure provider (AWS)';
+
+function getDevPythonVersion(): PythonVersion {
+  // Use the system-installed version of `python3` when running `vercel dev`
+  return {
+    version: '3',
+    pipPath: 'pip3',
+    pythonPath: 'python3',
+    runtime: 'python3',
+  };
+}
+export function getLatestPythonVersion({
+  isDev,
+}: {
+  isDev?: boolean;
+}): PythonVersion {
+  if (isDev) {
+    return getDevPythonVersion();
+  }
+  return allOptions[0];
+}
+
+export function getSupportedPythonVersion({
+  isDev,
+  pipLockPythonVersion,
+}: {
+  isDev?: boolean;
+  pipLockPythonVersion: string | undefined;
+}): PythonVersion {
+  if (isDev) {
+    return getDevPythonVersion();
+  }
+  let selection = getLatestPythonVersion({ isDev: false });
+
+  if (typeof pipLockPythonVersion === 'string') {
+    const found = allOptions.find(o => o.version === pipLockPythonVersion);
+    if (found) {
+      selection = found;
+    } else {
+      console.warn(
+        `Warning: Python version "${pipLockPythonVersion}" detected in Pipfile.lock is invalid and will be ignored. http://vercel.link/python-version`
+      );
+    }
+  }
+
+  if (isDiscontinued(selection)) {
+    throw new NowBuildError({
+      code: 'BUILD_UTILS_PYTHON_VERSION_DISCONTINUED',
+      link: 'http://vercel.link/python-version',
+      message: `Python version "${selection.version}" detected in Pipfile.lock is discontinued and must be upgraded. ${upstreamProvider}.`,
+    });
+  }
+
+  if (selection.discontinueDate) {
+    const d = selection.discontinueDate.toISOString().split('T')[0];
+    console.warn(
+      `Error: Python version "${selection.version}" detected in Pipfile.lock is deprecated. Deployments created on or after ${d} will fail to build. ${upstreamProvider}. http://vercel.link/python-version`
+    );
+  }
+
+  return selection;
+}
+
+function isDiscontinued({ discontinueDate }: PythonVersion): boolean {
+  const today = Date.now();
+  return discontinueDate !== undefined && discontinueDate.getTime() <= today;
+}
--- a/packages/python/test/fixtures/02-wsgi-pipenv/vercel.json
+++ b/packages/python/test/fixtures/02-wsgi-pipenv/vercel.json
@@ -5,7 +5,7 @@
    {
      "path": "/",
      "mustContain": "wsgi:RANDOMNESS_PLACEHOLDER",
-      "logMustContain": "Warning: Python version \"3.6\" detected in Pipfile.lock will reach End-Of-Life December 2021. Please upgrade."
+      "logMustContain": "Python version \"3.6\" detected in Pipfile.lock is deprecated. Deployments created on or after 2022-07-18 will fail to build"
    }
  ]
 }
--- a/packages/python/test/fixtures/03-env-vars/vercel.json
+++ b/packages/python/test/fixtures/03-env-vars/vercel.json
@@ -8,7 +8,7 @@
    {
      "path": "/",
      "mustContain": "RANDOMNESS_PLACEHOLDER:env",
-      "logMustContain": "Warning: Python version \"3.6\" detected in Pipfile.lock will reach End-Of-Life December 2021. Please upgrade."
+      "logMustContain": "Python version \"3.6\" detected in Pipfile.lock is deprecated. Deployments created on or after 2022-07-18 will fail to build"
    }
  ]
 }
--- a/packages/python/test/fixtures/04-cowsay-pipfile/vercel.json
+++ b/packages/python/test/fixtures/04-cowsay-pipfile/vercel.json
@@ -5,7 +5,7 @@
    {
      "path": "/",
      "mustContain": "pip:RANDOMNESS_PLACEHOLDER",
-      "logMustContain": "Warning: Invalid Python version \"3.7\" detected in Pipfile.lock will be ignored."
+      "logMustContain": "Python version \"3.7\" detected in Pipfile.lock is invalid and will be ignored."
    }
  ]
 }
--- a/packages/python/test/integration.test.ts
+++ b/packages/python/test/integration.test.ts
@@ -12,7 +12,7 @@ const {

 jest.setTimeout(4 * 60 * 1000);
 const buildUtilsUrl = '@canary';
-let builderUrl;
+let builderUrl: string;

 beforeAll(async () => {
  const builderPath = path.resolve(__dirname, '..');
--- a/packages/python/test/tsconfig.json
+++ b/packages/python/test/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../tsconfig.json",
+  "include": ["*.test.ts"]
+}
--- a/packages/python/test/unit.test.ts
+++ b/packages/python/test/unit.test.ts
@@ -0,0 +1,75 @@
+import { getSupportedPythonVersion } from '../src/version';
+
+let warningMessages: string[];
+const originalConsoleWarn = console.warn;
+const realDateNow = Date.now.bind(global.Date);
+beforeEach(() => {
+  warningMessages = [];
+  console.warn = m => {
+    warningMessages.push(m);
+  };
+});
+
+afterEach(() => {
+  console.warn = originalConsoleWarn;
+  global.Date.now = realDateNow;
+});
+
+it('should only match supported versions, otherwise throw an error', async () => {
+  expect(
+    getSupportedPythonVersion({ pipLockPythonVersion: '3.9' })
+  ).toHaveProperty('runtime', 'python3.9');
+  expect(
+    getSupportedPythonVersion({ pipLockPythonVersion: '3.6' })
+  ).toHaveProperty('runtime', 'python3.6');
+});
+
+it('should ignore minor version in vercel dev', async () => {
+  expect(
+    getSupportedPythonVersion({ pipLockPythonVersion: '3.9', isDev: true })
+  ).toHaveProperty('runtime', 'python3');
+  expect(
+    getSupportedPythonVersion({ pipLockPythonVersion: '3.6', isDev: true })
+  ).toHaveProperty('runtime', 'python3');
+  expect(
+    getSupportedPythonVersion({ pipLockPythonVersion: '999', isDev: true })
+  ).toHaveProperty('runtime', 'python3');
+  expect(warningMessages).toStrictEqual([]);
+});
+
+it('should select latest version when no Piplock detected', async () => {
+  expect(
+    getSupportedPythonVersion({ pipLockPythonVersion: undefined })
+  ).toHaveProperty('runtime', 'python3.9');
+  expect(warningMessages).toStrictEqual([]);
+});
+
+it('should select latest version and warn when invalid Piplock detected', async () => {
+  expect(
+    getSupportedPythonVersion({ pipLockPythonVersion: '999' })
+  ).toHaveProperty('runtime', 'python3.9');
+  expect(warningMessages).toStrictEqual([
+    'Warning: Python version "999" detected in Pipfile.lock is invalid and will be ignored. http://vercel.link/python-version',
+  ]);
+});
+
+it('should throw for discontinued versions', async () => {
+  global.Date.now = () => new Date('2022-07-31').getTime();
+  expect(() =>
+    getSupportedPythonVersion({ pipLockPythonVersion: '3.6' })
+  ).toThrow(
+    'Python version "3.6" detected in Pipfile.lock is discontinued and must be upgraded. This change is the result of a decision made by an upstream infrastructure provider (AWS).'
+  );
+  expect(warningMessages).toStrictEqual([]);
+});
+
+it('should warn for deprecated versions, soon to be discontinued', async () => {
+  global.Date.now = () => new Date('2021-07-01').getTime();
+
+  expect(
+    getSupportedPythonVersion({ pipLockPythonVersion: '3.6' })
+  ).toHaveProperty('runtime', 'python3.6');
+  expect(warningMessages).toStrictEqual([
+    'Error: Python version "3.6" detected in Pipfile.lock is deprecated. Deployments created on or after 2022-07-18 will fail to build. This change is the result of a decision made by an upstream infrastructure provider (AWS). http://vercel.link/python-version',
+  ]);
+});
--- a/packages/python/tsconfig.json
+++ b/packages/python/tsconfig.json
@@ -11,8 +11,10 @@
    "noUnusedLocals": true,
    "noUnusedParameters": true,
    "outDir": "dist",
-    "types": ["node"],
+    "types": ["node", "jest"],
    "strict": true,
    "target": "es2018"
-  }
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules"]
 }
--- a/packages/redwood/.gitignore
+++ b/packages/redwood/.gitignore
@@ -0,0 +1 @@
+!test/cache-fixtures/**
--- a/packages/redwood/package.json
+++ b/packages/redwood/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/redwood",
-  "version": "0.7.1-canary.4",
+  "version": "0.8.1-canary.1",
  "main": "./dist/index.js",
  "license": "MIT",
  "homepage": "https://vercel.com/docs",
@@ -15,17 +15,18 @@
  "scripts": {
    "build": "node build.js",
    "test-integration-once": "jest --env node --verbose --runInBand --bail test/test.js",
+    "test-unit": "jest --env node --verbose --bail test/prepare-cache.test.js",
    "prepublishOnly": "node build.js"
  },
  "dependencies": {
    "@vercel/nft": "0.18.1",
-    "@vercel/routing-utils": "1.13.1",
+    "@vercel/routing-utils": "1.13.2",
    "semver": "6.1.1"
  },
  "devDependencies": {
    "@types/aws-lambda": "8.10.19",
    "@types/node": "*",
    "@types/semver": "6.0.0",
-    "@vercel/build-utils": "2.15.2-canary.4"
+    "@vercel/build-utils": "2.16.1-canary.1"
  }
 }
--- a/packages/redwood/src/index.ts
+++ b/packages/redwood/src/index.ts
@@ -316,7 +316,6 @@ function hasScript(scriptName: string, pkg: PackageJson | null) {
  return typeof scripts[scriptName] === 'string';
 }

-export const prepareCache: PrepareCache = async ({ workPath }) => {
-  const cache = await glob('**/node_modules/**', workPath);
-  return cache;
+export const prepareCache: PrepareCache = ({ repoRootPath, workPath }) => {
+  return glob('**/node_modules/**', repoRootPath || workPath);
 };
--- a/packages/redwood/test/cache-fixtures/foo/node_modules/file
+++ b/packages/redwood/test/cache-fixtures/foo/node_modules/file
--- a/packages/redwood/test/cache-fixtures/index.js
+++ b/packages/redwood/test/cache-fixtures/index.js
--- a/packages/redwood/test/cache-fixtures/node_modules/file
+++ b/packages/redwood/test/cache-fixtures/node_modules/file
--- a/packages/redwood/test/prepare-cache.test.js
+++ b/packages/redwood/test/prepare-cache.test.js
@@ -0,0 +1,28 @@
+const path = require('path');
+const { prepareCache } = require('../dist');
+
+describe('prepareCache()', () => {
+  test('should cache **/node_modules/**', async () => {
+    const files = await prepareCache({
+      repoRootPath: path.resolve(__dirname, './cache-fixtures/'),
+    });
+
+    expect(files['foo/node_modules/file']).toBeDefined();
+    expect(files['node_modules/file']).toBeDefined();
+    expect(files['index.js']).toBeUndefined();
+  });
+
+  test('should ignore root modules', async () => {
+    const files = await prepareCache({
+      workPath: path.resolve(__dirname, './cache-fixtures/foo/'),
+    });
+
+    expect(files['node_modules/file']).toBeDefined();
+    expect(
+      files['node_modules/file'].fsPath.includes(
+        'cache-fixtures/foo/node_modules/file'
+      )
+    ).toBeTruthy();
+    expect(files['index.js']).toBeUndefined();
+  });
+});
--- a/packages/routing-utils/package.json
+++ b/packages/routing-utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/routing-utils",
-  "version": "1.13.1",
+  "version": "1.13.2",
  "description": "Vercel routing utilities",
  "main": "./dist/index.js",
  "types": "./dist/index.d.ts",
--- a/packages/ruby/package.json
+++ b/packages/ruby/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@vercel/ruby",
  "author": "Nathan Cahill <nathan@nathancahill.com>",
-  "version": "1.3.3-canary.4",
+  "version": "1.3.4-canary.1",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/ruby",
@@ -22,7 +22,7 @@
  "devDependencies": {
    "@types/fs-extra": "8.0.0",
    "@types/semver": "6.0.0",
-    "@vercel/build-utils": "2.15.2-canary.4",
+    "@vercel/build-utils": "2.16.1-canary.1",
    "@vercel/ncc": "0.24.0",
    "execa": "2.0.4",
    "fs-extra": "^7.0.1",
--- a/packages/static-build/package.json
+++ b/packages/static-build/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/static-build",
-  "version": "0.23.2-canary.4",
+  "version": "0.24.1-canary.1",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/build-step",
@@ -35,10 +35,10 @@
    "@types/ms": "0.7.31",
    "@types/node-fetch": "2.5.4",
    "@types/promise-timeout": "1.3.0",
-    "@vercel/build-utils": "2.15.2-canary.4",
-    "@vercel/frameworks": "0.7.2-canary.0",
+    "@vercel/build-utils": "2.16.1-canary.1",
+    "@vercel/frameworks": "0.8.0",
    "@vercel/ncc": "0.24.0",
-    "@vercel/routing-utils": "1.13.1",
+    "@vercel/routing-utils": "1.13.2",
    "get-port": "5.0.0",
    "is-port-reachable": "2.0.1",
    "ms": "2.1.2",
--- a/packages/static-build/src/index.ts
+++ b/packages/static-build/src/index.ts
@@ -451,7 +451,7 @@ export const build: BuildV2 = async ({
          const opts = {
            env: {
              ...process.env,
-              // See more: https://git.io/JtDwx
+              // See more: https://github.com/rubygems/rubygems/blob/a82d04856deba58be6b90f681a5e42a7c0f2baa7/bundler/lib/bundler/man/bundle-config.1.ronn
              BUNDLE_BIN: 'vendor/bin',
              BUNDLE_CACHE_PATH: 'vendor/cache',
              BUNDLE_PATH: 'vendor/bundle',
@@ -466,7 +466,7 @@ export const build: BuildV2 = async ({
          isBundleInstall = true;
        }
        if (existsSync(requirementsPath)) {
-          debug('Detected requirements.txt');
+          debug('Detected requirements.txt');
          printInstall();
          await runPipInstall(
            workPath,
@@ -754,6 +754,7 @@ export const build: BuildV2 = async ({

 export const prepareCache: PrepareCache = async ({
  entrypoint,
+  repoRootPath,
  workPath,
  config,
 }) => {
@@ -783,7 +784,7 @@ export const prepareCache: PrepareCache = async ({
  // Default cache files
  Object.assign(
    cacheFiles,
-    await glob('{.shadow-cljs,node_modules}/**', workPath)
+    await glob('**/{.shadow-cljs,node_modules}/**', repoRootPath || workPath)
  );

  // Framework cache files
--- a/packages/static-build/test/cache-fixtures/root-path/foo/node_modules/file
+++ b/packages/static-build/test/cache-fixtures/root-path/foo/node_modules/file
--- a/packages/static-build/test/cache-fixtures/root-path/index.js
+++ b/packages/static-build/test/cache-fixtures/root-path/index.js
--- a/packages/static-build/test/cache-fixtures/root-path/node_modules/file
+++ b/packages/static-build/test/cache-fixtures/root-path/node_modules/file
--- a/packages/static-build/test/fixtures/11-svelte/README.md
+++ b/packages/static-build/test/fixtures/11-svelte/README.md
@@ -1,4 +1,4 @@
-_Psst — looking for a shareable component template? Go here --> [sveltejs/component-template](https://github.com/sveltejs/component-template)_
+_Psst — looking for a shareable component template? Go here --> [sveltejs/component-template](https://github.com/sveltejs/component-template)_

 ---

--- a/packages/static-build/test/fixtures/15-preact/src/components/app.js
+++ b/packages/static-build/test/fixtures/15-preact/src/components/app.js
@@ -9,7 +9,7 @@ import Profile from '../routes/profile';

 export default class App extends Component {
  /** Gets fired when the route changes.
-   *	@param {Object} event		"change" event from [preact-router](http://git.io/preact-router)
+   *	@param {Object} event		"change" event from https://github.com/preactjs/preact-router
   *	@param {string} event.url	The newly routed URL
   */
  handleRoute = e => {
--- a/packages/static-build/test/fixtures/20-ember/.travis.yml
+++ b/packages/static-build/test/fixtures/20-ember/.travis.yml
@@ -15,7 +15,7 @@ cache:

 env:
  global:
-    # See https://git.io/vdao3 for details.
+    # See https://github.com/ember-cli/ember-cli/blob/master/docs/build-concurrency.md
    - JOBS=1

 script:
--- a/packages/static-build/test/prepare-cache.test.ts
+++ b/packages/static-build/test/prepare-cache.test.ts
@@ -1,3 +1,4 @@
+import { FileFsRef } from '@vercel/build-utils';
 import path from 'path';
 import { prepareCache } from '../src';

@@ -15,6 +16,37 @@ describe('prepareCache()', () => {
    expect(files['index.js']).toBeUndefined();
  });

+  test('should cache **/node_modules/**', async () => {
+    const files = await prepareCache({
+      config: { zeroConfig: true },
+      repoRootPath: path.resolve(__dirname, './cache-fixtures/root-path'),
+      workPath: path.resolve(__dirname, './cache-fixtures/root-path/foo'),
+      entrypoint: 'index.js',
+      files: {},
+    });
+
+    expect(files['foo/node_modules/file']).toBeDefined();
+    expect(files['node_modules/file']).toBeDefined();
+    expect(files['index.js']).toBeUndefined();
+  });
+
+  test('should ignore root modules', async () => {
+    const files = await prepareCache({
+      config: { zeroConfig: true },
+      workPath: path.resolve(__dirname, './cache-fixtures/root-path/foo'),
+      entrypoint: 'index.js',
+      files: {},
+    });
+
+    expect(files['node_modules/file']).toBeDefined();
+    expect(
+      (files['node_modules/file'] as FileFsRef).fsPath.includes(
+        'cache-fixtures/root-path/foo/node_modules/file'
+      )
+    ).toBeTruthy();
+    expect(files['index.js']).toBeUndefined();
+  });
+
  test('should cache index.js and other/file2.js as defined in .vercel_build_output/config/build.json', async () => {
    const files = await prepareCache({
      config: { zeroConfig: true },
--- a/packages/static-config/package.json
+++ b/packages/static-config/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/static-config",
-  "version": "1.0.0-canary.0",
+  "version": "1.0.0",
  "license": "MIT",
  "main": "./dist/index",
  "repository": {
@@ -22,7 +22,7 @@
    "ts-morph": "12.0.0"
  },
  "devDependencies": {
-    "@types/jest": "27.0.2",
+    "@types/jest": "27.4.1",
    "@types/node": "*"
  },
  "jest": {
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
agadzik	f88c862e9d	Publish Canary - @vercel/build-utils@2.16.1-canary.1 - vercel@24.2.1-canary.1 - @vercel/client@11.0.1-canary.1 - @vercel/go@1.4.1-canary.1 - @vercel/node@1.15.1-canary.1 - @vercel/python@2.3.1-canary.1 - @vercel/redwood@0.8.1-canary.1 - @vercel/ruby@1.3.4-canary.1 - @vercel/static-build@0.24.1-canary.1	2022-05-05 14:11:13 -04:00
Nathan Rajlich	9170820371	[build-utils] Add `ShouldServe` type (#7755 ) Version 3 Builders can define a `shouldServe()` function that is used in `vercel dev`, so add the proper type for that.	2022-05-05 17:06:20 +00:00
Andrew Gadzik	c881546e0e	[build-utils] Add supported list of workspace managers (#7737 ) In order to support monorepo detection, we need to build out the list of supported workspace managers so that our helper functions and API endpoints can utilize the same `detectFramework` function / logic to detect a workspace manager for a given git repository. ### Related Issues - Closes https://github.com/vercel/vercel/issues/7731 ### 📋 Checklist <!-- Please keep your PR as a Draft until the checklist is complete --> #### Tests - [x] The code changed/added as part of this PR has been covered with tests - [x] All tests pass locally with `yarn test-unit` #### Code Review - [x] This PR has a concise title and thorough description useful to a reviewer - [x] Issue from task tracker has a link to this PR	2022-05-05 14:44:34 +00:00
Nathan Rajlich	fa21db98e4	[cli] Revert "Use `@vercel/fetch-retry` in CLI integration tests" (#7738 ) This reverts commit `03a8fbd3a7` (#7360).	2022-05-04 17:15:54 +00:00
Ethan Arrowood	8eabbfc666	Publish Canary - @vercel/build-utils@2.16.1-canary.0 - vercel@24.2.1-canary.0 - @vercel/client@11.0.1-canary.0 - @vercel/go@1.4.1-canary.0 - @vercel/node@1.15.1-canary.0 - @vercel/python@2.3.1-canary.0 - @vercel/redwood@0.8.1-canary.0 - @vercel/ruby@1.3.4-canary.0 - @vercel/static-build@0.24.1-canary.0	2022-05-02 11:33:22 -06:00
Ethan Arrowood	6783f7afc9	[build-utils] Fix package manager auto detection precedence (#7733 ) ### Related Issues improves package manager auto detection so that when multiple lock files are found, the highest priority one is selected rather than defaulting to yarn. ### 📋 Checklist <!-- Please keep your PR as a Draft until the checklist is complete --> #### Tests - [x] The code changed/added as part of this PR has been covered with tests - [ ] All tests pass locally with `yarn test-unit` #### Code Review - [ ] This PR has a concise title and thorough description useful to a reviewer - [ ] Issue from task tracker has a link to this PR	2022-05-02 17:22:01 +00:00
Steven	a400b9b29d	Publish Stable - @vercel/build-utils@2.16.0 - vercel@24.2.0 - @vercel/client@11.0.0 - @vercel/frameworks@0.8.0 - @vercel/go@1.4.0 - @vercel/node-bridge@2.2.1 - @vercel/node@1.15.0 - @vercel/python@2.3.0 - @vercel/redwood@0.8.0 - @vercel/routing-utils@1.13.2 - @vercel/ruby@1.3.3 - @vercel/static-build@0.24.0 - @vercel/static-config@1.0.0	2022-04-29 14:11:32 -04:00
Steven	b549c37149	[build-utils][static-build] Replace 00a0 with space (#7732 )	2022-04-28 22:25:24 -04:00
Nathan Rajlich	30d5e64291	Publish Canary - @vercel/build-utils@2.15.2-canary.6 - vercel@24.1.1-canary.8 - @vercel/client@10.4.2-canary.7 - @vercel/go@1.3.3-canary.6 - @vercel/node@1.14.2-canary.7 - @vercel/python@2.2.3-canary.6 - @vercel/redwood@0.7.1-canary.6 - @vercel/ruby@1.3.3-canary.6 - @vercel/static-build@0.23.2-canary.6	2022-04-28 17:50:59 -07:00
Nathan Rajlich	47c2c361d2	[build-utils] Update "yazl" dependency (#7734 ) The older version of "yazl" was using `new Buffer()` which causes deprecation warnings to be printed. The latest version avoids that.	2022-04-28 17:47:10 -07:00
Nathan Rajlich	438576fc7c	Publish Canary - @vercel/build-utils@2.15.2-canary.5 - vercel@24.1.1-canary.7 - @vercel/client@10.4.2-canary.6 - @vercel/frameworks@0.7.2-canary.1 - @vercel/go@1.3.3-canary.5 - @vercel/node@1.14.2-canary.6 - @vercel/python@2.2.3-canary.5 - @vercel/redwood@0.7.1-canary.5 - @vercel/ruby@1.3.3-canary.5 - @vercel/static-build@0.23.2-canary.5 - @vercel/static-config@1.0.0-canary.1	2022-04-28 11:53:39 -07:00
Steven	b30343ef7b	[tests] Bump dependencies for jest/eslint/prettier/turbo/etc (#7727 )	2022-04-28 14:52:46 -04:00
Ethan Arrowood	2dc0dfa572	[node][static-build][redwood] Add root path pattern to `prepareCache()` (#7710 )	2022-04-27 21:17:44 -07:00
Steven	9ee54b3dd6	[static-build] Resolve git.io links (#7722 ) https://github.blog/changelog/2022-04-25-git-io-deprecation/	2022-04-26 21:57:12 -04:00
Steven	9d67e0bc06	[python] Add discontinue date for Python 3.6 (#7709 ) This PR does a few things: - Changes the existing warning message for Python 3.6 to print a discontinue date - Will automatically fail new Python 3.6 deployments created after that date - Consolidates logic to make Python version selection work in a similar manner to Node.js version selection - Changes tests from JS to TS	2022-04-26 15:49:19 -04:00