vercel 29.3.5 → 29.4.0

package/dist/index.js

@@ -221772,7 +221772,7 @@ async function detectBuilders(files, pkg, options = {}) {
             apiBuilders.some(b => (0, is_official_runtime_1.isOfficialRuntime)('node', b.use))) {
             warnings.push({
                 code: 'conflicting_files',
-                message: 'When using Next.js, it is recommended to place Node.js Serverless Functions inside of the `pages/api` (provided by Next.js) directory instead of `api` (provided by Vercel).',
+                message: 'When using Next.js, it is recommended to place JavaScript Functions inside of the `pages/api` (provided by Next.js) directory instead of `api` (provided by Vercel). Other languages (Python, Go, etc) should still go in the `api` directory.',
                 link: 'https://nextjs.org/docs/api-routes/introduction',
                 action: 'Learn More',
             });
@@ -230640,8 +230640,10 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 const chalk_1 = __importDefault(__webpack_require__(90877));
 const get_args_1 = __importDefault(__webpack_require__(2505));
 const logo_1 = __importDefault(__webpack_require__(66669));
+const cmd_1 = __importDefault(__webpack_require__(62422));
 const pkg_name_1 = __webpack_require__(79000);
 const ensure_link_1 = __webpack_require__(65382);
+const repo_1 = __webpack_require__(18726);
 const help = () => {
     console.log(`
   ${chalk_1.default.bold(`${logo_1.default} ${(0, pkg_name_1.getPkgName)()} link`)} [options]
@@ -230649,6 +230651,7 @@ const help = () => {
   ${chalk_1.default.dim('Options:')}
 
     -h, --help                     Output usage information
+    -r, --repo                     Link multiple projects based on Git repository (alpha)
     -A ${chalk_1.default.bold.underline('FILE')}, --local-config=${chalk_1.default.bold.underline('FILE')}   Path to the local ${'`vercel.json`'} file
     -Q ${chalk_1.default.bold.underline('DIR')}, --global-config=${chalk_1.default.bold.underline('DIR')}    Path to the global ${'`.vercel`'} directory
     -d, --debug                    Debug mode [off]
@@ -230669,7 +230672,12 @@ const help = () => {
 
   ${chalk_1.default.gray('–')} Link a specific directory to a Vercel Project
 
-      ${chalk_1.default.cyan(`$ ${(0, pkg_name_1.getPkgName)()} link /usr/src/project`)}
+      ${chalk_1.default.cyan(`$ ${(0, pkg_name_1.getPkgName)()} link --cwd /path/to/project`)}
+
+  ${chalk_1.default.gray('–')} ${chalk_1.default.yellow('(alpha)')} Link to the current Git repository, allowing for multiple
+    Vercel Projects to be linked simultaneously (useful for monorepos)
+
+      ${chalk_1.default.cyan(`$ ${(0, pkg_name_1.getPkgName)()} link --repo`)}
 `);
 };
 async function main(client) {
@@ -230678,6 +230686,8 @@ async function main(client) {
         '-y': '--yes',
         '--project': String,
         '-p': '--project',
+        '--repo': Boolean,
+        '-r': '--repo',
         // deprecated
         '--confirm': Boolean,
         '-c': '--confirm',
@@ -230690,15 +230700,28 @@ async function main(client) {
         client.output.warn('`--confirm` is deprecated, please use `--yes` instead');
         argv['--yes'] = argv['--confirm'];
     }
-    const cwd = argv._[1] || process.cwd();
-    const link = await (0, ensure_link_1.ensureLink)('link', client, cwd, {
-        autoConfirm: !!argv['--yes'],
-        forceDelete: true,
-        projectName: argv['--project'],
-        successEmoji: 'success',
-    });
-    if (typeof link === 'number') {
-        return link;
+    const yes = !!argv['--yes'];
+    let cwd = argv._[1];
+    if (cwd) {
+        client.output.warn(`The ${(0, cmd_1.default)('vc link <directory>')} syntax is deprecated, please use ${(0, cmd_1.default)(`vc link --cwd ${cwd}`)} instead`);
+    }
+    else {
+        cwd = process.cwd();
+    }
+    if (argv['--repo']) {
+        client.output.warn(`The ${(0, cmd_1.default)('--repo')} flag is in alpha, please report issues`);
+        await (0, repo_1.ensureRepoLink)(client, cwd, yes);
+    }
+    else {
+        const link = await (0, ensure_link_1.ensureLink)('link', client, cwd, {
+            autoConfirm: yes,
+            forceDelete: true,
+            projectName: argv['--project'],
+            successEmoji: 'success',
+        });
+        if (typeof link === 'number') {
+            return link;
+        }
     }
     return 0;
 }
@@ -245059,6 +245082,46 @@ function isValidName(name = '') {
 exports.isValidName = isValidName;
 
 
+/***/ }),
+
+/***/ 19159:
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.addToGitIgnore = void 0;
+const os_1 = __importDefault(__webpack_require__(12087));
+const path_1 = __webpack_require__(85622);
+const fs_extra_1 = __webpack_require__(36365);
+const link_1 = __webpack_require__(49347);
+async function addToGitIgnore(path, ignore = link_1.VERCEL_DIR) {
+    let isGitIgnoreUpdated = false;
+    try {
+        const gitIgnorePath = (0, path_1.join)(path, '.gitignore');
+        let gitIgnore = (await (0, fs_extra_1.readFile)(gitIgnorePath, 'utf8').catch(() => null)) ?? '';
+        const EOL = gitIgnore.includes('\r\n') ? '\r\n' : os_1.default.EOL;
+        let contentModified = false;
+        if (!gitIgnore.split(EOL).includes(ignore)) {
+            gitIgnore += `${gitIgnore.endsWith(EOL) || gitIgnore.length === 0 ? '' : EOL}${ignore}${EOL}`;
+            contentModified = true;
+        }
+        if (contentModified) {
+            await (0, fs_extra_1.writeFile)(gitIgnorePath, gitIgnore);
+            isGitIgnoreUpdated = true;
+        }
+    }
+    catch (error) {
+        // ignore errors since this is non-critical
+    }
+    return isGitIgnoreUpdated;
+}
+exports.addToGitIgnore = addToGitIgnore;
+
+
 /***/ }),
 
 /***/ 65382:
@@ -245115,6 +245178,204 @@ async function ensureLink(commandName, client, cwd, opts) {
 exports.ensureLink = ensureLink;
 
 
+/***/ }),
+
+/***/ 18726:
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.findProjectFromPath = exports.traverseUpDirectories = exports.findRepoRoot = exports.ensureRepoLink = exports.getRepoLink = void 0;
+const chalk_1 = __importDefault(__webpack_require__(90877));
+const pluralize_1 = __importDefault(__webpack_require__(43669));
+const os_1 = __webpack_require__(12087);
+const path_1 = __webpack_require__(85622);
+const build_utils_1 = __webpack_require__(63445);
+const fs_extra_1 = __webpack_require__(36365);
+const confirm_1 = __importDefault(__webpack_require__(59320));
+const humanize_path_1 = __importDefault(__webpack_require__(33234));
+const link_1 = __webpack_require__(49347);
+const create_git_meta_1 = __webpack_require__(30019);
+const link_2 = __importDefault(__webpack_require__(39302));
+const emoji_1 = __webpack_require__(35172);
+const select_org_1 = __importDefault(__webpack_require__(96339));
+const add_to_gitignore_1 = __webpack_require__(19159);
+const home = (0, os_1.homedir)();
+/**
+ * Given a directory path `cwd`, finds the root of the Git repository
+ * and returns the parsed `.vercel/repo.json` file if the repository
+ * has already been linked.
+ */
+async function getRepoLink(cwd) {
+    // Determine where the root of the repo is
+    const rootPath = await findRepoRoot(cwd);
+    if (!rootPath)
+        return undefined;
+    // Read the `repo.json`, if this repo has already been linked
+    const repoConfigPath = (0, path_1.join)(rootPath, link_1.VERCEL_DIR, link_1.VERCEL_DIR_REPO);
+    const repoConfig = await (0, fs_extra_1.readJSON)(repoConfigPath).catch(err => {
+        if (err.code !== 'ENOENT')
+            throw err;
+    });
+    return { rootPath, repoConfig, repoConfigPath };
+}
+exports.getRepoLink = getRepoLink;
+async function ensureRepoLink(client, cwd, yes = false) {
+    const { output } = client;
+    const repoLink = await getRepoLink(cwd);
+    if (repoLink) {
+        output.debug(`Found Git repository root directory: ${repoLink.rootPath}`);
+    }
+    else {
+        throw new Error('Could not determine Git repository root directory');
+    }
+    let { rootPath, repoConfig, repoConfigPath } = repoLink;
+    if (!repoConfig) {
+        // Not yet linked, so prompt user to begin linking
+        let shouldLink = yes ||
+            (await (0, confirm_1.default)(client, `Link Git repository at ${chalk_1.default.cyan(`“${(0, humanize_path_1.default)(rootPath)}”`)} to your Project(s)?`, true));
+        if (!shouldLink) {
+            output.print(`Canceled. Repository not linked.\n`);
+            return;
+        }
+        const org = await (0, select_org_1.default)(client, 'Which scope should contain your Project(s)?', yes);
+        client.config.currentTeam = org.type === 'team' ? org.id : undefined;
+        const remoteUrls = await (0, create_git_meta_1.getRemoteUrls)((0, path_1.join)(rootPath, '.git/config'), output);
+        if (!remoteUrls) {
+            throw new Error('Could not determine Git remote URLs');
+        }
+        const remoteNames = Object.keys(remoteUrls);
+        let remoteName;
+        if (remoteNames.length === 1) {
+            remoteName = remoteNames[0];
+        }
+        else {
+            // Prompt user to select which remote to use
+            const originIndex = remoteNames.indexOf('origin');
+            const answer = await client.prompt({
+                type: 'list',
+                name: 'value',
+                message: 'Which Git remote should be used?',
+                choices: remoteNames.map(name => {
+                    return { name: name, value: name };
+                }),
+                default: originIndex === -1 ? 0 : originIndex,
+            });
+            remoteName = answer.value;
+        }
+        const repoUrl = remoteUrls[remoteName];
+        output.spinner(`Fetching Projects for ${(0, link_2.default)(repoUrl)} under ${chalk_1.default.bold(org.slug)}…`);
+        // TODO: Add pagination to fetch all Projects
+        const query = new URLSearchParams({ repoUrl, limit: '100' });
+        const projects = await client.fetch(`/v2/projects?${query}`);
+        if (projects.length === 0) {
+            output.log(`No Projects are linked to ${(0, link_2.default)(repoUrl)} under ${chalk_1.default.bold(org.slug)}.`);
+            // TODO: run detection logic to find potential projects.
+            // then prompt user to select valid projects.
+            // then create new Projects
+        }
+        else {
+            output.log(`Found ${chalk_1.default.bold(projects.length)} ${(0, pluralize_1.default)('Project', projects.length)} linked to ${(0, link_2.default)(repoUrl)} under ${chalk_1.default.bold(org.slug)}:`);
+        }
+        for (const project of projects) {
+            output.print(`  * ${chalk_1.default.cyan(`${org.slug}/${project.name}\n`)}`);
+        }
+        shouldLink =
+            yes ||
+                (await (0, confirm_1.default)(client, `Link to ${projects.length === 1 ? 'it' : 'them'}?`, true));
+        if (!shouldLink) {
+            output.print(`Canceled. Repository not linked.\n`);
+            return;
+        }
+        repoConfig = {
+            orgId: org.id,
+            remoteName,
+            projects: projects.map(project => {
+                return {
+                    id: project.id,
+                    name: project.name,
+                    directory: (0, path_1.normalize)(project.rootDirectory || ''),
+                };
+            }),
+        };
+        await (0, fs_extra_1.outputJSON)(repoConfigPath, repoConfig, { spaces: 2 });
+        await (0, fs_extra_1.writeFile)((0, path_1.join)(rootPath, link_1.VERCEL_DIR, link_1.VERCEL_DIR_README), await (0, fs_extra_1.readFile)((0, path_1.join)(__dirname, 'VERCEL_DIR_README.txt'), 'utf8'));
+        // update .gitignore
+        const isGitIgnoreUpdated = await (0, add_to_gitignore_1.addToGitIgnore)(rootPath);
+        output.print((0, emoji_1.prependEmoji)(`Linked to ${(0, link_2.default)(repoUrl)} under ${chalk_1.default.bold(org.slug)} (created ${link_1.VERCEL_DIR}${isGitIgnoreUpdated ? ' and added it to .gitignore' : ''})`, (0, emoji_1.emoji)('link')) + '\n');
+    }
+    return {
+        repoConfig,
+        repoConfigPath,
+        rootPath,
+    };
+}
+exports.ensureRepoLink = ensureRepoLink;
+/**
+ * Given a `start` directory, traverses up the directory hierarchy until
+ * the nearest `.git/config` file is found. Returns the directory where
+ * the Git config was found, or `undefined` when no Git repo was found.
+ */
+async function findRepoRoot(start) {
+    for (const current of traverseUpDirectories(start)) {
+        if (current === home) {
+            // Sometimes the $HOME directory is set up as a Git repo
+            // (for dotfiles, etc.). In this case it's safe to say that
+            // this isn't the repo we're looking for. Bail.
+            break;
+        }
+        const gitConfigPath = (0, path_1.join)(current, '.git/config');
+        const stat = await (0, fs_extra_1.lstat)(gitConfigPath).catch(err => {
+            if (err.code !== 'ENOENT')
+                throw err;
+        });
+        if (stat) {
+            return current;
+        }
+    }
+}
+exports.findRepoRoot = findRepoRoot;
+function* traverseUpDirectories(start) {
+    let current = (0, path_1.normalize)(start);
+    while (current) {
+        yield current;
+        // Go up one directory
+        const next = (0, path_1.join)(current, '..');
+        current = next === current ? undefined : next;
+    }
+}
+exports.traverseUpDirectories = traverseUpDirectories;
+function sortByDirectory(a, b) {
+    const aParts = a.directory.split('/');
+    const bParts = b.directory.split('/');
+    return bParts.length - aParts.length;
+}
+/**
+ * Finds the matching Project from an array of Project links
+ * where the provided relative path is within the Project's
+ * root directory.
+ */
+function findProjectFromPath(projects, path) {
+    const normalizedPath = (0, build_utils_1.normalizePath)(path);
+    return projects
+        .slice()
+        .sort(sortByDirectory)
+        .find(project => {
+        if (project.directory === '.') {
+            // Project has no "Root Directory" setting, so any path is valid
+            return true;
+        }
+        return (normalizedPath === project.directory ||
+            normalizedPath.startsWith(`${project.directory}/`));
+    });
+}
+exports.findProjectFromPath = findProjectFromPath;
+
+
 /***/ }),
 
 /***/ 71225:
@@ -247226,9 +247487,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.linkFolderToProject = exports.getLinkedProject = exports.getLinkFromDir = exports.getVercelDirectory = exports.VERCEL_DIR_PROJECT = exports.VERCEL_DIR_README = exports.VERCEL_DIR_FALLBACK = exports.VERCEL_DIR = void 0;
+exports.linkFolderToProject = exports.getLinkedProject = exports.getLinkFromDir = exports.getVercelDirectory = exports.VERCEL_DIR_REPO = exports.VERCEL_DIR_PROJECT = exports.VERCEL_DIR_README = exports.VERCEL_DIR_FALLBACK = exports.VERCEL_DIR = void 0;
 const fs_1 = __importDefault(__webpack_require__(35747));
-const os_1 = __importDefault(__webpack_require__(12087));
 const ajv_1 = __importDefault(__webpack_require__(35669));
 const chalk_1 = __importDefault(__webpack_require__(90877));
 const path_1 = __webpack_require__(85622);
@@ -247243,12 +247503,15 @@ const global_path_1 = __webpack_require__(88976);
 const build_utils_1 = __webpack_require__(63445);
 const code_1 = __importDefault(__webpack_require__(94542));
 const error_utils_1 = __webpack_require__(39799);
+const repo_1 = __webpack_require__(18726);
+const add_to_gitignore_1 = __webpack_require__(19159);
 const readFile = (0, util_1.promisify)(fs_1.default.readFile);
 const writeFile = (0, util_1.promisify)(fs_1.default.writeFile);
 exports.VERCEL_DIR = '.vercel';
 exports.VERCEL_DIR_FALLBACK = '.now';
 exports.VERCEL_DIR_README = 'README.txt';
 exports.VERCEL_DIR_PROJECT = 'project.json';
+exports.VERCEL_DIR_REPO = 'repo.json';
 const linkSchema = {
     type: 'object',
     required: ['projectId', 'orgId'],
@@ -247269,7 +247532,7 @@ const linkSchema = {
  *
  * Throws an error if *both* `.vercel` and `.now` directories exist.
  */
-function getVercelDirectory(cwd = process.cwd()) {
+function getVercelDirectory(cwd) {
     const possibleDirs = [(0, path_1.join)(cwd, exports.VERCEL_DIR), (0, path_1.join)(cwd, exports.VERCEL_DIR_FALLBACK)];
     const existingDirs = possibleDirs.filter(d => (0, global_path_1.isDirectory)(d));
     if (existingDirs.length > 1) {
@@ -247283,8 +247546,35 @@ function getVercelDirectory(cwd = process.cwd()) {
 }
 exports.getVercelDirectory = getVercelDirectory;
 async function getLink(path) {
+    // Try the individual project linking style (`${cwd}/.vercel/project.json`)
     const dir = getVercelDirectory(path);
-    return getLinkFromDir(dir);
+    const linkFromProject = await getLinkFromDir(dir);
+    if (linkFromProject) {
+        return linkFromProject;
+    }
+    // Try the repo linking style (`${repoRoot}/.vercel/repo.json`)
+    return getLinkFromRepo(path);
+}
+async function getLinkFromRepo(path) {
+    const repoRoot = await (0, repo_1.findRepoRoot)(path);
+    if (!repoRoot) {
+        return null;
+    }
+    try {
+        const vercelDir = (0, path_1.join)(repoRoot, exports.VERCEL_DIR);
+        const repoJsonPath = (0, path_1.join)(vercelDir, exports.VERCEL_DIR_REPO);
+        const repoJson = await (0, fs_extra_1.readJSON)(repoJsonPath);
+        const project = (0, repo_1.findProjectFromPath)(repoJson.projects, (0, path_1.relative)(repoRoot, path));
+        if (project) {
+            return { orgId: repoJson.orgId, projectId: project.id };
+        }
+    }
+    catch (err) {
+        if (!(0, error_utils_1.isErrnoException)(err) || err.code !== 'ENOENT') {
+            throw err;
+        }
+    }
+    return null;
 }
 async function getLinkFromDir(dir) {
     try {
@@ -247323,7 +247613,7 @@ async function getOrgById(client, orgId) {
         return null;
     return { type: 'user', id: orgId, slug: user.username };
 }
-async function getLinkedProject(client, path) {
+async function getLinkedProject(client, path = process.cwd()) {
     const { output } = client;
     const VERCEL_ORG_ID = (0, build_utils_1.getPlatformEnv)('ORG_ID');
     const VERCEL_PROJECT_ID = (0, build_utils_1.getPlatformEnv)('PROJECT_ID');
@@ -247409,24 +247699,7 @@ async function linkFolderToProject(output, path, projectLink, projectName, orgSl
     await writeFile((0, path_1.join)(path, exports.VERCEL_DIR, exports.VERCEL_DIR_PROJECT), JSON.stringify(projectLink));
     await writeFile((0, path_1.join)(path, exports.VERCEL_DIR, exports.VERCEL_DIR_README), await readFile((0, path_1.join)(__dirname, 'VERCEL_DIR_README.txt'), 'utf8'));
     // update .gitignore
-    let isGitIgnoreUpdated = false;
-    try {
-        const gitIgnorePath = (0, path_1.join)(path, '.gitignore');
-        let gitIgnore = (await readFile(gitIgnorePath, 'utf8').catch(() => null)) ?? '';
-        const EOL = gitIgnore.includes('\r\n') ? '\r\n' : os_1.default.EOL;
-        let contentModified = false;
-        if (!gitIgnore.split(EOL).includes(exports.VERCEL_DIR)) {
-            gitIgnore += `${gitIgnore.endsWith(EOL) || gitIgnore.length === 0 ? '' : EOL}${exports.VERCEL_DIR}${EOL}`;
-            contentModified = true;
-        }
-        if (contentModified) {
-            await writeFile(gitIgnorePath, gitIgnore);
-            isGitIgnoreUpdated = true;
-        }
-    }
-    catch (error) {
-        // ignore errors since this is non-critical
-    }
+    const isGitIgnoreUpdated = await (0, add_to_gitignore_1.addToGitIgnore)(path);
     output.print((0, emoji_1.prependEmoji)(`Linked to ${chalk_1.default.bold(`${orgSlug}/${projectName}`)} (created ${exports.VERCEL_DIR}${isGitIgnoreUpdated ? ' and added it to .gitignore' : ''})`, (0, emoji_1.emoji)(successEmoji)) + '\n');
 }
 exports.linkFolderToProject = linkFolderToProject;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "29.3.5",
+  "version": "29.4.0",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -31,7 +31,7 @@
     "@vercel/redwood": "1.1.15",
     "@vercel/remix-builder": "1.8.10",
     "@vercel/ruby": "1.3.76",
-    "@vercel/static-build": "1.3.31"
+    "@vercel/static-build": "1.3.32"
   },
   "devDependencies": {
     "@alex_neo/jest-expect-message": "1.0.5",
@@ -81,7 +81,7 @@
     "@vercel/client": "12.5.1",
     "@vercel/error-utils": "1.0.10",
     "@vercel/frameworks": "1.4.2",
-    "@vercel/fs-detectors": "3.9.2",
+    "@vercel/fs-detectors": "3.9.3",
     "@vercel/fun": "1.0.4",
     "@vercel/ncc": "0.24.0",
     "@vercel/routing-utils": "2.2.1",