@hot-updater/android-helper 0.28.0 → 0.29.0

package/dist/index.cjs

@@ -1,4 +1,5 @@
-//#region rolldown:runtime
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -19,23 +20,18 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	value: mod,
 	enumerable: true
 }) : target, mod));
-
 //#endregion
-let __hot_updater_cli_tools = require("@hot-updater/cli-tools");
-__hot_updater_cli_tools = __toESM(__hot_updater_cli_tools);
-let __hot_updater_plugin_core = require("@hot-updater/plugin-core");
-__hot_updater_plugin_core = __toESM(__hot_updater_plugin_core);
+let _hot_updater_cli_tools = require("@hot-updater/cli-tools");
+let _hot_updater_plugin_core = require("@hot-updater/plugin-core");
 let path = require("path");
 path = __toESM(path);
 let execa = require("execa");
-execa = __toESM(execa);
 let fs = require("fs");
 fs = __toESM(fs);
 let node_os = require("node:os");
 node_os = __toESM(node_os);
-
 //#region src/utils/createGradleLogger.ts
-const createGradleLogger = ({ logPrefix }) => new __hot_updater_cli_tools.BuildLogger({
+const createGradleLogger = ({ logPrefix }) => new _hot_updater_cli_tools.BuildLogger({
 	logPrefix,
 	importantLogPatterns: [
 		"error:",
@@ -146,7 +142,6 @@ const createGradleLogger = ({ logPrefix }) => new __hot_updater_cli_tools.BuildL
 		["BUILD SUCCESSFUL", /\d+ actionable tasks:/]
 	]
 });
-
 //#endregion
 //#region src/builder/runGradle.ts
 /**
@@ -182,7 +177,7 @@ async function runGradle({ tasks, logPrefix, args, androidProjectPath, appModule
 	const gradleArgs = getTaskNames(appModuleName, tasks);
 	gradleArgs.push("-x", "lint");
 	if (args.extraParams) gradleArgs.push(...args.extraParams);
-	__hot_updater_cli_tools.p.log.info(`Run Gradle Settings: 
+	_hot_updater_cli_tools.p.log.info(`Run Gradle Settings: 
 Project    ${androidProjectPath}
 App Moudle ${appModuleName}
 Tasks      ${tasks.join(", ")}
@@ -192,19 +187,19 @@ Args       ${gradleArgs.join(" ")}
 	const logger = createGradleLogger({ logPrefix });
 	await logger.start();
 	try {
-		const process$1 = (0, execa.execa)(getGradleWrapper(), gradleArgs, {
+		const process = (0, execa.execa)(getGradleWrapper(), gradleArgs, {
 			cwd: androidProjectPath,
 			all: true
 		});
-		const outputStream = process$1.all ?? process$1.stdout;
+		const outputStream = process.all ?? process.stdout;
 		if (outputStream) await logger.processStream(outputStream);
-		await process$1;
+		await process;
 		logger.stop();
 	} catch (e) {
 		logger.writeError(e);
 		logger.stop("Build failed", false);
-		if (e instanceof execa.ExecaError) __hot_updater_cli_tools.p.log.error(getCleanedErrorMessage(e));
-		else if (e instanceof Error) __hot_updater_cli_tools.p.log.error(e.message);
+		if (e instanceof execa.ExecaError) _hot_updater_cli_tools.p.log.error(getCleanedErrorMessage(e));
+		else if (e instanceof Error) _hot_updater_cli_tools.p.log.error(e.message);
 		throw new Error("Failed to build the app. See the error above for details from Gradle.");
 	} finally {
 		await logger.close();
@@ -244,23 +239,21 @@ async function getBuildOutputFilePath({ aab, appModuleName, buildDirectory, vari
 	const outputFile = `${appModuleName}-${variant}.${aab ? "aab" : "apk"}`;
 	const outputFilePath = path.default.join(buildDirectory, outputFile);
 	if (fs.default.existsSync(outputFilePath)) return outputFilePath;
-	__hot_updater_cli_tools.p.log.error(`Failed to find the output file for ${outputFilePath}`);
+	_hot_updater_cli_tools.p.log.error(`Failed to find the output file for ${outputFilePath}`);
 	process.exit(1);
 }
-
 //#endregion
 //#region src/buildAndroid.ts
 const buildAndroid = async ({ schemeConfig }) => {
-	const androidProjectPath = path.default.join((0, __hot_updater_cli_tools.getCwd)(), "android");
+	const androidProjectPath = path.default.join((0, _hot_updater_cli_tools.getCwd)(), "android");
 	return runGradle({
-		args: { extraParams: [`-PMIN_BUNDLE_ID=${(0, __hot_updater_plugin_core.generateMinBundleId)()}`] },
+		args: { extraParams: [`-PMIN_BUNDLE_ID=${(0, _hot_updater_plugin_core.generateMinBundleId)()}`] },
 		appModuleName: schemeConfig.appModuleName,
 		tasks: schemeConfig.aab ? [`bundle${schemeConfig.variant}`] : [`assemble${schemeConfig.variant}`],
 		logPrefix: `android-${schemeConfig.hotUpdaterSchemeName}-build`,
 		androidProjectPath
 	});
 };
-
 //#endregion
 //#region src/utils/device.ts
 /**
@@ -308,7 +301,7 @@ async function tryRunAdbReverse({ port = 8081, deviceId }) {
 			`tcp:${port}`,
 			`tcp:${port}`
 		];
-		__hot_updater_cli_tools.p.log.info(`Connecting "${deviceId}" to the development server`);
+		_hot_updater_cli_tools.p.log.info(`Connecting "${deviceId}" to the development server`);
 		await (0, execa.execa)(adbPath, adbArgs);
 	} catch (_error) {
 		throw new Error(`Failed to connect "${deviceId}" to development server using "adb reverse"`);
@@ -447,7 +440,7 @@ const getAvailableDevicePort = async (startPort = defaultPort) => {
 */
 const tryLaunchEmulator = async (name) => {
 	const port = await getAvailableDevicePort();
-	const spinner = __hot_updater_cli_tools.p.spinner();
+	const spinner = _hot_updater_cli_tools.p.spinner();
 	spinner.start("Looking for available emulators");
 	const emulators = await getEmulatorNames();
 	const emulatorName = name ?? emulators[0];
@@ -510,30 +503,30 @@ const matchingDevice = (devices, deviceArg) => {
 const selectTargetDevice = async ({ interactive, deviceOption }) => {
 	const availableDevices = await listDevices();
 	if (deviceOption === true && !interactive) {
-		__hot_updater_cli_tools.p.log.error("you can't select device manually with non-interactive cli mode(without -i option).");
+		_hot_updater_cli_tools.p.log.error("you can't select device manually with non-interactive cli mode(without -i option).");
 		process.exit(1);
 	}
 	if (typeof deviceOption === "string") {
 		const matchedDevice = matchingDevice(availableDevices, deviceOption);
 		if (!matchedDevice) {
-			__hot_updater_cli_tools.p.log.error(`device '${deviceOption}' isn't included in the attached devices.`);
+			_hot_updater_cli_tools.p.log.error(`device '${deviceOption}' isn't included in the attached devices.`);
 			process.exit(1);
 		}
 		return matchedDevice;
 	}
 	if (interactive) {
 		if (!availableDevices.length) {
-			__hot_updater_cli_tools.p.log.error("you passed -d option but there is no attached adb devices.");
+			_hot_updater_cli_tools.p.log.error("you passed -d option but there is no attached adb devices.");
 			process.exit(1);
 		}
-		const device = await __hot_updater_cli_tools.p.select({
+		const device = await _hot_updater_cli_tools.p.select({
 			message: "Target Device",
 			options: availableDevices.map((d) => ({
 				value: d,
 				label: d.readableName
 			}))
 		});
-		if (__hot_updater_cli_tools.p.isCancel(device)) process.exit(1);
+		if (_hot_updater_cli_tools.p.isCancel(device)) process.exit(1);
 		return device;
 	}
 };
@@ -545,12 +538,11 @@ const Device = {
 	listDevices,
 	selectTargetDevice
 };
-
 //#endregion
 //#region src/runner/tryInstallAppOnDevice.ts
 const tryInstallAppOnDevice = async ({ device, apkPath }) => {
 	if (!device.deviceId) {
-		__hot_updater_cli_tools.p.log.warn(`No device with id "${device.deviceId}", skipping launching the app.`);
+		_hot_updater_cli_tools.p.log.warn(`No device with id "${device.deviceId}", skipping launching the app.`);
 		return;
 	}
 	const deviceId = device.deviceId;
@@ -563,7 +555,7 @@ const tryInstallAppOnDevice = async ({ device, apkPath }) => {
 	];
 	adbArgs.push(apkPath);
 	const adbPath = Device.getAdbPath();
-	const spinner = __hot_updater_cli_tools.p.spinner();
+	const spinner = _hot_updater_cli_tools.p.spinner();
 	spinner.start(`Installing the app on ${device.readableName} (id: ${deviceId})`);
 	try {
 		await (0, execa.execa)(adbPath, adbArgs);
@@ -575,12 +567,11 @@ const tryInstallAppOnDevice = async ({ device, apkPath }) => {
 		throw new Error(typeof errorMessage === "string" ? errorMessage : "Installation failed");
 	}
 };
-
 //#endregion
 //#region src/runner/tryLaunchAppOnDevice.ts
 async function tryLaunchAppOnDevice({ device, port, mainActivity, applicationId, packageName }) {
 	if (!device.deviceId) {
-		__hot_updater_cli_tools.p.log.warn(`No device with id "${device.deviceId}", skipping launching the app.`);
+		_hot_updater_cli_tools.p.log.warn(`No device with id "${device.deviceId}", skipping launching the app.`);
 		return;
 	}
 	const deviceId = device.deviceId;
@@ -603,7 +594,7 @@ async function tryLaunchAppOnDevice({ device, port, mainActivity, applicationId,
 	adbArgs.unshift("-s", deviceId);
 	const adbPath = Device.getAdbPath();
 	console.debug(`Running ${adbPath} ${adbArgs.join(" ")}.`);
-	const spinner = __hot_updater_cli_tools.p.spinner();
+	const spinner = _hot_updater_cli_tools.p.spinner();
 	spinner.start(`Launching the app on ${device.readableName} (id: ${deviceId})`);
 	try {
 		await (0, execa.execa)(adbPath, adbArgs);
@@ -613,14 +604,13 @@ async function tryLaunchAppOnDevice({ device, port, mainActivity, applicationId,
 		throw new Error(`Failed to launch the app on ${device.readableName}`);
 	}
 }
-
 //#endregion
 //#region src/runAndroid.ts
 const runAndroid = async ({ schemeConfig, runOption }) => {
 	const { interactive, device: deviceOption } = runOption;
-	const androidProjectPath = path.default.join((0, __hot_updater_cli_tools.getCwd)(), "android");
+	const androidProjectPath = path.default.join((0, _hot_updater_cli_tools.getCwd)(), "android");
 	if (schemeConfig.aab) {
-		__hot_updater_cli_tools.p.log.error("aab scheme can't not be run");
+		_hot_updater_cli_tools.p.log.error("aab scheme can't not be run");
 		process.exit(1);
 	}
 	const device = await Device.selectTargetDevice({
@@ -633,12 +623,12 @@ const runAndroid = async ({ schemeConfig, runOption }) => {
 		}
 		if (!device.deviceId) throw new Error("Failed to run on any device");
 	} else if ((await Device.getConnectedDevices()).length === 0) {
-		__hot_updater_cli_tools.p.log.info("No devices found. Launching first available emulator.");
+		_hot_updater_cli_tools.p.log.info("No devices found. Launching first available emulator.");
 		await Device.tryLaunchEmulator();
 	}
 	const task = `assemble${schemeConfig.variant}`;
 	const result = await runGradle({
-		args: { extraParams: [`-PMIN_BUNDLE_ID=${(0, __hot_updater_plugin_core.generateMinBundleId)()}`] },
+		args: { extraParams: [`-PMIN_BUNDLE_ID=${(0, _hot_updater_plugin_core.generateMinBundleId)()}`] },
 		appModuleName: schemeConfig.appModuleName,
 		logPrefix: `android-${schemeConfig.hotUpdaterSchemeName}-run`,
 		tasks: [task],
@@ -658,10 +648,9 @@ const runAndroid = async ({ schemeConfig, runOption }) => {
 			port: runOption.port
 		});
 	}
-	__hot_updater_cli_tools.p.outro("Success 🎉");
+	_hot_updater_cli_tools.p.outro("Success 🎉");
 	return result;
 };
-
 //#endregion
 //#region src/utils/enrichNativeBuildAndroidScheme.ts
 const enrichNativeBuildAndroidScheme = async ({ schemeConfig, hotUpdaterSchemeName }) => {
@@ -674,8 +663,7 @@ const enrichNativeBuildAndroidScheme = async ({ schemeConfig, hotUpdaterSchemeNa
 		hotUpdaterSchemeName
 	};
 };
-
 //#endregion
 exports.buildAndroid = buildAndroid;
 exports.enrichNativeBuildAndroidScheme = enrichNativeBuildAndroidScheme;
-exports.runAndroid = runAndroid;
+exports.runAndroid = runAndroid;

package/dist/index.d.cts

@@ -1,7 +1,6 @@
 import { NativeBuildAndroidScheme, NativeBuildOptions } from "@hot-updater/plugin-core";
 
 //#region src/utils/enrichNativeBuildAndroidScheme.d.ts
-
 /**
  * Validated scheme filled nullish values with default values.
  */

package/dist/{index.d.ts → index.d.mts}

@@ -1,7 +1,6 @@
 import { NativeBuildAndroidScheme, NativeBuildOptions } from "@hot-updater/plugin-core";
 
 //#region src/utils/enrichNativeBuildAndroidScheme.d.ts
-
 /**
  * Validated scheme filled nullish values with default values.
  */

package/dist/{index.js → index.mjs}

@@ -4,7 +4,6 @@ import path from "path";
 import { ExecaError, execa } from "execa";
 import fs from "fs";
 import os from "node:os";
-
 //#region src/utils/createGradleLogger.ts
 const createGradleLogger = ({ logPrefix }) => new BuildLogger({
 	logPrefix,
@@ -117,7 +116,6 @@ const createGradleLogger = ({ logPrefix }) => new BuildLogger({
 		["BUILD SUCCESSFUL", /\d+ actionable tasks:/]
 	]
 });
-
 //#endregion
 //#region src/builder/runGradle.ts
 /**
@@ -163,13 +161,13 @@ Args       ${gradleArgs.join(" ")}
 	const logger = createGradleLogger({ logPrefix });
 	await logger.start();
 	try {
-		const process$1 = execa(getGradleWrapper(), gradleArgs, {
+		const process = execa(getGradleWrapper(), gradleArgs, {
 			cwd: androidProjectPath,
 			all: true
 		});
-		const outputStream = process$1.all ?? process$1.stdout;
+		const outputStream = process.all ?? process.stdout;
 		if (outputStream) await logger.processStream(outputStream);
-		await process$1;
+		await process;
 		logger.stop();
 	} catch (e) {
 		logger.writeError(e);
@@ -218,7 +216,6 @@ async function getBuildOutputFilePath({ aab, appModuleName, buildDirectory, vari
 	p.log.error(`Failed to find the output file for ${outputFilePath}`);
 	process.exit(1);
 }
-
 //#endregion
 //#region src/buildAndroid.ts
 const buildAndroid = async ({ schemeConfig }) => {
@@ -231,7 +228,6 @@ const buildAndroid = async ({ schemeConfig }) => {
 		androidProjectPath
 	});
 };
-
 //#endregion
 //#region src/utils/device.ts
 /**
@@ -516,7 +512,6 @@ const Device = {
 	listDevices,
 	selectTargetDevice
 };
-
 //#endregion
 //#region src/runner/tryInstallAppOnDevice.ts
 const tryInstallAppOnDevice = async ({ device, apkPath }) => {
@@ -546,7 +541,6 @@ const tryInstallAppOnDevice = async ({ device, apkPath }) => {
 		throw new Error(typeof errorMessage === "string" ? errorMessage : "Installation failed");
 	}
 };
-
 //#endregion
 //#region src/runner/tryLaunchAppOnDevice.ts
 async function tryLaunchAppOnDevice({ device, port, mainActivity, applicationId, packageName }) {
@@ -584,7 +578,6 @@ async function tryLaunchAppOnDevice({ device, port, mainActivity, applicationId,
 		throw new Error(`Failed to launch the app on ${device.readableName}`);
 	}
 }
-
 //#endregion
 //#region src/runAndroid.ts
 const runAndroid = async ({ schemeConfig, runOption }) => {
@@ -632,7 +625,6 @@ const runAndroid = async ({ schemeConfig, runOption }) => {
 	p.outro("Success 🎉");
 	return result;
 };
-
 //#endregion
 //#region src/utils/enrichNativeBuildAndroidScheme.ts
 const enrichNativeBuildAndroidScheme = async ({ schemeConfig, hotUpdaterSchemeName }) => {
@@ -645,6 +637,5 @@ const enrichNativeBuildAndroidScheme = async ({ schemeConfig, hotUpdaterSchemeNa
 		hotUpdaterSchemeName
 	};
 };
-
 //#endregion
-export { buildAndroid, enrichNativeBuildAndroidScheme, runAndroid };
+export { buildAndroid, enrichNativeBuildAndroidScheme, runAndroid };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@hot-updater/android-helper",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "type": "module",
   "main": "dist/index.cjs",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.cts",
   "exports": {
     ".": {
-      "import": "./dist/index.js",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.cjs"
     },
     "./package.json": "./package.json"
@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "execa": "9.5.2",
-    "@hot-updater/plugin-core": "0.28.0",
-    "@hot-updater/core": "0.28.0",
-    "@hot-updater/cli-tools": "0.28.0"
+    "@hot-updater/cli-tools": "0.29.0",
+    "@hot-updater/plugin-core": "0.29.0",
+    "@hot-updater/core": "0.29.0"
   },
   "devDependencies": {
     "@types/node": "^20"