Merge branch 'master' into feat/sign-tarball-kv-record-url

Author: danpoletaev

.bun-version

@@ -1 +1 @@
-1.2.19
+1.2.20

CHANGELOG.md

@@ -25,6 +25,7 @@ All notable changes to this project will be documented in this file.
 ### Chore
 
 - [**breaking**] Move from yargs to node:util ([#871](https://github.com/apify/apify-cli/pull/871)) ([482d0b2](https://github.com/apify/apify-cli/commit/482d0b29f285c020320f1f2e3f0fd08a362d57cc)) by [@vladfrangu](https://github.com/vladfrangu), closes [#833](https://github.com/apify/apify-cli/issues/833)
+- [**breaking**] Make opening the actor build results in push opt-in ([#881](https://github.com/apify/apify-cli/pull/881)) ([d842424](https://github.com/apify/apify-cli/commit/d84242421387a9487eef5c07183dd0b8ac7ae67b)) by [@vladfrangu](https://github.com/vladfrangu)
 
 <!-- git-cliff-unreleased-end -->
 

features/test-implementations/1.setup.ts

@@ -234,7 +234,7 @@ Given<TestWorld>(/the local actor is pushed to the Apify platform/i, { timeout:
 	}
 
 	const result = await executeCommand({
-		rawCommand: 'apify push --no-prompt',
+		rawCommand: 'apify push',
 		cwd: this.testActor.pwd,
 		env: extraEnv,
 	});

package.json

@@ -60,7 +60,7 @@
     },
     "homepage": "https://github.com/apify/apify-cli#readme",
     "engines": {
-        "node": ">=18"
+        "node": ">=20"
     },
     "dependencies": {
         "@apify/actor-templates": "^0.1.5",
@@ -100,9 +100,7 @@
         "js-levenshtein": "^1.1.6",
         "lodash.clonedeep": "^4.5.0",
         "mime": "~4.0.4",
-        "mixpanel": "~0.18.0",
         "open": "~10.2.0",
-        "ow": "~2.0.0",
         "rimraf": "~6.0.1",
         "semver": "~7.7.0",
         "string-width": "^7.2.0",

scripts/generate-cli-docs.ts

@@ -67,6 +67,9 @@ const categories: Record<string, CommandsInCategory[]> = {
 		//
 		{ command: Commands.help },
 		{ command: Commands.upgrade },
+		{ command: Commands.telemetry },
+		{ command: Commands.telemetryEnable },
+		{ command: Commands.telemetryDisable },
 	],
 	'dataset': [
 		//

src/commands/_register.ts

@@ -28,6 +28,7 @@ import { RunCommand } from './run.js';
 import { RunsIndexCommand } from './runs/_index.js';
 import { SecretsIndexCommand } from './secrets/_index.js';
 import { TasksIndexCommand } from './task/_index.js';
+import { TelemetryIndexCommand } from './telemetry/_index.js';
 import { ValidateInputSchemaCommand } from './validate-schema.js';
 
 export const apifyCommands = [
@@ -41,6 +42,8 @@ export const apifyCommands = [
 	RunsIndexCommand,
 	SecretsIndexCommand,
 	TasksIndexCommand,
+	TelemetryIndexCommand,
+
 	// top-level
 	TopLevelCallCommand,
 	UpgradeCommand,
@@ -70,8 +73,12 @@ export const actorCommands = [
 	ActorGetPublicUrlCommand,
 	ActorGetInputCommand,
 	ActorChargeCommand,
+
 	// top-level
 	HelpCommand,
 	UpgradeCommand,
 	InstallCommand,
+
+	// namespaces
+	TelemetryIndexCommand,
 ] as const satisfies (typeof BuiltApifyCommand)[];

src/commands/actors/push.ts

@@ -3,7 +3,6 @@ import { join, resolve } from 'node:path';
 import process from 'node:process';
 
 import type { Actor, ActorCollectionCreateOptions, ActorDefaultRunOptions } from 'apify-client';
-import isCI from 'is-ci';
 import open from 'open';
 
 import { fetchManifest } from '@apify/actor-templates';
@@ -16,7 +15,6 @@ import { Flags } from '../../lib/command-framework/flags.js';
 import { CommandExitCodes, DEPRECATED_LOCAL_CONFIG_NAME, LOCAL_CONFIG_PATH } from '../../lib/consts.js';
 import { sumFilesSizeInBytes } from '../../lib/files.js';
 import { useActorConfig } from '../../lib/hooks/useActorConfig.js';
-import { useYesNoConfirm } from '../../lib/hooks/user-confirmations/useYesNoConfirm.js';
 import { error, info, link, run, success, warning } from '../../lib/outputs.js';
 import { transformEnvToEnvVars } from '../../lib/secrets.js';
 import {
@@ -67,9 +65,8 @@ export class ActorsPushCommand extends ApifyCommand<typeof ActorsPushCommand> {
 			description: 'Seconds for waiting to build to finish, if no value passed, it waits forever.',
 			required: false,
 		}),
-		'no-prompt': Flags.boolean({
-			description:
-				'Do not prompt for opening the Actor details in a browser. This will also not open the browser automatically.',
+		'open': Flags.boolean({
+			description: 'Whether to open the browser automatically to the Actor details page.',
 			default: false,
 			required: false,
 		}),
@@ -329,15 +326,13 @@ Skipping push. Use --force to override.`,
 			url: `https://console.apify.com${redirectUrlPart}/actors/${build.actId}#/builds/${build.buildNumber}`,
 		});
 
-		// Disable open browser on CI, or if user passed --no-prompt flag
-		if (!isCI && !this.flags.noPrompt) {
-			const shouldOpenBrowser = await useYesNoConfirm({
-				message: 'Do you want to open the Actor detail in your browser?',
-			});
+		link({
+			message: 'Actor detail',
+			url: `https://console.apify.com${redirectUrlPart}/actors/${build.actId}`,
+		});
 
-			if (shouldOpenBrowser) {
-				await open(`https://console.apify.com${redirectUrlPart}/actors/${build.actId}`);
-			}
+		if (this.flags.open) {
+			await open(`https://console.apify.com${redirectUrlPart}/actors/${build.actId}`);
 		}
 
 		if (build.status === ACTOR_JOB_STATUSES.SUCCEEDED) {

src/commands/cli-management/install.ts

@@ -92,7 +92,10 @@ export class InstallCommand extends ApifyCommand<typeof InstallCommand> {
 
 			const symlinkPath = join(localBinDirectory, file);
 
-			await unlink(symlinkPath);
+			await unlink(symlinkPath).catch(() => {
+				// Ignore errors
+			});
+
 			await symlink(originalPath, symlinkPath);
 
 			cliDebugPrint('[install] symlink created for item', file, symlinkPath);

src/commands/init.ts

@@ -4,13 +4,7 @@ import process from 'node:process';
 import { ApifyCommand } from '../lib/command-framework/apify-command.js';
 import { Args } from '../lib/command-framework/args.js';
 import { Flags } from '../lib/command-framework/flags.js';
-import {
-	CommandExitCodes,
-	DEFAULT_LOCAL_STORAGE_DIR,
-	EMPTY_LOCAL_CONFIG,
-	LOCAL_CONFIG_PATH,
-	PROJECT_TYPES,
-} from '../lib/consts.js';
+import { CommandExitCodes, DEFAULT_LOCAL_STORAGE_DIR, EMPTY_LOCAL_CONFIG, LOCAL_CONFIG_PATH } from '../lib/consts.js';
 import { useActorConfig } from '../lib/hooks/useActorConfig.js';
 import { ProjectLanguage, useCwdProject } from '../lib/hooks/useCwdProject.js';
 import { useUserInput } from '../lib/hooks/user-confirmations/useUserInput.js';
@@ -61,7 +55,7 @@ export class InitCommand extends ApifyCommand<typeof InitCommand> {
 
 		if (project.type === ProjectLanguage.Scrapy) {
 			info({ message: 'The current directory looks like a Scrapy project. Using automatic project wrapping.' });
-			this.telemetryData.actorWrapper = PROJECT_TYPES.SCRAPY;
+			this.telemetryData.actorWrapper = 'scrapy';
 
 			return wrapScrapyProject({ projectPath: cwd });
 		}

src/commands/login.ts

@@ -12,10 +12,10 @@ import { cryptoRandomObjectId } from '@apify/utilities';
 import { ApifyCommand } from '../lib/command-framework/apify-command.js';
 import { Flags } from '../lib/command-framework/flags.js';
 import { AUTH_FILE_PATH } from '../lib/consts.js';
+import { updateUserId } from '../lib/hooks/telemetry/useTelemetryState.js';
 import { useMaskedInput } from '../lib/hooks/user-confirmations/useMaskedInput.js';
 import { useSelectFromList } from '../lib/hooks/user-confirmations/useSelectFromList.js';
 import { error, info, success } from '../lib/outputs.js';
-import { useApifyIdentity } from '../lib/telemetry.js';
 import { getLocalUserInfo, getLoggedClient } from '../lib/utils.js';
 
 const CONSOLE_BASE_URL = 'https://console.apify.com/settings/integrations';
@@ -30,8 +30,10 @@ const API_VERSION = 'v1';
 const tryToLogin = async (token: string) => {
 	const isUserLogged = await getLoggedClient(token, API_BASE_URL);
 	const userInfo = await getLocalUserInfo();
+
 	if (isUserLogged) {
-		await useApifyIdentity(userInfo.id!);
+		await updateUserId(userInfo.id!);
+
 		success({
 			message: `You are logged in to Apify as ${userInfo.username || userInfo.id}. ${chalk.gray(`Your token is stored at ${AUTH_FILE_PATH()}.`)}`,
 		});
@@ -67,6 +69,7 @@ export class LoginCommand extends ApifyCommand<typeof LoginCommand> {
 
 	async run() {
 		const { token, method } = this.flags;
+
 		if (token) {
 			await tryToLogin(token);
 			return;