vercel 30.2.1 → 30.2.2

package/dist/index.js

@@ -222855,15 +222855,20 @@ class LocalFileSystemDetector extends filesystem_1.DetectorFilesystem {
         };
         return dir.map(dirent => ({
             name: dirent.name,
-            path: path_1.default.join(dirPath, dirent.name),
+            path: path_1.default.join(this.getRelativeFilePath(name), dirent.name),
             type: getType(dirent),
         }));
     }
     _chdir(name) {
         return new LocalFileSystemDetector(this.getFilePath(name));
     }
+    getRelativeFilePath(name) {
+        return name.startsWith(this.rootPath)
+            ? path_1.default.relative(this.rootPath, name)
+            : name;
+    }
     getFilePath(name) {
-        return path_1.default.join(this.rootPath, name);
+        return path_1.default.join(this.rootPath, this.getRelativeFilePath(name));
     }
 }
 exports.LocalFileSystemDetector = LocalFileSystemDetector;
@@ -225731,10 +225736,12 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 const fs_extra_1 = __importDefault(__webpack_require__(36365));
 const chalk_1 = __importDefault(__webpack_require__(90877));
 const dotenv_1 = __importDefault(__webpack_require__(9116));
+const semver_1 = __importDefault(__webpack_require__(54373));
+const minimatch_1 = __importDefault(__webpack_require__(47345));
 const path_1 = __webpack_require__(85622);
+const frameworks_1 = __importDefault(__webpack_require__(36678));
 const build_utils_1 = __webpack_require__(63445);
 const fs_detectors_1 = __webpack_require__(88995);
-const minimatch_1 = __importDefault(__webpack_require__(47345));
 const routing_utils_1 = __webpack_require__(679);
 const client_1 = __webpack_require__(40521);
 const pull_1 = __importDefault(__webpack_require__(65158));
@@ -225757,9 +225764,6 @@ const sort_builders_1 = __webpack_require__(84701);
 const error_1 = __webpack_require__(4400);
 const validate_config_1 = __webpack_require__(21144);
 const monorepo_1 = __webpack_require__(21481);
-const frameworks_1 = __importDefault(__webpack_require__(36678));
-const fs_detectors_2 = __webpack_require__(88995);
-const semver_1 = __importDefault(__webpack_require__(54373));
 const help = () => {
     return console.log(`
    ${chalk_1.default.bold(`${cli.logo} ${cli.name} build`)}
@@ -225785,7 +225789,8 @@ const help = () => {
 `);
 };
 async function main(client) {
-    const { cwd, output } = client;
+    let { cwd } = client;
+    const { output } = client;
     // Ensure that `vc build` is not being invoked recursively
     if (process.env.__VERCEL_BUILD_RUNNING) {
         output.error(`${(0, cmd_1.default)(`${cli.name} build`)} must not recursively invoke itself. Check the Build Command in the Project Settings or the ${(0, cmd_1.default)('build')} script in ${(0, cmd_1.default)('package.json')}`);
@@ -225816,9 +225821,16 @@ async function main(client) {
         output.prettyError(err);
         return 1;
     }
+    // If repo linked, update `cwd` to the repo root
+    const link = await (0, link_1.getProjectLink)(client, cwd);
+    const projectRootDirectory = link?.projectRootDirectory ?? '';
+    if (link?.repoRoot) {
+        cwd = client.cwd = link.repoRoot;
+    }
     // TODO: read project settings from the API, fall back to local `project.json` if that fails
     // Read project settings, and pull them from Vercel if necessary
-    let project = await (0, project_settings_1.readProjectSettings)((0, path_1.join)(cwd, link_1.VERCEL_DIR));
+    const vercelDir = (0, path_1.join)(cwd, projectRootDirectory, link_1.VERCEL_DIR);
+    let project = await (0, project_settings_1.readProjectSettings)(vercelDir);
     const isTTY = process.stdin.isTTY;
     while (!project?.settings) {
         let confirmed = yes;
@@ -225834,6 +225846,7 @@ async function main(client) {
             return 0;
         }
         const { argv: originalArgv } = client;
+        client.cwd = (0, path_1.join)(cwd, projectRootDirectory);
         client.argv = [
             ...originalArgv.slice(0, 2),
             'pull',
@@ -225844,11 +225857,12 @@ async function main(client) {
         if (result !== 0) {
             return result;
         }
+        client.cwd = cwd;
         client.argv = originalArgv;
-        project = await (0, project_settings_1.readProjectSettings)((0, path_1.join)(cwd, link_1.VERCEL_DIR));
+        project = await (0, project_settings_1.readProjectSettings)(vercelDir);
     }
     // Delete output directory from potential previous build
-    const defaultOutputDir = (0, path_1.join)(cwd, write_build_result_1.OUTPUT_DIR);
+    const defaultOutputDir = (0, path_1.join)(cwd, projectRootDirectory, write_build_result_1.OUTPUT_DIR);
     const outputDir = argv['--output']
         ? (0, path_1.resolve)(argv['--output'])
         : defaultOutputDir;
@@ -225864,7 +225878,7 @@ async function main(client) {
     };
     const envToUnset = new Set(['VERCEL', 'NOW_BUILDER']);
     try {
-        const envPath = (0, path_1.join)(cwd, link_1.VERCEL_DIR, `.env.${target}.local`);
+        const envPath = (0, path_1.join)(cwd, projectRootDirectory, link_1.VERCEL_DIR, `.env.${target}.local`);
         // TODO (maybe?): load env vars from the API, fall back to the local file if that fails
         const dotenvResult = dotenv_1.default.config({
             path: envPath,
@@ -226226,7 +226240,7 @@ async function getFramework(cwd, buildResults) {
         }
     }
     // determine framework version with runtime lookup
-    const frameworkVersion = (0, fs_detectors_2.detectFrameworkVersion)(detectedFramework);
+    const frameworkVersion = (0, fs_detectors_1.detectFrameworkVersion)(detectedFramework);
     if (frameworkVersion) {
         return {
             version: frameworkVersion,
@@ -227067,36 +227081,6 @@ exports.default = async (client) => {
     if (typeof target === 'number') {
         return target;
     }
-    // build `--prebuilt`
-    if (argv['--prebuilt']) {
-        const prebuiltExists = await fs_extra_1.default.pathExists((0, path_1.join)(cwd, '.vercel/output'));
-        if (!prebuiltExists) {
-            error(`The ${(0, param_1.default)('--prebuilt')} option was used, but no prebuilt output found in ".vercel/output". Run ${(0, pkg_name_1.getCommandName)('build')} to generate a local build.`);
-            return 1;
-        }
-        const prebuiltBuild = await (0, get_prebuilt_json_1.default)(cwd);
-        // Ensure that there was not a build error
-        const prebuiltError = prebuiltBuild?.error ||
-            prebuiltBuild?.builds?.find(build => 'error' in build)?.error;
-        if (prebuiltError) {
-            output.log(`Prebuilt deployment cannot be created because ${(0, pkg_name_1.getCommandName)('build')} failed with error:\n`);
-            prettyError(prebuiltError);
-            return 1;
-        }
-        // Ensure that the deploy target matches the build target
-        const assumedTarget = target || 'preview';
-        if (prebuiltBuild?.target && prebuiltBuild.target !== assumedTarget) {
-            let specifyTarget = '';
-            if (prebuiltBuild.target === 'production') {
-                specifyTarget = ` --prod`;
-            }
-            prettyError({
-                message: `The ${(0, param_1.default)('--prebuilt')} option was used with the target environment "${assumedTarget}", but the prebuilt output found in ".vercel/output" was built with target environment "${prebuiltBuild.target}". Please run ${(0, pkg_name_1.getCommandName)(`--prebuilt${specifyTarget}`)}.`,
-                link: 'https://vercel.link/prebuilt-environment-mismatch',
-            });
-            return 1;
-        }
-    }
     const archive = argv['--archive'];
     if (typeof archive === 'string' && !(0, validate_archive_format_1.isValidArchive)(archive)) {
         output.error(`Format must be one of: ${client_1.VALID_ARCHIVE_FORMATS.join(', ')}`);
@@ -227164,6 +227148,43 @@ exports.default = async (client) => {
     if (!org) {
         throw new Error(`"org" is not defined`);
     }
+    // build `--prebuilt`
+    if (argv['--prebuilt']) {
+        // For repo-style linking, update `cwd` to be the Project
+        // subdirectory when `rootDirectory` setting is defined
+        if (link.status === 'linked' &&
+            link.repoRoot &&
+            link.project.rootDirectory) {
+            cwd = (0, path_1.join)(cwd, link.project.rootDirectory);
+        }
+        const prebuiltExists = await fs_extra_1.default.pathExists((0, path_1.join)(cwd, '.vercel/output'));
+        if (!prebuiltExists) {
+            error(`The ${(0, param_1.default)('--prebuilt')} option was used, but no prebuilt output found in ".vercel/output". Run ${(0, pkg_name_1.getCommandName)('build')} to generate a local build.`);
+            return 1;
+        }
+        const prebuiltBuild = await (0, get_prebuilt_json_1.default)(cwd);
+        // Ensure that there was not a build error
+        const prebuiltError = prebuiltBuild?.error ||
+            prebuiltBuild?.builds?.find(build => 'error' in build)?.error;
+        if (prebuiltError) {
+            output.log(`Prebuilt deployment cannot be created because ${(0, pkg_name_1.getCommandName)('build')} failed with error:\n`);
+            prettyError(prebuiltError);
+            return 1;
+        }
+        // Ensure that the deploy target matches the build target
+        const assumedTarget = target || 'preview';
+        if (prebuiltBuild?.target && prebuiltBuild.target !== assumedTarget) {
+            let specifyTarget = '';
+            if (prebuiltBuild.target === 'production') {
+                specifyTarget = ` --prod`;
+            }
+            prettyError({
+                message: `The ${(0, param_1.default)('--prebuilt')} option was used with the target environment "${assumedTarget}", but the prebuilt output found in ".vercel/output" was built with target environment "${prebuiltBuild.target}". Please run ${(0, pkg_name_1.getCommandName)(`--prebuilt${specifyTarget}`)}.`,
+                link: 'https://vercel.link/prebuilt-environment-mismatch',
+            });
+            return 1;
+        }
+    }
     // Set the `contextName` and `currentTeam` as specified by the
     // Project Settings, so that API calls happen with the proper scope
     const contextName = org.slug;
@@ -227509,7 +227530,11 @@ async function dev(client, opts, args) {
     let projectSettings;
     let envValues = {};
     if (link.status === 'linked') {
-        const { project, org } = link;
+        const { project, org, repoRoot } = link;
+        // If repo linked, update `cwd` to the repo root
+        if (repoRoot) {
+            cwd = repoRoot;
+        }
         client.config.currentTeam = org.type === 'team' ? org.id : undefined;
         projectSettings = project;
         if (project.rootDirectory) {
@@ -229359,7 +229384,7 @@ async function main(client) {
             case 'rm':
                 return (0, rm_1.default)(client, project, argv, args, output);
             case 'pull':
-                return (0, pull_1.default)(client, project, target, argv, args, output, cwd, 'vercel-cli:env:pull');
+                return (0, pull_1.default)(client, link, project, target, argv, args, output, cwd, 'vercel-cli:env:pull');
             default:
                 output.error((0, get_invalid_subcommand_1.default)(COMMAND_CONFIG));
                 help();
@@ -229474,6 +229499,7 @@ const pkg_name_1 = __webpack_require__(79000);
 const get_env_records_1 = __webpack_require__(72913);
 const diff_env_files_1 = __webpack_require__(65117);
 const error_utils_1 = __webpack_require__(39799);
+const add_to_gitignore_1 = __webpack_require__(19159);
 const CONTENTS_PREFIX = '# Created by Vercel CLI\n';
 function readHeadSync(path, length) {
     const buffer = Buffer.alloc(length);
@@ -229496,7 +229522,7 @@ function tryReadHeadSync(path, length) {
         }
     }
 }
-async function pull(client, project, environment, opts, args, output, cwd, source) {
+async function pull(client, link, project, environment, opts, args, output, cwd, source) {
     if (args.length > 1) {
         output.error(`Invalid number of arguments. Usage: ${(0, pkg_name_1.getCommandName)(`env pull <file>`)}`);
         return 1;
@@ -229550,7 +229576,17 @@ async function pull(client, project, environment, opts, args, output, cwd, sourc
     else if (oldEnv && exists) {
         output.log('No changes found.');
     }
-    output.print(`${(0, emoji_1.prependEmoji)(`${exists ? 'Updated' : 'Created'} ${chalk_1.default.bold(filename)} file ${chalk_1.default.gray(pullStamp())}`, (0, emoji_1.emoji)('success'))}\n`);
+    let isGitIgnoreUpdated = false;
+    if (filename === '.env.local') {
+        // When the file is `.env.local`, we also add it to `.gitignore`
+        // to avoid accidentally committing it to git.
+        // We use '.env*.local' to match the default .gitignore from
+        // create-next-app template. See:
+        // https://github.com/vercel/next.js/blob/06abd634899095b6cc28e6e8315b1e8b9c8df939/packages/create-next-app/templates/app/js/gitignore#L28
+        const rootPath = link.repoRoot ?? cwd;
+        isGitIgnoreUpdated = await (0, add_to_gitignore_1.addToGitIgnore)(rootPath, '.env*.local');
+    }
+    output.print(`${(0, emoji_1.prependEmoji)(`${exists ? 'Updated' : 'Created'} ${chalk_1.default.bold(filename)} file ${isGitIgnoreUpdated ? 'and added it to .gitignore' : ''} ${chalk_1.default.gray(pullStamp())}`, (0, emoji_1.emoji)('success'))}\n`);
     return 0;
 }
 exports.default = pull;
@@ -232090,6 +232126,7 @@ const project_settings_1 = __webpack_require__(61440);
 const pull_1 = __importDefault(__webpack_require__(80800));
 const env_target_1 = __webpack_require__(20229);
 const ensure_link_1 = __webpack_require__(65382);
+const humanize_path_1 = __importDefault(__webpack_require__(33234));
 const help = () => {
     return console.log(`
   ${chalk_1.default.bold(`${logo_1.default} ${(0, pkg_name_1.getPkgName)()} pull`)} [project-path]
@@ -232137,9 +232174,9 @@ function parseArgs(client) {
     }
     return argv;
 }
-async function pullAllEnvFiles(environment, client, project, argv, cwd) {
+async function pullAllEnvFiles(environment, client, link, project, argv, cwd) {
     const environmentFile = `.env.${environment}.local`;
-    return (0, pull_1.default)(client, project, environment, argv, [(0, path_1.join)('.vercel', environmentFile)], client.output, cwd, 'vercel-cli:pull');
+    return (0, pull_1.default)(client, link, project, environment, argv, [(0, path_1.join)('.vercel', environmentFile)], client.output, cwd, 'vercel-cli:pull');
 }
 function parseEnvironment(environment = 'development') {
     if (!(0, env_target_1.isValidEnvTarget)(environment)) {
@@ -232153,24 +232190,28 @@ async function main(client) {
     if (typeof argv === 'number') {
         return argv;
     }
-    const cwd = argv._[1] || process.cwd();
+    let cwd = argv._[1] || client.cwd;
     const autoConfirm = Boolean(argv['--yes']);
     const environment = parseEnvironment(argv['--environment'] || undefined);
     const link = await (0, ensure_link_1.ensureLink)('pull', client, cwd, { autoConfirm });
     if (typeof link === 'number') {
         return link;
     }
-    const { project, org } = link;
+    const { project, org, repoRoot } = link;
+    if (repoRoot) {
+        cwd = (0, path_1.join)(repoRoot, project.rootDirectory || '');
+    }
     client.config.currentTeam = org.type === 'team' ? org.id : undefined;
-    const pullResultCode = await pullAllEnvFiles(environment, client, project, argv, cwd);
+    const pullResultCode = await pullAllEnvFiles(environment, client, link, project, argv, cwd);
     if (pullResultCode !== 0) {
         return pullResultCode;
     }
     client.output.print('\n');
     client.output.log('Downloading project settings');
-    await (0, project_settings_1.writeProjectSettings)(cwd, project, org);
+    const isRepoLinked = typeof repoRoot === 'string';
+    await (0, project_settings_1.writeProjectSettings)(cwd, project, org, isRepoLinked);
     const settingsStamp = (0, stamp_1.default)();
-    client.output.print(`${(0, emoji_1.prependEmoji)(`Downloaded project settings to ${chalk_1.default.bold((0, path_1.join)(link_1.VERCEL_DIR, link_1.VERCEL_DIR_PROJECT))} ${chalk_1.default.gray(settingsStamp())}`, (0, emoji_1.emoji)('success'))}\n`);
+    client.output.print(`${(0, emoji_1.prependEmoji)(`Downloaded project settings to ${chalk_1.default.bold((0, humanize_path_1.default)((0, path_1.join)(cwd, link_1.VERCEL_DIR, link_1.VERCEL_DIR_PROJECT)))} ${chalk_1.default.gray(settingsStamp())}`, (0, emoji_1.emoji)('success'))}\n`);
     return 0;
 }
 exports.default = main;
@@ -246010,10 +246051,10 @@ const link_1 = __webpack_require__(49347);
  * directory
  * @param opts.projectName - The project name to use when linking, otherwise
  * the current directory
- * @returns {Promise<LinkResult|number>} Returns a numeric exit code when aborted or
+ * @returns {Promise<ProjectLinked|number>} Returns a numeric exit code when aborted or
  * error, otherwise an object containing the org an project
  */
-async function ensureLink(commandName, client, cwd, opts) {
+async function ensureLink(commandName, client, cwd, opts = {}) {
     let { link } = opts;
     if (!link) {
         link = await (0, link_1.getLinkedProject)(client, cwd);
@@ -246033,7 +246074,7 @@ async function ensureLink(commandName, client, cwd, opts) {
         }
         return link.exitCode;
     }
-    return { org: link.org, project: link.project };
+    return link;
 }
 exports.ensureLink = ensureLink;
 
@@ -246049,7 +246090,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.findProjectFromPath = exports.findProjectsFromPath = exports.traverseUpDirectories = exports.findRepoRoot = exports.ensureRepoLink = exports.getRepoLink = void 0;
+exports.findProjectsFromPath = 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);
@@ -246173,7 +246214,7 @@ async function ensureRepoLink(client, cwd, yes = false) {
             }),
         };
         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'));
+        await (0, link_1.writeReadme)(rootPath);
         // 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');
@@ -246243,7 +246284,7 @@ function sortByDirectory(a, b) {
  */
 function findProjectsFromPath(projects, path) {
     const normalizedPath = (0, build_utils_1.normalizePath)(path);
-    return projects
+    const matches = projects
         .slice()
         .sort(sortByDirectory)
         .filter(project => {
@@ -246254,15 +246295,13 @@ function findProjectsFromPath(projects, path) {
         return (normalizedPath === project.directory ||
             normalizedPath.startsWith(`${project.directory}/`));
     });
+    // If there are multiple matches, we only want the most relevant
+    // selections (with the deepest directory depth), so pick the first
+    // one and filter on those matches.
+    const firstMatch = matches[0];
+    return matches.filter(match => match.directory === firstMatch.directory);
 }
 exports.findProjectsFromPath = findProjectsFromPath;
-/**
- * TODO: remove
- */
-function findProjectFromPath(projects, path) {
-    return findProjectsFromPath(projects, path)[0];
-}
-exports.findProjectFromPath = findProjectFromPath;
 
 
 /***/ }),
@@ -248429,7 +248468,7 @@ async function getProjectByDeployment({ client, deployId, output, }) {
                 throw err;
             }
         }
-        if (team) {
+        else if (team) {
             const err = new Error(`Deployment doesn't belong to current team ${chalk_1.default.bold(contextName)}`);
             err.code = 'ERR_INVALID_TEAM';
             throw err;
@@ -248490,7 +248529,7 @@ 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_REPO = exports.VERCEL_DIR_PROJECT = exports.VERCEL_DIR_README = exports.VERCEL_DIR_FALLBACK = exports.VERCEL_DIR = void 0;
+exports.linkFolderToProject = exports.writeReadme = exports.getLinkedProject = exports.getLinkFromDir = exports.getProjectLink = 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 ajv_1 = __importDefault(__webpack_require__(35669));
 const chalk_1 = __importDefault(__webpack_require__(90877));
@@ -248552,6 +248591,7 @@ async function getProjectLink(client, path) {
     return ((await getProjectLinkFromRepoLink(client, path)) ||
         (await getLinkFromDir(getVercelDirectory(path))));
 }
+exports.getProjectLink = getProjectLink;
 async function getProjectLinkFromRepoLink(client, path) {
     const repoLink = await (0, repo_1.getRepoLink)(path);
     if (!repoLink?.repoConfig) {
@@ -248576,9 +248616,10 @@ async function getProjectLinkFromRepoLink(client, path) {
     }
     if (project) {
         return {
+            repoRoot: repoLink.rootPath,
             orgId: repoLink.repoConfig.orgId,
             projectId: project.id,
-            repoRoot: repoLink.rootPath,
+            projectRootDirectory: project.directory,
         };
     }
     return null;
@@ -248701,6 +248742,10 @@ async function getLinkedProject(client, path = client.cwd) {
     return { status: 'linked', org, project, repoRoot: link.repoRoot };
 }
 exports.getLinkedProject = getLinkedProject;
+async function writeReadme(path) {
+    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'));
+}
+exports.writeReadme = writeReadme;
 async function linkFolderToProject(client, path, projectLink, projectName, orgSlug, successEmoji = 'link') {
     // if the project is already linked, we skip linking
     if (await hasProjectLink(projectLink, path)) {
@@ -248718,7 +248763,7 @@ async function linkFolderToProject(client, path, projectLink, projectName, orgSl
         throw err;
     }
     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'));
+    await writeReadme(path);
     // update .gitignore
     const isGitIgnoreUpdated = await (0, add_to_gitignore_1.addToGitIgnore)(path);
     client.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');
@@ -248735,13 +248780,14 @@ exports.linkFolderToProject = linkFolderToProject;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.pickOverrides = exports.readProjectSettings = exports.writeProjectSettings = void 0;
+const path_1 = __webpack_require__(85622);
 const fs_extra_1 = __webpack_require__(36365);
 const link_1 = __webpack_require__(49347);
-const path_1 = __webpack_require__(85622);
+const error_utils_1 = __webpack_require__(39799);
 // writeProjectSettings writes the project configuration to `vercel/project.json`
 // Write the project configuration to `.vercel/project.json`
 // that is needed for `vercel build` and `vercel dev` commands
-async function writeProjectSettings(cwd, project, org) {
+async function writeProjectSettings(cwd, project, org, isRepoLinked) {
     let analyticsId;
     if (project.analytics?.id &&
         (!project.analytics.disabledAt ||
@@ -248750,8 +248796,8 @@ async function writeProjectSettings(cwd, project, org) {
         analyticsId = project.analytics.id;
     }
     const projectLinkAndSettings = {
-        projectId: project.id,
-        orgId: org.id,
+        projectId: isRepoLinked ? undefined : project.id,
+        orgId: isRepoLinked ? undefined : org.id,
         settings: {
             createdAt: project.createdAt,
             framework: project.framework,
@@ -248771,8 +248817,23 @@ async function writeProjectSettings(cwd, project, org) {
     });
 }
 exports.writeProjectSettings = writeProjectSettings;
-async function readProjectSettings(cwd) {
-    return await (0, link_1.getLinkFromDir)(cwd);
+async function readProjectSettings(vercelDir) {
+    try {
+        return JSON.parse(await (0, fs_extra_1.readFile)((0, path_1.join)(vercelDir, link_1.VERCEL_DIR_PROJECT), 'utf8'));
+    }
+    catch (err) {
+        // `project.json` file does not exists, so project settings have not been pulled
+        if ((0, error_utils_1.isErrnoException)(err) &&
+            err.code &&
+            ['ENOENT', 'ENOTDIR'].includes(err.code)) {
+            return null;
+        }
+        // failed to parse JSON, treat the same as if project settings have not been pulled
+        if ((0, error_utils_1.isError)(err) && err.name === 'SyntaxError') {
+            return null;
+        }
+        throw err;
+    }
 }
 exports.readProjectSettings = readProjectSettings;
 function pickOverrides(vercelConfig) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "30.2.1",
+  "version": "30.2.2",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -81,7 +81,7 @@
     "@vercel/client": "12.6.2",
     "@vercel/error-utils": "1.0.10",
     "@vercel/frameworks": "1.4.2",
-    "@vercel/fs-detectors": "3.9.3",
+    "@vercel/fs-detectors": "4.0.0",
     "@vercel/fun": "1.0.4",
     "@vercel/ncc": "0.24.0",
     "@vercel/routing-utils": "2.2.1",