vercel 31.0.2 → 31.0.4

package/dist/index.js

@@ -192319,7 +192319,7 @@ module.exports = {
 
 /***/ }),
 
-/***/ 18505:
+/***/ 9429:
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
 "use strict";
@@ -192327,10 +192327,14 @@ module.exports = {
 const supportsColor = __webpack_require__(96328);
 const hasFlag = __webpack_require__(72035);
 
+/**
+@param {string} versionString
+@returns {{ major: number, minor: number, patch: number }}
+*/
 function parseVersion(versionString) {
 	if (/^\d{3,4}$/.test(versionString)) {
 		// Env var doesn't always use dots. example: 4601 => 46.1.0
-		const m = /(\d{1,2})(\d{2})/.exec(versionString);
+		const m = /(\d{1,2})(\d{2})/.exec(versionString) || [];
 		return {
 			major: 0,
 			minor: parseInt(m[1], 10),
@@ -192346,11 +192350,23 @@ function parseVersion(versionString) {
 	};
 }
 
+/**
+@param {{ isTTY?: boolean | undefined }} stream
+@returns {boolean}
+*/
 function supportsHyperlink(stream) {
-	const {env} = process;
+	const {
+		CI,
+		FORCE_HYPERLINK,
+		NETLIFY,
+		TEAMCITY_VERSION,
+		TERM_PROGRAM,
+		TERM_PROGRAM_VERSION,
+		VTE_VERSION
+	} = process.env;
 
-	if ('FORCE_HYPERLINK' in env) {
-		return !(env.FORCE_HYPERLINK.length > 0 && parseInt(env.FORCE_HYPERLINK, 10) === 0);
+	if (FORCE_HYPERLINK) {
+		return !(FORCE_HYPERLINK.length > 0 && parseInt(FORCE_HYPERLINK, 10) === 0);
 	}
 
 	if (hasFlag('no-hyperlink') || hasFlag('no-hyperlinks') || hasFlag('hyperlink=false') || hasFlag('hyperlink=never')) {
@@ -192361,6 +192377,11 @@ function supportsHyperlink(stream) {
 		return true;
 	}
 
+	// Netlify does not run a TTY, it does not need `supportsColor` check
+	if (NETLIFY) {
+		return true;
+	}
+
 	// If they specify no colors, they probably don't want hyperlinks.
 	if (!supportsColor.supportsColor(stream)) {
 		return false;
@@ -192374,39 +192395,40 @@ function supportsHyperlink(stream) {
 		return false;
 	}
 
-	if ('NETLIFY' in env) {
-		return true;
-	}
-
-	if ('CI' in env) {
+	if (CI) {
 		return false;
 	}
 
-	if ('TEAMCITY_VERSION' in env) {
+	if (TEAMCITY_VERSION) {
 		return false;
 	}
 
-	if ('TERM_PROGRAM' in env) {
-		const version = parseVersion(env.TERM_PROGRAM_VERSION);
+	if (TERM_PROGRAM) {
+		const version = parseVersion(TERM_PROGRAM_VERSION || '');
 
-		switch (env.TERM_PROGRAM) {
+		switch (TERM_PROGRAM) {
 			case 'iTerm.app':
 				if (version.major === 3) {
 					return version.minor >= 1;
 				}
 
 				return version.major > 3;
+			case 'WezTerm':
+				return version.major >= 20200620;
+			case 'vscode':
+				// eslint-disable-next-line no-mixed-operators
+				return version.major > 1 || version.major === 1 && version.minor >= 72;
 			// No default
 		}
 	}
 
-	if ('VTE_VERSION' in env) {
+	if (VTE_VERSION) {
 		// 0.50.0 was supposed to support hyperlinks, but throws a segfault
-		if (env.VTE_VERSION === '0.50.0') {
+		if (VTE_VERSION === '0.50.0') {
 			return false;
 		}
 
-		const version = parseVersion(env.VTE_VERSION);
+		const version = parseVersion(VTE_VERSION);
 		return version.major > 0 || version.minor >= 50;
 	}
 
@@ -222552,7 +222574,7 @@ exports.detectFileSystemAPI = detectFileSystemAPI;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.detectFrameworkVersion = exports.detectFrameworkRecord = exports.detectFramework = void 0;
+exports.detectFrameworkVersion = exports.detectFrameworkRecord = exports.detectFrameworks = exports.detectFramework = void 0;
 const child_process_1 = __webpack_require__(63129);
 async function matches(fs, framework) {
     const { detectors } = framework;
@@ -222642,6 +222664,19 @@ async function detectFramework({ fs, frameworkList, }) {
     return result.find(res => res !== null) ?? null;
 }
 exports.detectFramework = detectFramework;
+/**
+ * Detects all matching Frameworks based on the given virtual filesystem.
+ */
+async function detectFrameworks({ fs, frameworkList, }) {
+    const result = await Promise.all(frameworkList.map(async (frameworkMatch) => {
+        if (await matches(fs, frameworkMatch)) {
+            return frameworkMatch;
+        }
+        return null;
+    }));
+    return result.filter(res => res !== null);
+}
+exports.detectFrameworks = detectFrameworks;
 // Note: Does not currently support a `frameworkList` of monorepo managers
 async function detectFrameworkRecord({ fs, frameworkList, }) {
     const result = await Promise.all(frameworkList.map(async (frameworkMatch) => {
@@ -222947,7 +222982,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.packageManagers = exports.isStaticRuntime = exports.isOfficialRuntime = exports.monorepoManagers = exports.getWorkspacePackagePaths = exports.getWorkspaces = exports.workspaceManagers = exports.LocalFileSystemDetector = exports.DetectorFilesystem = exports.getProjectPaths = exports.detectFrameworkVersion = exports.detectFrameworkRecord = exports.detectFramework = exports.detectFileSystemAPI = exports.detectApiExtensions = exports.detectApiDirectory = exports.detectOutputDirectory = exports.detectBuilders = void 0;
+exports.packageManagers = exports.isStaticRuntime = exports.isOfficialRuntime = exports.monorepoManagers = exports.getWorkspacePackagePaths = exports.getWorkspaces = exports.workspaceManagers = exports.LocalFileSystemDetector = exports.DetectorFilesystem = exports.getProjectPaths = exports.detectFrameworkVersion = exports.detectFrameworkRecord = exports.detectFrameworks = exports.detectFramework = exports.detectFileSystemAPI = exports.detectApiExtensions = exports.detectApiDirectory = exports.detectOutputDirectory = exports.detectBuilders = void 0;
 var detect_builders_1 = __webpack_require__(91906);
 Object.defineProperty(exports, "detectBuilders", ({ enumerable: true, get: function () { return detect_builders_1.detectBuilders; } }));
 Object.defineProperty(exports, "detectOutputDirectory", ({ enumerable: true, get: function () { return detect_builders_1.detectOutputDirectory; } }));
@@ -222957,6 +222992,7 @@ var detect_file_system_api_1 = __webpack_require__(49587);
 Object.defineProperty(exports, "detectFileSystemAPI", ({ enumerable: true, get: function () { return detect_file_system_api_1.detectFileSystemAPI; } }));
 var detect_framework_1 = __webpack_require__(7244);
 Object.defineProperty(exports, "detectFramework", ({ enumerable: true, get: function () { return detect_framework_1.detectFramework; } }));
+Object.defineProperty(exports, "detectFrameworks", ({ enumerable: true, get: function () { return detect_framework_1.detectFrameworks; } }));
 Object.defineProperty(exports, "detectFrameworkRecord", ({ enumerable: true, get: function () { return detect_framework_1.detectFrameworkRecord; } }));
 Object.defineProperty(exports, "detectFrameworkVersion", ({ enumerable: true, get: function () { return detect_framework_1.detectFrameworkVersion; } }));
 var get_project_paths_1 = __webpack_require__(50330);
@@ -232064,6 +232100,10 @@ async function rm(client, args) {
             client.output.error('No such project exists');
             return 1;
         }
+        if ((0, errors_ts_1.isAPIError)(err) && err.status === 403) {
+            client.output.error(err.message);
+            return 1;
+        }
     }
     const elapsed = (0, ms_1.default)(Date.now() - start);
     client.output.log(`${chalk_1.default.cyan('Success!')} Project ${chalk_1.default.bold(name)} removed ${chalk_1.default.gray(`[${elapsed}]`)}`);
@@ -232636,7 +232676,7 @@ exports.default = async (client) => {
                     action: 'redeploy',
                 },
                 name: fromDeployment.name,
-                target: fromDeployment.target,
+                target: fromDeployment.target ?? undefined,
             },
             method: 'POST',
         });
@@ -236820,7 +236860,8 @@ class Client extends events_1.EventEmitter {
             (0, print_indications_1.default)(this, res);
             if (!res.ok) {
                 const error = await (0, response_error_1.default)(res);
-                if (isSAMLError(error)) {
+                // we should force reauth only if error has a teamId
+                if (isSAMLError(error) && error.teamId) {
                     try {
                         // A SAML error means the token is expired, or is not
                         // designated for the requested team, so the user needs
@@ -238002,6 +238043,9 @@ async function processDeployment({ org, cwd, projectName, isSettingUpProject, ar
                 if (error.code === 'missing_project_settings') {
                     return error;
                 }
+                if (error.code === 'forbidden') {
+                    return error;
+                }
                 throw error;
             }
             // Handle alias-assigned event
@@ -246569,10 +246613,11 @@ async function ensureRepoLink(client, cwd, { yes, overwrite }) {
         for (const project of projects) {
             detectedProjects.delete(project.rootDirectory ?? '');
         }
-        if (detectedProjects.size > 0) {
-            output.log(`Detected ${(0, pluralize_1.default)('new Project', detectedProjects.size, true)} that may be created.`);
+        const detectedProjectsCount = Array.from(detectedProjects.values()).reduce((o, f) => o + f.length, 0);
+        if (detectedProjectsCount > 0) {
+            output.log(`Detected ${(0, pluralize_1.default)('new Project', detectedProjectsCount, true)} that may be created.`);
         }
-        const addSeparators = projects.length > 0 && detectedProjects.size > 0;
+        const addSeparators = projects.length > 0 && detectedProjectsCount > 0;
         const { selected } = await client.prompt({
             type: 'checkbox',
             name: 'selected',
@@ -246591,20 +246636,26 @@ async function ensureRepoLink(client, cwd, { yes, overwrite }) {
                 ...(addSeparators
                     ? [new inquirer_1.default.Separator('----- New Projects to be created -----')]
                     : []),
-                ...Array.from(detectedProjects.entries()).map(([rootDirectory, framework]) => {
-                    const name = (0, slugify_1.default)([(0, path_1.basename)(rootPath), (0, path_1.basename)(rootDirectory)]
+                ...Array.from(detectedProjects.entries()).flatMap(([rootDirectory, frameworks]) => frameworks.map((framework, i) => {
+                    const name = (0, slugify_1.default)([
+                        (0, path_1.basename)(rootPath),
+                        (0, path_1.basename)(rootDirectory),
+                        i > 0 ? framework.slug : '',
+                    ]
                         .filter(Boolean)
                         .join('-'));
                     return {
-                        name: `${org.slug}/${name} (${framework})`,
+                        name: `${org.slug}/${name} (${framework.name})`,
                         value: {
                             newProject: true,
                             rootDirectory,
                             name,
                             framework,
                         },
+                        // Checked by default when there are no other existing Projects
+                        checked: projects.length === 0,
                     };
-                }),
+                })),
             ],
         });
         if (selected.length === 0) {
@@ -246620,9 +246671,12 @@ async function ensureRepoLink(client, cwd, { yes, overwrite }) {
             delete selection.newProject;
             if (!selection.rootDirectory)
                 delete selection.rootDirectory;
-            selected[i] = await (0, create_project_1.default)(client, selection);
+            selected[i] = await (0, create_project_1.default)(client, {
+                ...selection,
+                framework: selection.framework.slug,
+            });
             await (0, connect_git_provider_1.connectGitProvider)(client, org, selected[i].id, parsedRepoUrl.provider, `${parsedRepoUrl.org}/${parsedRepoUrl.repo}`);
-            output.log(`Created new Project: ${output.link(orgAndName, `https://vercel.com/${orgAndName}`)}`);
+            output.log(`Created new Project: ${output.link(orgAndName, `https://vercel.com/${orgAndName}`, { fallback: false })}`);
         }
         repoConfig = {
             orgId: org.id,
@@ -246639,7 +246693,7 @@ async function ensureRepoLink(client, cwd, { yes, overwrite }) {
         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 ${repoUrlLink} under ${chalk_1.default.bold(org.slug)} (created ${link_1.VERCEL_DIR}${isGitIgnoreUpdated ? ' and added it to .gitignore' : ''})`, (0, emoji_1.emoji)('link')) + '\n');
+        output.print((0, emoji_1.prependEmoji)(`Linked to ${(0, pluralize_1.default)('Project', selected.length, true)} 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,
@@ -247907,7 +247961,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Output = void 0;
 const chalk_1 = __importDefault(__webpack_require__(90877));
 const ansiEscapes = __importStar(__webpack_require__(68700));
-const supports_hyperlinks_1 = __webpack_require__(18505);
+const supports_hyperlinks_1 = __webpack_require__(9429);
 const link_1 = __importDefault(__webpack_require__(39302));
 const wait_1 = __importDefault(__webpack_require__(34604));
 const error_utils_1 = __webpack_require__(39799);
@@ -248786,13 +248840,13 @@ async function detectProjects(cwd) {
         packagePaths.push('/');
     }
     await Promise.all(packagePaths.map(async (p) => {
-        const framework = await (0, fs_detectors_1.detectFramework)({
+        const frameworks = await (0, fs_detectors_1.detectFrameworks)({
             fs: fs.chdir((0, path_1.join)('.', p)),
             frameworkList: frameworks_1.default,
         });
-        if (!framework)
+        if (frameworks.length === 0)
             return;
-        detectedProjects.set(p.slice(1), framework);
+        detectedProjects.set(p.slice(1), frameworks);
     }));
     return detectedProjects;
 }
@@ -250444,7 +250498,7 @@ module.exports = JSON.parse("[[[0,44],\"disallowed_STD3_valid\"],[[45,46],\"vali
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse("{\"name\":\"@vercel/client\",\"version\":\"12.6.4\",\"main\":\"dist/index.js\",\"typings\":\"dist/index.d.ts\",\"homepage\":\"https://vercel.com\",\"license\":\"Apache-2.0\",\"files\":[\"dist\"],\"repository\":{\"type\":\"git\",\"url\":\"https://github.com/vercel/vercel.git\",\"directory\":\"packages/client\"},\"scripts\":{\"build\":\"tsc\",\"test-e2e\":\"pnpm test tests/create-deployment.test.ts tests/create-legacy-deployment.test.ts tests/paths.test.ts\",\"test\":\"jest --env node --verbose --runInBand --bail\",\"test-unit\":\"pnpm test tests/unit.*test.*\"},\"engines\":{\"node\":\">= 14\"},\"devDependencies\":{\"@types/async-retry\":\"1.4.5\",\"@types/fs-extra\":\"7.0.0\",\"@types/jest\":\"27.4.1\",\"@types/minimatch\":\"3.0.5\",\"@types/ms\":\"0.7.30\",\"@types/node\":\"14.18.33\",\"@types/node-fetch\":\"2.5.4\",\"@types/recursive-readdir\":\"2.2.0\",\"@types/tar-fs\":\"1.16.1\",\"typescript\":\"4.9.5\"},\"dependencies\":{\"@vercel/build-utils\":\"6.8.1\",\"@vercel/routing-utils\":\"2.2.1\",\"@zeit/fetch\":\"5.2.0\",\"async-retry\":\"1.2.3\",\"async-sema\":\"3.0.0\",\"fs-extra\":\"8.0.1\",\"ignore\":\"4.0.6\",\"minimatch\":\"5.0.1\",\"ms\":\"2.1.2\",\"node-fetch\":\"2.6.7\",\"querystring\":\"^0.2.0\",\"sleep-promise\":\"8.0.1\",\"tar-fs\":\"1.16.3\"}}");
+module.exports = JSON.parse("{\"name\":\"@vercel/client\",\"version\":\"12.6.5\",\"main\":\"dist/index.js\",\"typings\":\"dist/index.d.ts\",\"homepage\":\"https://vercel.com\",\"license\":\"Apache-2.0\",\"files\":[\"dist\"],\"repository\":{\"type\":\"git\",\"url\":\"https://github.com/vercel/vercel.git\",\"directory\":\"packages/client\"},\"scripts\":{\"build\":\"tsc\",\"test-e2e\":\"pnpm test tests/create-deployment.test.ts tests/create-legacy-deployment.test.ts tests/paths.test.ts\",\"test\":\"jest --env node --verbose --runInBand --bail\",\"test-unit\":\"pnpm test tests/unit.*test.*\"},\"engines\":{\"node\":\">= 14\"},\"devDependencies\":{\"@types/async-retry\":\"1.4.5\",\"@types/fs-extra\":\"7.0.0\",\"@types/jest\":\"27.4.1\",\"@types/minimatch\":\"3.0.5\",\"@types/ms\":\"0.7.30\",\"@types/node\":\"14.18.33\",\"@types/node-fetch\":\"2.5.4\",\"@types/recursive-readdir\":\"2.2.0\",\"@types/tar-fs\":\"1.16.1\",\"typescript\":\"4.9.5\"},\"dependencies\":{\"@vercel/build-utils\":\"6.8.2\",\"@vercel/routing-utils\":\"2.2.1\",\"@zeit/fetch\":\"5.2.0\",\"async-retry\":\"1.2.3\",\"async-sema\":\"3.0.0\",\"fs-extra\":\"8.0.1\",\"ignore\":\"4.0.6\",\"minimatch\":\"5.0.1\",\"ms\":\"2.1.2\",\"node-fetch\":\"2.6.7\",\"querystring\":\"^0.2.0\",\"sleep-promise\":\"8.0.1\",\"tar-fs\":\"1.16.3\"}}");
 
 /***/ }),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "31.0.2",
+  "version": "31.0.4",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -22,16 +22,16 @@
     "node": ">= 14"
   },
   "dependencies": {
-    "@vercel/build-utils": "6.8.1",
+    "@vercel/build-utils": "6.8.2",
     "@vercel/go": "2.5.1",
     "@vercel/hydrogen": "0.0.64",
-    "@vercel/next": "3.8.8",
-    "@vercel/node": "2.15.4",
+    "@vercel/next": "3.9.0",
+    "@vercel/node": "2.15.6",
     "@vercel/python": "3.1.60",
     "@vercel/redwood": "1.1.15",
-    "@vercel/remix-builder": "1.8.16",
+    "@vercel/remix-builder": "1.8.18",
     "@vercel/ruby": "1.3.76",
-    "@vercel/static-build": "1.3.39"
+    "@vercel/static-build": "1.3.41"
   },
   "devDependencies": {
     "@alex_neo/jest-expect-message": "1.0.5",
@@ -77,11 +77,11 @@
     "@types/yauzl-promise": "2.1.0",
     "@vercel-internals/constants": "1.0.4",
     "@vercel-internals/get-package-json": "1.0.0",
-    "@vercel-internals/types": "1.0.4",
-    "@vercel/client": "12.6.4",
+    "@vercel-internals/types": "1.0.5",
+    "@vercel/client": "12.6.5",
     "@vercel/error-utils": "1.0.10",
     "@vercel/frameworks": "1.4.3",
-    "@vercel/fs-detectors": "4.0.1",
+    "@vercel/fs-detectors": "4.1.0",
     "@vercel/fun": "1.0.4",
     "@vercel/ncc": "0.24.0",
     "@vercel/routing-utils": "2.2.1",
@@ -149,7 +149,7 @@
     "serve-handler": "6.1.1",
     "strip-ansi": "6.0.1",
     "stripe": "5.1.0",
-    "supports-hyperlinks": "2.2.0",
+    "supports-hyperlinks": "3.0.0",
     "tar-fs": "1.16.3",
     "test-listen": "1.1.0",
     "text-table": "0.2.0",