chore: bundle the CLI in one file for npm users (#848)

Author: vladfrangu

package.json

@@ -3,7 +3,6 @@
     "version": "0.21.10",
     "description": "Apify command-line interface (CLI) helps you manage the Apify cloud platform and develop, build, and deploy Apify Actors.",
     "exports": "./dist/index.js",
-    "types": "./dist/index.d.ts",
     "type": "module",
     "scripts": {
         "dev:apify": "tsx ./src/entrypoints/apify.ts",
@@ -18,7 +17,7 @@
         "format": "biome format . && prettier --check \"**/*.{md,yml,yaml}\"",
         "format:fix": "biome format --write . && prettier --write \"**/*.{md,yml,yaml}\"",
         "clean": "rimraf dist",
-        "build": "yarn clean && tsc",
+        "build": "yarn clean && tsc && tsup",
         "build-bundles": "bun run scripts/build-cli-bundles.ts",
         "prepack": "yarn insert-cli-metadata && yarn build && yarn update-docs",
         "insert-cli-metadata": "tsx scripts/insert-cli-metadata.ts",
@@ -29,9 +28,9 @@
         "dist"
     ],
     "bin": {
-        "actor": "./dist/entrypoints/actor.js",
-        "apify": "./dist/entrypoints/apify.js",
-        "apify-cli": "./dist/entrypoints/apify.js"
+        "actor": "./dist/actor.js",
+        "apify": "./dist/apify.js",
+        "apify-cli": "./dist/apify.js"
     },
     "contributors": [
         "Jakub Drobník <[email protected]>",
@@ -145,6 +144,7 @@
         "mdast-util-from-markdown": "^2.0.2",
         "mock-stdin": "^1.0.0",
         "prettier": "^3.5.3",
+        "tsup": "^8.5.0",
         "tsx": "^4.16.5",
         "typescript": "^5.8.3",
         "typescript-eslint": "^8.31.0",

src/entrypoints/_shared.ts

@@ -1,6 +1,7 @@
 import process from 'node:process';
 
 import chalk from 'chalk';
+import { satisfies } from 'semver';
 // eslint-disable-next-line import/extensions
 import yargs from 'yargs/yargs';
 
@@ -14,6 +15,7 @@ import {
 import type { FlagTag, TaggedFlagBuilder } from '../lib/command-framework/flags.js';
 import { renderMainHelpMenu, selectiveRenderHelpForCommand } from '../lib/command-framework/help.js';
 import { readStdin } from '../lib/commands/read-stdin.js';
+import { SUPPORTED_NODEJS_VERSION } from '../lib/consts.js';
 import { useCLIMetadata } from '../lib/hooks/useCLIMetadata.js';
 import { shouldSkipVersionCheck } from '../lib/hooks/useCLIVersionCheck.js';
 import { useCommandSuggestions } from '../lib/hooks/useCommandSuggestions.js';
@@ -85,6 +87,20 @@ const cliMetadata = useCLIMetadata();
 
 export const USER_AGENT = `Apify CLI/${cliMetadata.version} (https://github.com/apify/apify-cli)`;
 
+export function processVersionCheck(cliName: string) {
+	if (cliMetadata.installMethod === 'bundle') {
+		return;
+	}
+
+	if (!satisfies(process.version, SUPPORTED_NODEJS_VERSION)) {
+		error({
+			message: `${cliName} CLI requires Node.js version ${SUPPORTED_NODEJS_VERSION}. Your current version is ${process.version}.`,
+		});
+
+		process.exit(1);
+	}
+}
+
 export function printCLIVersionAndExitIfFlagUsed(parsed: Awaited<ReturnType<typeof cli.parse>>) {
 	if (parsed.v === true || parsed.version === true) {
 		console.log(cliMetadata.fullVersionString);

src/entrypoints/actor.ts

@@ -1,20 +1,8 @@
 #!/usr/bin/env node
-import { satisfies } from 'semver';
-
 import { actorCommands } from '../commands/_register.js';
-import { SUPPORTED_NODEJS_VERSION } from '../lib/consts.js';
-import { error } from '../lib/outputs.js';
-import { cli, runCLI } from './_shared.js';
-
-cli.scriptName('actor');
+import { cli, processVersionCheck, runCLI } from './_shared.js';
 
-if (!satisfies(process.version, SUPPORTED_NODEJS_VERSION)) {
-	error({
-		message: `Actor CLI requires Node.js version ${SUPPORTED_NODEJS_VERSION}. Your current version is ${process.version}.`,
-	});
-
-	process.exit(1);
-}
+processVersionCheck('Actor');
 
 // Register all commands
 for (const CommandClass of actorCommands) {

src/entrypoints/apify.ts

@@ -1,18 +1,8 @@
 #!/usr/bin/env node
-import { satisfies } from 'semver';
-
 import { apifyCommands } from '../commands/_register.js';
-import { SUPPORTED_NODEJS_VERSION } from '../lib/consts.js';
-import { error } from '../lib/outputs.js';
-import { cli, runCLI } from './_shared.js';
-
-if (!satisfies(process.version, SUPPORTED_NODEJS_VERSION)) {
-	error({
-		message: `Apify CLI requires Node.js version ${SUPPORTED_NODEJS_VERSION}. Your current version is ${process.version}.`,
-	});
+import { cli, processVersionCheck, runCLI } from './_shared.js';
 
-	process.exit(1);
-}
+processVersionCheck('Apify');
 
 // Register all commands
 for (const CommandClass of apifyCommands) {

src/lib/consts.ts

@@ -60,8 +60,6 @@ export const INPUT_FILE_REG_EXP = new RegExp(`^${KEY_VALUE_STORE_KEYS.INPUT}\\..
 
 export const SUPPORTED_NODEJS_VERSION = pkg.engines.node;
 
-export const CURRENT_APIFY_CLI_VERSION = pkg.version;
-
 export const APIFY_CLIENT_DEFAULT_HEADERS = { 'X-Apify-Request-Origin': META_ORIGINS.CLI };
 
 export const MINIMUM_SUPPORTED_PYTHON_VERSION = '3.9.0';

tsconfig.eslint.json

@@ -13,6 +13,7 @@
 		"features/**/*.ts",
 		"features/**/*.js",
 		".github/scripts",
-		"eslint.config.mjs"
+		"eslint.config.mjs",
+		"tsup.config.ts"
 	]
 }

tsconfig.json

@@ -8,14 +8,12 @@
 		"lib": ["ES2022"],
 		"allowJs": true,
 		"rootDir": "src",
-		"outDir": "dist",
 		// For now we need this :(
 		"skipLibCheck": true,
 		"tsBuildInfoFile": "dist/.tsbuildinfo",
 		"noImplicitOverride": true,
 		"types": ["node"],
-		"declaration": false,
-		"declarationMap": false
+		"noEmit": true
 	},
 	"include": ["src"]
 }

tsup.config.ts

@@ -0,0 +1,37 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { defineConfig } from 'tsup';
+
+export default [
+	defineConfig({
+		entry: ['src/entrypoints/apify.ts', 'src/entrypoints/actor.ts'],
+		external: [],
+		noExternal: [],
+		platform: 'node',
+		format: ['esm'],
+		target: 'es2022',
+		skipNodeModulesBundle: true,
+		clean: true,
+		minify: true,
+		terserOptions: {
+			mangle: false,
+			keep_classnames: true,
+			keep_fnames: true,
+		},
+		splitting: true,
+		keepNames: true,
+		dts: false,
+		sourcemap: true,
+		bundle: true,
+		treeshake: false,
+		outDir: 'dist',
+	}),
+	defineConfig({
+		entry: ['src/index.ts'],
+		platform: 'node',
+		format: ['esm'],
+		target: 'es2022',
+		sourcemap: false,
+		dts: false,
+		outDir: 'dist',
+	}),
+];