vercel 32.2.5 → 32.3.0

package/dist/index.js

@@ -219698,7 +219698,7 @@ const help = () => `
       pull                 [path]      Pull your Project Settings from the cloud
       redeploy             [url|id]    Rebuild and deploy a previous deployment.
       rollback             [url|id]    Quickly revert back to a previous deployment
-      switch               [scope]     Switches between teams and your personal account
+      switch               [scope]     Switches between different scopes
 
     ${chalk_1.default.dim('Advanced')}
 
@@ -221010,6 +221010,15 @@ async function doBuild(client, project, buildsJson, cwd, outputDir) {
     // Create fresh new output directory
     await fs_extra_1.default.mkdirp(outputDir);
     const ops = [];
+    const dependencies = [
+        ...Object.keys(pkg?.dependencies ?? {}),
+        ...Object.keys(pkg?.devDependencies ?? {}),
+    ];
+    const isUsingSpeedInsights = dependencies.some(d => d === '@vercel/speed-insights');
+    if (isUsingSpeedInsights && process.env.VERCEL_ANALYTICS_ID) {
+        output.warn(`The \`VERCEL_ANALYTICS_ID\` environment variable is deprecated and will be removed in a future release. Please remove it from your environment variables`);
+        delete process.env.VERCEL_ANALYTICS_ID;
+    }
     // Write the `detectedBuilders` result to output dir
     const buildsJsonBuilds = new Map(builds.map(build => {
         const builderWithPkg = buildersWithPkgs.get(build.use);
@@ -221175,6 +221184,7 @@ async function doBuild(client, project, buildsJson, cwd, outputDir) {
     const mergedCrons = mergeCrons(localConfig.crons, buildResults.values());
     const mergedWildcard = mergeWildcard(buildResults.values());
     const mergedOverrides = overrides.length > 0 ? Object.assign({}, ...overrides) : undefined;
+    const mergedFlags = mergeFlags(buildResults.values());
     const framework = await getFramework(cwd, buildResults);
     // Write out the final `config.json` file based on the
     // user configuration and Builder build results
@@ -221186,6 +221196,7 @@ async function doBuild(client, project, buildsJson, cwd, outputDir) {
         overrides: mergedOverrides,
         framework,
         crons: mergedCrons,
+        flags: mergedFlags,
     };
     await fs_extra_1.default.writeJSON((0, path_1.join)(outputDir, 'config.json'), config, { spaces: 2 });
     const relOutputDir = (0, path_1.relative)(cwd, outputDir);
@@ -221285,6 +221296,14 @@ function mergeWildcard(buildResults) {
     }
     return wildcard;
 }
+function mergeFlags(buildResults) {
+    return Array.from(buildResults).flatMap(result => {
+        if ('flags' in result) {
+            return result.flags ?? [];
+        }
+        return [];
+    });
+}
 
 
 /***/ }),
@@ -223716,7 +223735,7 @@ exports.domainsCommand = {
         },
         {
             name: 'move',
-            description: 'Move a domain to another user or team',
+            description: 'Move a domain to another scope',
             arguments: [
                 {
                     name: 'name',
@@ -224150,6 +224169,10 @@ async function move(client, opts, args) {
     }
     const teams = await (0, get_teams_1.default)(client);
     const matchId = await findDestinationMatch(destination, user, teams);
+    if (matchId && matchId === user.id && user.version === 'northstar') {
+        output.error(`You may not move your domain to your user account.`);
+        return 1;
+    }
     if (!matchId && !opts['--yes']) {
         output.warn(`You're not a member of ${(0, param_1.default)(destination)}. ` +
             `${(0, param_1.default)(destination)} will have 24 hours to accept your move request before it expires.`);
@@ -225009,6 +225032,11 @@ function tryReadHeadSync(path, length) {
         }
     }
 }
+const VARIABLES_TO_IGNORE = [
+    'VERCEL_ANALYTICS_ID',
+    'VERCEL_SPEED_INSIGHTS_ID',
+    'VERCEL_WEB_ANALYTICS_ID',
+];
 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>`)}`);
@@ -225053,6 +225081,7 @@ async function pull(client, link, project, environment, opts, args, output, cwd,
     const contents = CONTENTS_PREFIX +
         Object.keys(records)
             .sort()
+            .filter(key => !VARIABLES_TO_IGNORE.includes(key))
             .map(key => `${key}="${escapeValue(records[key])}"`)
             .join('\n') +
         '\n';
@@ -227058,6 +227087,7 @@ const global_path_1 = __importDefault(__webpack_require__(88976));
 const files_1 = __webpack_require__(48695);
 const help_1 = __webpack_require__(58219);
 const command_1 = __webpack_require__(23496);
+const update_current_team_after_login_1 = __webpack_require__(97784);
 async function login(client) {
     const { output } = client;
     const argv = (0, get_args_1.default)(client.argv.slice(2), {
@@ -227102,19 +227132,13 @@ async function login(client) {
     if (typeof result === 'number') {
         return result;
     }
-    // If the token was upgraded (not a new login), then don't modify
-    // the current scope.
-    if (!client.authConfig.token) {
-        if (result.teamId) {
-            // SSO login, so set the current scope to the appropriate Team
-            client.config.currentTeam = result.teamId;
-        }
-        else {
-            delete client.config.currentTeam;
-        }
-    }
+    const isNewLogin = !client.authConfig.token;
     // Save the user's authentication token to the configuration file.
     client.authConfig.token = result.token;
+    // If we have a new login, update `currentTeam`
+    if (isNewLogin) {
+        await (0, update_current_team_after_login_1.updateCurrentTeamAfterLogin)(client, output, result.teamId);
+    }
     (0, files_1.writeToAuthConfigFile)(client.authConfig);
     (0, files_1.writeToConfigFile)(client.config);
     output.debug(`Saved credentials in "${(0, humanize_path_1.default)((0, global_path_1.default)())}"`);
@@ -227138,7 +227162,7 @@ exports.logoutCommand = void 0;
 const pkg_name_1 = __webpack_require__(79000);
 exports.logoutCommand = {
     name: 'logout',
-    description: 'Logout the current authenticated user or team.',
+    description: 'Logout the current authenticated user.',
     arguments: [],
     options: [],
     examples: [
@@ -227616,7 +227640,7 @@ exports.projectCommand = {
     subcommands: [
         {
             name: 'ls',
-            description: 'Show all projects in the selected team/user',
+            description: 'Show all projects in the selected scope',
             arguments: [],
             options: [],
             examples: [],
@@ -229718,9 +229742,9 @@ async function list(client) {
         apiVersion: 2,
     });
     let { currentTeam } = config;
-    const accountIsCurrent = !currentTeam;
     output.spinner('Fetching user information');
     const user = await (0, get_user_1.default)(client);
+    const accountIsCurrent = !currentTeam && user.version !== 'northstar';
     if (accountIsCurrent) {
         currentTeam = user.id;
     }
@@ -229730,12 +229754,14 @@ async function list(client) {
         value: slug,
         current: id === currentTeam ? chars_1.default.tick : '',
     }));
-    teamList.unshift({
-        id: user.id,
-        name: user.email,
-        value: user.username || user.email,
-        current: accountIsCurrent ? chars_1.default.tick : '',
-    });
+    if (user.version !== 'northstar') {
+        teamList.unshift({
+            id: user.id,
+            name: user.email,
+            value: user.username || user.email,
+            current: accountIsCurrent ? chars_1.default.tick : '',
+        });
+    }
     // Bring the current Team to the beginning of the list
     if (!accountIsCurrent) {
         const index = teamList.findIndex(choice => choice.id === currentTeam);
@@ -229744,12 +229770,14 @@ async function list(client) {
     }
     // Printing
     output.stopSpinner();
-    console.log(); // empty line
-    (0, table_1.default)(['', 'id', 'email / name'], teamList.map(team => [team.current, team.value, team.name]), [1, 5]);
+    client.stdout.write('\n'); // empty line
+    (0, table_1.default)(['', 'id', 'email / name'], teamList.map(team => [team.current, team.value, team.name]), [1, 5], (str) => {
+        client.stdout.write(str);
+    });
     if (pagination?.count === 20) {
         const flags = (0, get_command_flags_1.default)(argv, ['_', '--next', '-N', '-d']);
         const nextCmd = `${pkg_name_1.packageName} teams ls${flags} --next ${pagination.next}`;
-        console.log(); // empty line
+        client.stdout.write('\n'); // empty line
         output.log(`To display the next page run ${(0, cmd_1.default)(nextCmd)}`);
     }
     return 0;
@@ -229824,14 +229852,19 @@ async function main(client, desiredSlug) {
         if (user.limited) {
             suffix += ` ${(0, emoji_1.emoji)('locked')}`;
         }
+        const personalAccountChoice = user.version === 'northstar'
+            ? []
+            : [
+                { separator: 'Personal Account' },
+                {
+                    name: `${user.name || user.email} (${user.username})${suffix}`,
+                    value: user.username,
+                    short: user.username,
+                    selected: personalScopeSelected,
+                },
+            ];
         const choices = [
-            { separator: 'Personal Account' },
-            {
-                name: `${user.name || user.email} (${user.username})${suffix}`,
-                value: user.username,
-                short: user.username,
-                selected: personalScopeSelected,
-            },
+            ...personalAccountChoice,
             { separator: 'Teams' },
             ...teamChoices,
         ];
@@ -229848,6 +229881,10 @@ async function main(client, desiredSlug) {
         return 0;
     }
     if (desiredSlug === user.username || desiredSlug === user.email) {
+        if (user.version === 'northstar') {
+            output.error('You cannot set your Personal Account as the scope.');
+            return 1;
+        }
         // Switch to user's personal account
         if (personalScopeSelected) {
             output.log('No changes made');
@@ -230034,6 +230071,7 @@ const proxy_agent_1 = __webpack_require__(21861);
 const box_1 = __importDefault(__webpack_require__(58587));
 const exec_1 = __webpack_require__(62720);
 const args_1 = __webpack_require__(29709);
+const update_current_team_after_login_1 = __webpack_require__(97784);
 const VERCEL_DIR = (0, global_path_1.default)();
 const VERCEL_CONFIG_PATH = configFiles.getConfigFilePath();
 const VERCEL_AUTH_CONFIG_PATH = configFiles.getAuthConfigFilePath();
@@ -230249,16 +230287,10 @@ const main = async () => {
             if (typeof result === 'number') {
                 return result;
             }
-            if (result.teamId) {
-                // SSO login, so set the current scope to the appropriate Team
-                client.config.currentTeam = result.teamId;
-            }
-            else {
-                delete client.config.currentTeam;
-            }
             // When `result` is a string it's the user's authentication token.
             // It needs to be saved to the configuration file.
             client.authConfig.token = result.token;
+            await (0, update_current_team_after_login_1.updateCurrentTeamAfterLogin)(client, output, result.teamId);
             configFiles.writeToAuthConfigFile(client.authConfig);
             configFiles.writeToConfigFile(client.config);
             output.debug(`Saved credentials in "${(0, humanize_path_1.default)(VERCEL_DIR)}"`);
@@ -230331,6 +230363,10 @@ const main = async () => {
             return 1;
         }
         if (user.id === scope || user.email === scope || user.username === scope) {
+            if (user.version === 'northstar') {
+                output.error('You cannot set your Personal Account as the scope.');
+                return 1;
+            }
             delete client.config.currentTeam;
         }
         else {
@@ -238564,7 +238600,7 @@ class TeamDeleted extends now_error_1.NowError {
     constructor() {
         super({
             code: 'TEAM_DELETED',
-            message: `Your team was deleted. You can switch to a different one using ${(0, pkg_name_1.getCommandName)(`switch`)}.`,
+            message: `Your team was deleted or you were removed from the team. You can switch to a different one using ${(0, pkg_name_1.getCommandName)(`switch`)}.`,
             meta: {},
         });
     }
@@ -240338,8 +240374,10 @@ async function getScope(client, opts = {}) {
     const user = await (0, get_user_1.default)(client);
     let contextName = user.username || user.email;
     let team = null;
-    if (client.config.currentTeam && opts.getTeam !== false) {
-        team = await (0, get_team_by_id_1.default)(client, client.config.currentTeam);
+    const defaultTeamId = user.version === 'northstar' ? user.defaultTeamId : undefined;
+    const currentTeamOrDefaultTeamId = client.config.currentTeam || defaultTeamId;
+    if (currentTeamOrDefaultTeamId && opts.getTeam !== false) {
+        team = await (0, get_team_by_id_1.default)(client, currentTeamOrDefaultTeamId);
         if (!team) {
             throw new errors_ts_1.TeamDeleted();
         }
@@ -241875,11 +241913,16 @@ async function selectOrg(client, question, autoConfirm) {
     finally {
         output.stopSpinner();
     }
+    const personalAccountChoice = user.version === 'northstar'
+        ? []
+        : [
+            {
+                name: user.name || user.username,
+                value: { type: 'user', id: user.id, slug: user.username },
+            },
+        ];
     const choices = [
-        {
-            name: user.name || user.username,
-            value: { type: 'user', id: user.id, slug: user.username },
-        },
+        ...personalAccountChoice,
         ...teams.map(team => ({
             name: team.name || team.slug,
             value: { type: 'team', id: team.id, slug: team.slug },
@@ -243298,6 +243341,45 @@ function doSamlLogin(client, teamIdOrSlug, outOfBand, ssoUserId) {
 exports.default = doSamlLogin;
 
 
+/***/ }),
+
+/***/ 97784:
+/***/ (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.updateCurrentTeamAfterLogin = void 0;
+const get_user_1 = __importDefault(__webpack_require__(78871));
+// NOTE: `client.authConfig.token` must be set before calling this
+async function updateCurrentTeamAfterLogin(client, output, ssoTeamId) {
+    if (ssoTeamId) {
+        client.config.currentTeam = ssoTeamId;
+    }
+    else {
+        let user = null;
+        try {
+            user = await (0, get_user_1.default)(client);
+        }
+        catch (err) {
+            // Shouldn't happen since we just logged in
+            output.error('Failed to fetch the logged in user. Please try again.');
+            return 1;
+        }
+        if (user.version === 'northstar' && user.defaultTeamId) {
+            client.config.currentTeam = user.defaultTeamId;
+        }
+        else {
+            delete client.config.currentTeam;
+        }
+    }
+}
+exports.updateCurrentTeamAfterLogin = updateCurrentTeamAfterLogin;
+
+
 /***/ }),
 
 /***/ 80361:
@@ -244345,7 +244427,7 @@ const printLine = (data, sizes) => data.reduce((line, col, i) => line + col.padE
 /**
  * Print a table.
  */
-function table(fieldNames = [], data = [], margins = []) {
+function table(fieldNames = [], data = [], margins = [], print) {
     // Compute size of each column
     const sizes = data
         .reduce((acc, row) => row.map((col, i) => {
@@ -244356,10 +244438,12 @@ function table(fieldNames = [], data = [], margins = []) {
         // Add margin to all columns except the last
         .map((size, i) => (i < margins.length && size + margins[i]) || size);
     // Print header
-    console.log(chalk_1.default.grey(printLine(fieldNames, sizes)));
+    print(chalk_1.default.grey(printLine(fieldNames, sizes)));
+    print('\n');
     // Print content
     for (const row of data) {
-        console.log(printLine(row, sizes));
+        print(printLine(row, sizes));
+        print('\n');
     }
 }
 exports.default = table;
@@ -246337,7 +246421,7 @@ module.exports = JSON.parse("[[[0,44],\"disallowed_STD3_valid\"],[[45,46],\"vali
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse("{\"name\":\"@vercel/client\",\"version\":\"13.0.3\",\"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\":\"node ../../utils/build.mjs\",\"test-e2e\":\"pnpm test tests/create-deployment.test.ts tests/create-legacy-deployment.test.ts tests/paths.test.ts\",\"test\":\"jest --reporters=default --reporters=jest-junit --env node --verbose --runInBand --bail\",\"test-unit\":\"pnpm test tests/unit.*test.*\"},\"engines\":{\"node\":\">= 16\"},\"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\",\"jest-junit\":\"16.0.0\",\"typescript\":\"4.9.5\"},\"dependencies\":{\"@vercel/build-utils\":\"7.2.0\",\"@vercel/routing-utils\":\"3.0.0\",\"@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\":\"13.0.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\":\"node ../../utils/build.mjs\",\"test-e2e\":\"pnpm test tests/create-deployment.test.ts tests/create-legacy-deployment.test.ts tests/paths.test.ts\",\"test\":\"jest --reporters=default --reporters=jest-junit --env node --verbose --runInBand --bail\",\"test-unit\":\"pnpm test tests/unit.*test.*\"},\"engines\":{\"node\":\">= 16\"},\"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\",\"jest-junit\":\"16.0.0\",\"typescript\":\"4.9.5\"},\"dependencies\":{\"@vercel/build-utils\":\"7.2.1\",\"@vercel/routing-utils\":\"3.0.0\",\"@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": "32.2.5",
+  "version": "32.3.0",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -22,16 +22,16 @@
     "node": ">= 16"
   },
   "dependencies": {
-    "@vercel/build-utils": "7.2.0",
-    "@vercel/go": "3.0.1",
+    "@vercel/build-utils": "7.2.1",
+    "@vercel/go": "3.0.2",
     "@vercel/hydrogen": "1.0.1",
-    "@vercel/next": "4.0.6",
-    "@vercel/node": "3.0.5",
-    "@vercel/python": "4.0.1",
-    "@vercel/redwood": "2.0.2",
-    "@vercel/remix-builder": "2.0.6",
+    "@vercel/next": "4.0.7",
+    "@vercel/node": "3.0.6",
+    "@vercel/python": "4.0.2",
+    "@vercel/redwood": "2.0.3",
+    "@vercel/remix-builder": "2.0.7",
     "@vercel/ruby": "2.0.2",
-    "@vercel/static-build": "2.0.6"
+    "@vercel/static-build": "2.0.7"
   },
   "devDependencies": {
     "@alex_neo/jest-expect-message": "1.0.5",
@@ -77,8 +77,8 @@
     "@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.10",
-    "@vercel/client": "13.0.3",
+    "@vercel-internals/types": "1.0.11",
+    "@vercel/client": "13.0.4",
     "@vercel/error-utils": "2.0.1",
     "@vercel/frameworks": "2.0.2",
     "@vercel/fs-detectors": "5.1.0",