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
[build-utils] Fix package manager auto detection precedence (#7733 )
2025-12-11 12:57:46 +00:00 · 2022-05-02 11:33:22 -06:00 · 2022-05-02 17:22:01 +00:00
19 changed files with 7958 additions and 28 deletions
--- a/packages/build-utils/package.json
+++ b/packages/build-utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/build-utils",
-  "version": "2.16.0",
+  "version": "2.16.1-canary.0",
  "license": "MIT",
  "main": "./dist/index.js",
  "types": "./dist/index.d.js",
--- 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
--- 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,10 @@
+{
+  "private": "true",
+  "name": "25-multiple-lock-files-yarn",
+  "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,10 @@
+{
+  "private": "true",
+  "name": "26-multiple-lock-files-pnpm",
+  "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/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/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vercel",
-  "version": "24.2.0",
+  "version": "24.2.1-canary.0",
  "preferGlobal": true,
  "license": "Apache-2.0",
  "description": "The command-line interface for Vercel",
@@ -43,11 +43,11 @@
    "node": ">= 12"
  },
  "dependencies": {
-    "@vercel/build-utils": "2.16.0",
-    "@vercel/go": "1.4.0",
-    "@vercel/node": "1.15.0",
-    "@vercel/python": "2.3.0",
-    "@vercel/ruby": "1.3.3",
+    "@vercel/build-utils": "2.16.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/ruby": "1.3.4-canary.0",
    "update-notifier": "4.1.0"
  },
  "devDependencies": {
@@ -90,7 +90,7 @@
    "@types/update-notifier": "5.1.0",
    "@types/which": "1.3.2",
    "@types/write-json-file": "2.2.1",
-    "@vercel/client": "11.0.0",
+    "@vercel/client": "11.0.1-canary.0",
    "@vercel/fetch-retry": "5.0.3",
    "@vercel/frameworks": "0.8.0",
    "@vercel/ncc": "0.24.0",
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/client",
-  "version": "11.0.0",
+  "version": "11.0.1-canary.0",
  "main": "dist/index.js",
  "typings": "dist/index.d.ts",
  "homepage": "https://vercel.com",
@@ -41,7 +41,7 @@
    ]
  },
  "dependencies": {
-    "@vercel/build-utils": "2.16.0",
+    "@vercel/build-utils": "2.16.1-canary.0",
    "@zeit/fetch": "5.2.0",
    "async-retry": "1.2.3",
    "async-sema": "3.0.0",
--- a/packages/go/package.json
+++ b/packages/go/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/go",
-  "version": "1.4.0",
+  "version": "1.4.1-canary.0",
  "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.16.0",
+    "@vercel/build-utils": "2.16.1-canary.0",
    "@vercel/ncc": "0.24.0",
    "async-retry": "1.3.1",
    "execa": "^1.0.0",
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/node",
-  "version": "1.15.0",
+  "version": "1.15.1-canary.0",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -33,7 +33,7 @@
    "@types/cookie": "0.3.3",
    "@types/etag": "1.8.0",
    "@types/test-listen": "1.1.0",
-    "@vercel/build-utils": "2.16.0",
+    "@vercel/build-utils": "2.16.1-canary.0",
    "@vercel/ncc": "0.24.0",
    "@vercel/nft": "0.18.1",
    "content-type": "1.0.4",
--- a/packages/python/package.json
+++ b/packages/python/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/python",
-  "version": "2.3.0",
+  "version": "2.3.1-canary.0",
  "main": "./dist/index.js",
  "license": "MIT",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
@@ -22,7 +22,7 @@
  "devDependencies": {
    "@types/execa": "^0.9.0",
    "@types/jest": "27.4.1",
-    "@vercel/build-utils": "2.16.0",
+    "@vercel/build-utils": "2.16.1-canary.0",
    "@vercel/ncc": "0.24.0",
    "execa": "^1.0.0",
    "typescript": "4.3.4"
--- a/packages/redwood/package.json
+++ b/packages/redwood/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/redwood",
-  "version": "0.8.0",
+  "version": "0.8.1-canary.0",
  "main": "./dist/index.js",
  "license": "MIT",
  "homepage": "https://vercel.com/docs",
@@ -27,6 +27,6 @@
    "@types/aws-lambda": "8.10.19",
    "@types/node": "*",
    "@types/semver": "6.0.0",
-    "@vercel/build-utils": "2.16.0"
+    "@vercel/build-utils": "2.16.1-canary.0"
  }
 }
--- 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",
+  "version": "1.3.4-canary.0",
  "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.16.0",
+    "@vercel/build-utils": "2.16.1-canary.0",
    "@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.24.0",
+  "version": "0.24.1-canary.0",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/build-step",
@@ -35,7 +35,7 @@
    "@types/ms": "0.7.31",
    "@types/node-fetch": "2.5.4",
    "@types/promise-timeout": "1.3.0",
-    "@vercel/build-utils": "2.16.0",
+    "@vercel/build-utils": "2.16.1-canary.0",
    "@vercel/frameworks": "0.8.0",
    "@vercel/ncc": "0.24.0",
    "@vercel/routing-utils": "1.13.2",