@shopify/shop-minis-cli 0.0.37 → 0.0.82

package/build/commands/create-mini/utils/template-app.js

@@ -1,44 +1,44 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateMiniFromTemplate = void 0;
-const path_1 = __importDefault(require("path"));
-const os_1 = __importDefault(require("os"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const replace_in_file_1 = require("replace-in-file");
-const lodash_1 = __importDefault(require("lodash"));
-async function replaceStringsInTemplate(dir, stringsToReplace) {
-    for (const [replaceKey, replaceValue] of Object.entries(stringsToReplace)) {
-        const replaceOptions = {
-            files: [`${dir}/**/*.*`],
-            from: new RegExp(replaceKey, 'g'),
-            to: replaceValue,
-            optionsForFiles: {
-                ignore: ['**/node_modules/**'],
-            },
-        };
-        await (0, replace_in_file_1.replaceInFile)(replaceOptions);
-    }
-}
-async function generateMiniFromTemplate(name, handle, templateName, outputDir = '.') {
-    const tmpDir = await fs_extra_1.default.mkdtemp(path_1.default.join(os_1.default.tmpdir(), `${handle}-`));
-    const miniTemplateDir = await path_1.default.join(__dirname, '../../../../templates', `__template_${templateName}`);
-    const miniDestinationDir = path_1.default.resolve(process.cwd(), outputDir, handle);
-    const CLIVersion = require('../../../../package.json').version; // eslint-disable-line @typescript-eslint/no-var-requires
+import url from 'node:url';
+import { mkdtemp } from 'node:fs/promises';
+import path from 'path';
+import os from 'os';
+import { copy, move } from 'fs-extra';
+import _ from 'lodash';
+import { CLI_VERSION } from '../../config.js';
+import { replaceStringsInTemplate } from '../../../utils/replace-strings-in-template.js';
+import { execAsync } from '../../../utils/exec-async-child-process.js';
+import { getPackageLatestVersionCommand } from '../../../utils/package-manager.js';
+const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
+export async function generateMiniFromTemplate(name, templateName, outputDir = '.', miniDir) {
+    const tmpDir = await mkdtemp(path.join(os.tmpdir(), `${miniDir}-`));
+    const miniTemplateDir = await path.join(__dirname, '../../../../templates', `__template_${templateName}`);
+    const miniDestinationDir = path.resolve(process.cwd(), outputDir, miniDir);
     const stringsToReplace = {
         __MINI_APP_NAME__: name,
-        __MINI_APP_HANDLE_PASCAL_CASE__: lodash_1.default.startCase(handle).replace(/ /g, ''),
-        __MINI_APP_HANDLE_KEBAB_CASE__: handle,
-        __SHOP_MINIS_CLI_VERSION__: CLIVersion,
+        __MINI_APP_NAME_PASCAL_CASE__: _.startCase(miniDir).replace(/ /g, ''),
+        __MINI_APP_NAME_KEBAB_CASE__: _.kebabCase(name),
+        __SHOP_MINIS_CLI_VERSION__: CLI_VERSION,
+        __SHOP_MINIS_RUNTIME_VERSION__: await fetchLatestMinisRuntimeVersion(),
     };
-    const commonTemplateFilesDir = await path_1.default.join(__dirname, '../../../../templates', '__template_common');
-    await fs_extra_1.default.copy(commonTemplateFilesDir, tmpDir);
-    await fs_extra_1.default.copy(miniTemplateDir, tmpDir);
-    await fs_extra_1.default.move(path_1.default.join(tmpDir, 'gitignore'), path_1.default.join(tmpDir, '.gitignore'));
+    const commonTemplateFilesDir = await path.join(__dirname, '../../../../templates', '__template_common');
+    await copy(commonTemplateFilesDir, tmpDir);
+    await copy(miniTemplateDir, tmpDir);
+    await move(path.join(tmpDir, 'gitignore'), path.join(tmpDir, '.gitignore'));
     await replaceStringsInTemplate(tmpDir, stringsToReplace);
-    await fs_extra_1.default.copy(tmpDir, miniDestinationDir);
+    await copy(tmpDir, miniDestinationDir);
+}
+async function fetchLatestMinisRuntimeVersion() {
+    try {
+        const getLatestVersionCommand = await getPackageLatestVersionCommand('@shopify/shop-minis-runtime');
+        const { stdout: latestMinisRuntimeVersionStdout } = await execAsync({
+            cmd: getLatestVersionCommand,
+        });
+        return latestMinisRuntimeVersionStdout[0];
+    }
+    catch {
+        // this fallback shouldn't be needed but we should make our best to make sure the mini creation doesn't fail
+        // this was the latest version at the time of writing this function
+        return '0.0.13';
+    }
 }
-exports.generateMiniFromTemplate = generateMiniFromTemplate;
 //# sourceMappingURL=template-app.js.map

package/build/commands/create-mini/utils/template-app.js.map

@@ -1 +1 @@
-{"version":3,"file":"template-app.js","sourceRoot":"","sources":["../../../../src/commands/create-mini/utils/template-app.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AACvB,4CAAmB;AAEnB,wDAAyB;AACzB,qDAA6C;AAC7C,oDAAsB;AAEtB,KAAK,UAAU,wBAAwB,CACrC,GAAW,EACX,gBAAwC;IAExC,KAAK,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;QACzE,MAAM,cAAc,GAAG;YACrB,KAAK,EAAE,CAAC,GAAG,GAAG,SAAS,CAAC;YACxB,IAAI,EAAE,IAAI,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC;YACjC,EAAE,EAAE,YAAY;YAChB,eAAe,EAAE;gBACf,MAAM,EAAE,CAAC,oBAAoB,CAAC;aAC/B;SACF,CAAA;QAED,MAAM,IAAA,+BAAa,EAAC,cAAc,CAAC,CAAA;KACpC;AACH,CAAC;AAEM,KAAK,UAAU,wBAAwB,CAC5C,IAAY,EACZ,MAAc,EACd,YAAoB,EACpB,SAAS,GAAG,GAAG;IAEf,MAAM,MAAM,GAAG,MAAM,kBAAE,CAAC,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,MAAM,EAAE,EAAE,GAAG,MAAM,GAAG,CAAC,CAAC,CAAA;IACrE,MAAM,eAAe,GAAG,MAAM,cAAI,CAAC,IAAI,CACrC,SAAS,EACT,uBAAuB,EACvB,cAAc,YAAY,EAAE,CAC7B,CAAA;IACD,MAAM,kBAAkB,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;IAEzE,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC,OAAO,CAAA,CAAC,yDAAyD;IACxH,MAAM,gBAAgB,GAAG;QACvB,iBAAiB,EAAE,IAAI;QACvB,+BAA+B,EAAE,gBAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;QACtE,8BAA8B,EAAE,MAAM;QACtC,0BAA0B,EAAE,UAAU;KACvC,CAAA;IAED,MAAM,sBAAsB,GAAG,MAAM,cAAI,CAAC,IAAI,CAC5C,SAAS,EACT,uBAAuB,EACvB,mBAAmB,CACpB,CAAA;IAED,MAAM,kBAAE,CAAC,IAAI,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAA;IAC7C,MAAM,kBAAE,CAAC,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;IACtC,MAAM,kBAAE,CAAC,IAAI,CAAC,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAA;IAC9E,MAAM,wBAAwB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;IACxD,MAAM,kBAAE,CAAC,IAAI,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAA;AAC3C,CAAC;AAjCD,4DAiCC"}
+{"version":3,"file":"template-app.js","sourceRoot":"","sources":["../../../../src/commands/create-mini/utils/template-app.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,UAAU,CAAA;AAC1B,OAAO,EAAC,OAAO,EAAC,MAAM,kBAAkB,CAAA;AACxC,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,OAAO,EAAC,IAAI,EAAE,IAAI,EAAC,MAAM,UAAU,CAAA;AACnC,OAAO,CAAC,MAAM,QAAQ,CAAA;AAEtB,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAC,wBAAwB,EAAC,MAAM,+CAA+C,CAAA;AACtF,OAAO,EAAC,SAAS,EAAC,MAAM,4CAA4C,CAAA;AACpE,OAAO,EAAC,8BAA8B,EAAC,MAAM,mCAAmC,CAAA;AAEhF,MAAM,SAAS,GAAG,GAAG,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;AAElE,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,IAAY,EACZ,YAAoB,EACpB,SAAS,GAAG,GAAG,EACf,OAAe;IAEf,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,GAAG,OAAO,GAAG,CAAC,CAAC,CAAA;IACnE,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,IAAI,CACrC,SAAS,EACT,uBAAuB,EACvB,cAAc,YAAY,EAAE,CAC7B,CAAA;IACD,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;IAE1E,MAAM,gBAAgB,GAAG;QACvB,iBAAiB,EAAE,IAAI;QACvB,6BAA6B,EAAE,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;QACrE,4BAA4B,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC;QAC/C,0BAA0B,EAAE,WAAW;QACvC,8BAA8B,EAAE,MAAM,8BAA8B,EAAE;KACvE,CAAA;IAED,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,IAAI,CAC5C,SAAS,EACT,uBAAuB,EACvB,mBAAmB,CACpB,CAAA;IAED,MAAM,IAAI,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAA;IAC1C,MAAM,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;IACnC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAA;IAC3E,MAAM,wBAAwB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;IACxD,MAAM,IAAI,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAA;AACxC,CAAC;AAED,KAAK,UAAU,8BAA8B;IAC3C,IAAI;QACF,MAAM,uBAAuB,GAAG,MAAM,8BAA8B,CAClE,6BAA6B,CAC9B,CAAA;QAED,MAAM,EAAC,MAAM,EAAE,+BAA+B,EAAC,GAAG,MAAM,SAAS,CAAC;YAChE,GAAG,EAAE,uBAAuB;SAC7B,CAAC,CAAA;QACF,OAAO,+BAA+B,CAAC,CAAC,CAAC,CAAA;KAC1C;IAAC,MAAM;QACN,4GAA4G;QAC5G,mEAAmE;QACnE,OAAO,QAAQ,CAAA;KAChB;AACH,CAAC"}

package/build/commands/dev/index.d.ts

@@ -1,6 +1,9 @@
 import { Command } from 'commander';
+import { BuildType } from './utils/types.js';
 export interface DevCommandOptions {
     resetCache?: boolean;
     host?: string;
+    buildType: BuildType;
+    snapshotVersion?: string;
 }
 export declare function loadCommand(parentProgram: Command): Promise<void>;

package/build/commands/dev/index.js

@@ -1,31 +1,60 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadCommand = void 0;
-const commander_1 = require("commander");
-const chalk_1 = __importDefault(require("chalk"));
-const internal_ip_1 = require("internal-ip");
-const interactive_terminal_1 = require("./utils/interactive-terminal");
-const metro_server_1 = require("./utils/metro/metro-server");
-const minis_manifest_1 = require("./utils/minis-manifest");
-async function loadCommand(parentProgram) {
-    const ip = await (0, internal_ip_1.v4)();
-    const command = new commander_1.Command()
+import { Command, Option } from 'commander';
+import chalk from 'chalk';
+import internalIp from 'internal-ip';
+import { outputDebug } from '@shopify/cli-kit/node/output';
+import { handler as handleError } from '@shopify/cli-kit/node/error';
+import { getMiniManifest } from '../../utils/minis-manifest.js';
+import { maybeApplyPatches } from '../../utils/patch-package.js';
+import { getInvalidDependencies } from '../doctor/utils/diagnose-dependencies.js';
+import { getRunBinCommand } from '../../utils/package-manager.js';
+import { InteractiveTerminal } from './utils/interactive-terminal.js';
+import { runMetro } from './utils/metro/metro-server.js';
+import { BuildType } from './utils/types.js';
+export async function loadCommand(parentProgram) {
+    const ip = await internalIp.v4();
+    const command = new Command()
         .name('dev')
-        .version('2.0.0')
         .description('Start a local dev server for the mini app')
         .option('--reset-cache', 'reset the dev server cache')
         .option('--host <host>', "packager's host", ip)
+        .option('--verbose', 'print debugging messages') // compatible with cli-kit
+        .addOption(new Option('--build-type <buildType>', 'build type')
+        .choices(Object.values(BuildType))
+        .default(BuildType.Release))
+        .addOption(new Option('--snapshot-version <version>', 'specify the snapshot version to use. (example: 2.100.0+544)').implies({ buildType: 'snapshot' }))
         .action(async (options) => {
-        await (0, metro_server_1.runMetro)(options);
-        const miniHandle = (0, minis_manifest_1.getMiniManifest)().handle;
-        console.log('Local development environment for', chalk_1.default.green(miniHandle), 'is running...');
-        const interactiveTerminal = new interactive_terminal_1.InteractiveTerminal(options);
-        interactiveTerminal.start();
+        try {
+            const miniName = getMiniManifest().name;
+            outputDebug(`Dev command args ${JSON.stringify(options)}`);
+            outputDebug(`Running mini "${miniName}" at ${process.cwd()}`);
+            validateOptions(options);
+            await validateDependencies();
+            maybeApplyPatches(); // we need to patch react-native pressability system to avoid duplicated react tags
+            await runMetro(options);
+            console.log('Local development environment for', chalk.green(miniName), 'is running...');
+            const interactiveTerminal = new InteractiveTerminal(options);
+            interactiveTerminal.start();
+        }
+        catch (err) {
+            delete err.stack; // delete the stack to avoid a verbose error in case the manifest file does not exist
+            await handleError(err);
+        }
     });
     parentProgram.addCommand(command);
 }
-exports.loadCommand = loadCommand;
+function validateOptions({ snapshotVersion, buildType }) {
+    if (snapshotVersion && buildType !== 'snapshot') {
+        console.warn('\n--snapshot-version was specified but --build-type is not `snapshot`. --snapshot-version will be ignored.');
+    }
+    else if (buildType === 'snapshot' && !snapshotVersion) {
+        console.warn('\n--build-type was set to `snapshot` but --snapshot-version was not specified. Fetching the latest available snapshot');
+    }
+}
+async function validateDependencies() {
+    const { areDependenciesInvalid } = getInvalidDependencies();
+    if (areDependenciesInvalid) {
+        console.warn(chalk.yellow(`\n⚠️  There are some issues with the dependencies of your mini. Run ${chalk.bold(await getRunBinCommand('shop-minis doctor'))} for more details and instructions on how to fix them.`));
+        console.warn(chalk.yellow('⚠️  Problems with the dependencies of your mini could be a cause of rejection during the submission process\n'));
+    }
+}
 //# sourceMappingURL=index.js.map

package/build/commands/dev/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/dev/index.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAiC;AACjC,kDAAyB;AACzB,6CAAsC;AAEtC,uEAAgE;AAChE,6DAAmD;AACnD,2DAAsD;AAO/C,KAAK,UAAU,WAAW,CAAC,aAAsB;IACtD,MAAM,EAAE,GAAG,MAAM,IAAA,gBAAI,GAAE,CAAA;IAEvB,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE;SAC1B,IAAI,CAAC,KAAK,CAAC;SACX,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,2CAA2C,CAAC;SACxD,MAAM,CAAC,eAAe,EAAE,4BAA4B,CAAC;SACrD,MAAM,CAAC,eAAe,EAAE,iBAAiB,EAAE,EAAE,CAAC;SAC9C,MAAM,CAAC,KAAK,EAAE,OAA0B,EAAE,EAAE;QAC3C,MAAM,IAAA,uBAAQ,EAAC,OAAO,CAAC,CAAA;QAEvB,MAAM,UAAU,GAAG,IAAA,gCAAe,GAAE,CAAC,MAAM,CAAA;QAC3C,OAAO,CAAC,GAAG,CACT,mCAAmC,EACnC,eAAK,CAAC,KAAK,CAAC,UAAU,CAAC,EACvB,eAAe,CAChB,CAAA;QAED,MAAM,mBAAmB,GAAG,IAAI,0CAAmB,CAAC,OAAO,CAAC,CAAA;QAC5D,mBAAmB,CAAC,KAAK,EAAE,CAAA;IAC7B,CAAC,CAAC,CAAA;IAEJ,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;AACnC,CAAC;AAxBD,kCAwBC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/dev/index.ts"],"names":[],"mappings":"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"}

package/build/commands/dev/utils/android.d.ts

@@ -7,10 +7,12 @@ export interface androidDevice {
 }
 export declare function getDevices(): Promise<androidDevice[]>;
 export declare function getEmulators(): Promise<androidDevice[]>;
-export declare function androidHomeExists(): boolean;
 export declare function promptForAndroidDevices(): Promise<androidDevice | null>;
 export declare function maybeLaunchEmulator(emulatorName: string): Promise<string | null>;
-export declare function installShopInEmulator(emulatorId: string, version: string): Promise<void>;
-export declare function getInstalledShopVersion(emulatorId: string): Promise<string | null | undefined>;
+export declare function installShopInEmulator(emulatorId: string, fileName: string): Promise<void>;
+export declare function getInstalledShopVersion(emulatorId: string): Promise<{
+    version: string;
+    build: string;
+} | null>;
 export declare function connectDevelopmentServer(emulatorId: string): Promise<void>;
-export declare function deeplinkToEmulator(emulatorId: string, deeplink: string): Promise<void>;
+export declare function deeplinkToEmulator(emulatorId: string, originalDeeplink: string): Promise<void>;

package/build/commands/dev/utils/android.js

@@ -1,35 +1,13 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deeplinkToEmulator = exports.connectDevelopmentServer = exports.getInstalledShopVersion = exports.installShopInEmulator = exports.maybeLaunchEmulator = exports.promptForAndroidDevices = exports.androidHomeExists = exports.getEmulators = exports.getDevices = void 0;
-const child_process_1 = __importDefault(require("child_process"));
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const lodash_1 = __importDefault(require("lodash"));
-const prompts_1 = __importDefault(require("prompts"));
-const exec_async_child_process_1 = require("../../utils/exec-async-child-process");
-const with_retries_1 = require("./with-retries");
-const binaries_1 = require("./binaries");
-const DEFAULT_ANDROID_HOME_MACOS = `${process.env.HOME}/Library/Android/sdk`;
-function whichAndroidHome() {
-    if (process.env.ANDROID_HOME) {
-        return process.env.ANDROID_HOME;
-    }
-    if (fs_1.default.existsSync(DEFAULT_ANDROID_HOME_MACOS)) {
-        return DEFAULT_ANDROID_HOME_MACOS;
-    }
-    return null;
-}
-function whichEmulator() {
-    return `${whichAndroidHome()}/emulator/emulator`;
-}
-function whichAdb() {
-    return `${whichAndroidHome()}/platform-tools/adb`;
-}
-async function getDevices() {
-    const { stdout: devicesList } = await (0, exec_async_child_process_1.execAsync)(`${whichAdb()} devices -l`);
+import child_process from 'child_process';
+import path from 'path';
+import _ from 'lodash';
+import prompts from 'prompts';
+import { outputDebug } from '@shopify/cli-kit/node/output';
+import { execAsync } from '../../../utils/exec-async-child-process.js';
+import { PATHS, whichAdb, whichEmulator } from '../../config.js';
+import { withRetries } from './with-retries.js';
+export async function getDevices() {
+    const { stdout: devicesList } = await execAsync(`${whichAdb()} devices -l`);
     return devicesList
         .slice(1)
         .filter(name => !name.includes('emulator'))
@@ -41,9 +19,8 @@ async function getDevices() {
         isAuthorized: true,
     }));
 }
-exports.getDevices = getDevices;
-async function getEmulators() {
-    const { stdout: devicesList } = await (0, exec_async_child_process_1.execAsync)(`${whichEmulator()} -list-avds`);
+export async function getEmulators() {
+    const { stdout: devicesList } = await execAsync(`${whichEmulator()} -list-avds`);
     return devicesList.map(name => ({
         name,
         description: `${name} (emulator)`,
@@ -52,19 +29,14 @@ async function getEmulators() {
         isAuthorized: true,
     }));
 }
-exports.getEmulators = getEmulators;
-function androidHomeExists() {
-    return Boolean(whichAndroidHome());
-}
-exports.androidHomeExists = androidHomeExists;
-async function promptForAndroidDevices() {
+export async function promptForAndroidDevices() {
     const devices = await getDevices();
     const emulators = await getEmulators();
     const androidDevices = devices.concat(emulators);
     if (!androidDevices.length) {
         return null;
     }
-    const { value } = await (0, prompts_1.default)({
+    const { value } = await prompts({
         type: 'autocomplete',
         name: 'value',
         limit: 11,
@@ -82,8 +54,7 @@ async function promptForAndroidDevices() {
     });
     return value;
 }
-exports.promptForAndroidDevices = promptForAndroidDevices;
-async function maybeLaunchEmulator(emulatorName) {
+export async function maybeLaunchEmulator(emulatorName) {
     let emulatorId = await getIdForEmulatorWithName(emulatorName); // if emulatorId is defined the emulator is already running
     if (!emulatorId) {
         emulatorId = await doLaunchEmulator(emulatorName);
@@ -93,38 +64,55 @@ async function maybeLaunchEmulator(emulatorName) {
     }
     return emulatorId;
 }
-exports.maybeLaunchEmulator = maybeLaunchEmulator;
-async function installShopInEmulator(emulatorId, version) {
-    const fileName = (0, binaries_1.versionToBinaryFileName)(version, 'android');
-    const binaryPath = path_1.default.join(binaries_1.BINARIES_PATH, fileName);
-    await (0, exec_async_child_process_1.execAsync)(`${whichAdb()} -s ${emulatorId} install -r "${binaryPath}"`);
+export async function installShopInEmulator(emulatorId, fileName) {
+    outputDebug(`Install Shop in Android emulator ${JSON.stringify({ emulatorId, fileName })}`);
+    const binaryPath = path.join(PATHS.CACHE_DIR, fileName);
+    await execAsync(`${whichAdb()} -s ${emulatorId} install -r -d "${binaryPath}"`);
 }
-exports.installShopInEmulator = installShopInEmulator;
-async function getInstalledShopVersion(emulatorId) {
+export async function getInstalledShopVersion(emulatorId) {
     try {
-        const { stdout } = await (0, exec_async_child_process_1.execAsync)(`${whichAdb()} -s ${emulatorId} shell dumpsys package com.shopify.arrive.internal | grep versionName`);
-        // stdout: ["versionName=2.86.0"]
-        return lodash_1.default.last(stdout?.[0]?.split('='));
+        const versionName = await execAsync(`${whichAdb()} -s ${emulatorId} shell dumpsys package com.shopify.arrive.internal | grep versionName`);
+        const versionCode = await execAsync(`${whichAdb()} -s ${emulatorId} shell dumpsys package com.shopify.arrive.internal | grep versionCode`);
+        // stdout: ["     versionName=2.86.0"]
+        const version = _.last(versionName.stdout[0]?.trim().split('='));
+        // stdout: ["     versionCode=1680515537 minSdk=21 targetSdk=33"]
+        const build = _.last(versionCode.stdout[0]?.trim().split(' ')[0]?.split('='));
+        if (version == null || build == null) {
+            return null;
+        }
+        return {
+            version,
+            build,
+        };
     }
     catch {
         return null;
     }
 }
-exports.getInstalledShopVersion = getInstalledShopVersion;
-async function connectDevelopmentServer(emulatorId) {
-    await (0, exec_async_child_process_1.execAsync)(`${whichAdb()} -s ${emulatorId} reverse tcp:8082 tcp:8082`);
-}
-exports.connectDevelopmentServer = connectDevelopmentServer;
-async function deeplinkToEmulator(emulatorId, deeplink) {
-    await (0, exec_async_child_process_1.execAsync)(`${whichAdb()} -s ${emulatorId} shell am start -a android.intent.action.VIEW -d ${deeplink}`);
+export async function connectDevelopmentServer(emulatorId) {
+    await execAsync(`${whichAdb()} -s ${emulatorId} reverse tcp:8082 tcp:8082`);
+}
+export async function deeplinkToEmulator(emulatorId, originalDeeplink) {
+    let deeplink = originalDeeplink;
+    // If we have a querystring we need to modify it to escape ampersands
+    // https://stackoverflow.com/a/45323695
+    const queryIndex = deeplink.indexOf('?');
+    if (queryIndex !== -1) {
+        const urlObj = new URL(deeplink);
+        const preQueryString = deeplink.substring(0, queryIndex);
+        const queryString = Array.from(urlObj.searchParams.entries())
+            .map(([key, value]) => `${key}=${value}`)
+            .join('\\&');
+        deeplink = `${preQueryString}?${queryString}`;
+    }
+    await execAsync(`${whichAdb()} -s ${emulatorId} shell am start -a android.intent.action.VIEW -d "${deeplink}"`);
 }
-exports.deeplinkToEmulator = deeplinkToEmulator;
 async function getNameForEmulatorWithId(emulatorId) {
-    const { stdout } = await (0, exec_async_child_process_1.execAsync)(`${whichAdb()} -s ${emulatorId} emu avd name`);
+    const { stdout } = await execAsync(`${whichAdb()} -s ${emulatorId} emu avd name`);
     return stdout[0];
 }
 async function getIdForEmulatorWithName(emulatorName) {
-    const { stdout } = await (0, exec_async_child_process_1.execAsync)(`${whichAdb()} devices`);
+    const { stdout } = await execAsync(`${whichAdb()} devices`);
     const emulatorIds = stdout.filter(result => result.startsWith('emulator-'));
     for (const emulatorId of emulatorIds) {
         const name = await getNameForEmulatorWithId(emulatorId);
@@ -136,16 +124,16 @@ async function getIdForEmulatorWithName(emulatorName) {
 }
 async function waitForEmulatorToBoot(emulatorId, timeout = 60 * 2 * 1000 // 2 minutes
 ) {
-    await (0, exec_async_child_process_1.execAsync)(`${whichAdb()} -s ${emulatorId} wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do sleep 1; done;'`, { timeout });
+    await execAsync(`${whichAdb()} -s ${emulatorId} wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do sleep 1; done;'`, { timeout });
 }
 function doLaunchEmulator(emulatorName) {
-    const emulatorProcess = child_process_1.default.spawn(whichEmulator(), [`@${emulatorName}`], {
+    const emulatorProcess = child_process.spawn(whichEmulator(), [`@${emulatorName}`], {
         stdio: 'ignore',
         detached: true,
     });
     emulatorProcess.unref();
     return new Promise((resolve, reject) => {
-        (0, with_retries_1.withRetries)(() => getIdForEmulatorWithName(emulatorName))
+        withRetries(() => getIdForEmulatorWithName(emulatorName))
             .then(resolve)
             .catch(reject)
             .finally(() => {

package/build/commands/dev/utils/android.js.map

@@ -1 +1 @@
-{"version":3,"file":"android.js","sourceRoot":"","sources":["../../../../src/commands/dev/utils/android.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"android.js","sourceRoot":"","sources":["../../../../src/commands/dev/utils/android.ts"],"names":[],"mappings":"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"}

package/build/commands/dev/utils/binaries.d.ts

@@ -1,83 +1,5 @@
-export declare const BINARIES_PATH: string;
-type Platform = 'ios' | 'android';
-/**
- * Returns the file extension used for each platform.
- * android: .apk
- * ios: .zip (we intentionally compress .app files before uploading them to the cloud storage)
- */
-export declare function getBinaryFileExtensionForPlatform(platform: Platform): ".zip" | ".apk";
-/**
- * @example
- * platform android
- * version 2.76.0
- * returns "2-76-0.apk"
- *
- * platform ios
- * version 2.55.0+4
- * returns "2-55-0+4.zip"
- */
-export declare function versionToBinaryFileName(version: string, platform: Platform): string;
-/**
- * @example
- * binaryFileName "2-76-0.apk"
- * returns "2.76.0"
- *
- * binaryFileName "2-16-0+3.zip"
- * returns "2.16.0+3"
- */
-export declare function binaryFileNameToVersion(binaryFileName: string): string;
-/**
- * @example
- * filenames ["2-76-0+3.apk", "2-76-0+3.zip", "2-77-0.apk", "2-77-0.zip", "2-77-0+1.apk", "2-77-0+1.zip"]
- * returns "2.77.0+1"
- */
-export declare function getLatestVersionFromFilesList(filenames: string[]): string | null;
+import { BinaryMetadata } from './types.js';
 /**
  * Returns a boolean indicating if the binary for the given version and platform is already downloaded in the system
  */
-export declare function isVersionAvailableLocally(platform: Platform, version: string): Promise<boolean>;
-/**
- * Gets the biggest version in the downloads folder for the given platform.
- */
-export declare function getLatestDownloadedVersion(platform: Platform): Promise<string | null>;
-/**
- * Returns the latest version that's present in the remote storage of binaries
- * TODO: this won't handle a bucket that has more than 50 files.
- */
-export declare function getLatestRemoteVersion(platform: Platform): Promise<string>;
-/**
- * Downloads a binary from the remote storage
- * @returns Promise that resolves to the downloaded version
- */
-export declare function downloadBinary(platform: Platform, { onProgress, version, }?: {
-    /**
-     * Download progress callback
-     */
-    onProgress?: (progress: number) => void;
-    /**
-     * Version to download. Defaults to latest version available
-     */
-    version?: string;
-}): Promise<string>;
-/**
- * Compares the current version against the latest available version.
- *
- * Does nothing if the current version is already the latest.
- * Otherwise prompts the user to download the new version.
- */
-export declare function maybePromptBinaryUpgrade(platform: Platform, { currentVersion, onProgress, onDownloadStart, }?: {
-    /**
-     * The version that's currently being used.
-     * Defaults to the bigger version in the downloads folder.
-     */
-    currentVersion?: string;
-    /**
-     * Download progress callback
-     */
-    onProgress?: (progress: number) => void;
-    /**
-     * Callback executed if the user agrees to update, before starting the download.
-     */
-    onDownloadStart?: (version: string) => void;
-}): Promise<string | null>;
-export {};
+export declare function isVersionAvailableLocally(version: BinaryMetadata): Promise<boolean>;