@vercel/client 18.2.2 → 18.2.3

package/dist/utils/index.js

@@ -101,6 +101,24 @@ const maybeRead = async function(path, default_) {
     return default_;
   }
 };
+async function getUserIgnore(cwd) {
+  const [vercelignore, nowignore] = await Promise.all([
+    maybeRead((0, import_path.join)(cwd, ".vercelignore"), ""),
+    maybeRead((0, import_path.join)(cwd, ".nowignore"), "")
+  ]);
+  if (vercelignore && nowignore) {
+    throw new import_build_utils.NowBuildError({
+      code: "CONFLICTING_IGNORE_FILES",
+      message: "Cannot use both a `.vercelignore` and `.nowignore` file. Please delete the `.nowignore` file.",
+      link: "https://vercel.link/combining-old-and-new-config"
+    });
+  }
+  const ignoreFile = vercelignore || nowignore;
+  if (!ignoreFile) {
+    return null;
+  }
+  return (0, import_ignore.default)().add(clearRelative(ignoreFile));
+}
 async function buildFileTree(path, {
   isDirectory,
   prebuilt,
@@ -129,6 +147,7 @@ async function buildFileTree(path, {
       const vcConfigFilePaths = fileList.filter(
         (file) => (0, import_path.basename)(file) === ".vc-config.json"
       );
+      const userIg = await getUserIgnore(path);
       await Promise.all(
         vcConfigFilePaths.map(async (p) => {
           const configJson = await (0, import_fs_extra.readFile)(p, "utf8");
@@ -136,7 +155,21 @@ async function buildFileTree(path, {
           if (!config.filePathMap)
             return;
           for (const v of Object.values(config.filePathMap)) {
-            refs.add((0, import_path.join)(path, v));
+            const absPath = (0, import_path.join)(path, v);
+            const rel = (0, import_path.relative)(path, absPath);
+            if (rel.startsWith("..") || (0, import_path.isAbsolute)(rel)) {
+              debug(
+                `Ignoring "filePathMap" entry "${v}": resolves outside the deployment root`
+              );
+              continue;
+            }
+            if (userIg && userIg.ignores(rel)) {
+              debug(
+                `Ignoring "filePathMap" entry "${v}": matched by a rule in .vercelignore/.nowignore`
+              );
+              continue;
+            }
+            refs.add(absPath);
           }
         })
       );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/client",
-  "version": "18.2.2",
+  "version": "18.2.3",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "homepage": "https://vercel.com",
@@ -37,9 +37,9 @@
     "querystring": "^0.2.0",
     "sleep-promise": "8.0.1",
     "tar-fs": "1.16.3",
-    "@vercel/build-utils": "13.36.2",
-    "@vercel/error-utils": "2.2.0",
-    "@vercel/routing-utils": "6.4.0"
+    "@vercel/routing-utils": "6.4.0",
+    "@vercel/build-utils": "13.36.3",
+    "@vercel/error-utils": "2.2.0"
   },
   "scripts": {
     "build": "node ../../utils/build.mjs",