@expo/cli 57.0.5 → 57.0.6

package/build/bin/cli

@@ -139,7 +139,7 @@ const args = (0, _arg().default)({
 });
 if (args['--version']) {
     // Version is added in the build script.
-    console.log("57.0.5");
+    console.log("57.0.6");
     process.exit(0);
 }
 if (args['--non-interactive']) {

package/build/src/events/index.js

@@ -76,7 +76,7 @@ function getInitMetadata() {
     return {
         format: 'v0-jsonl',
         // Version is added in the build script.
-        version: "57.0.5" ?? 'UNVERSIONED'
+        version: "57.0.6" ?? 'UNVERSIONED'
     };
 }
 function getWellKnownTemporaryLogFile(projectRoot, command) {

package/build/src/run/android/resolveInstallApkName.js

@@ -29,6 +29,52 @@ function _interop_require_default(obj) {
     };
 }
 const debug = require('debug')('expo:run:android:resolveInstallApkName');
+function resolveApkFromOutputMetadata(apkVariantDirectory, availableCPUs) {
+    const metadataPath = _path().default.join(apkVariantDirectory, 'output-metadata.json');
+    let metadata;
+    try {
+        metadata = JSON.parse(_fs().default.readFileSync(metadataPath, 'utf8'));
+    } catch (error) {
+        debug('Failed to parse output-metadata.json', error);
+        return null;
+    }
+    const { elements } = metadata;
+    if (!(elements == null ? void 0 : elements.length)) {
+        return null;
+    }
+    // ABI split: match by device ABI. Exclude DeviceABI.universal — AGP never uses it as an ABI filter.
+    const isAbiSplit = elements.some((e)=>{
+        var _e_filters;
+        return e == null ? void 0 : (_e_filters = e.filters) == null ? void 0 : _e_filters.some((f)=>(f == null ? void 0 : f.filterType) === 'ABI');
+    });
+    if (isAbiSplit) {
+        for (const cpu of availableCPUs){
+            if (cpu === _adb.DeviceABI.universal) {
+                continue;
+            }
+            const match = elements.find((e)=>{
+                var _e_filters;
+                return e == null ? void 0 : (_e_filters = e.filters) == null ? void 0 : _e_filters.some((f)=>f.filterType === 'ABI' && f.value === cpu);
+            });
+            const outputFile = match == null ? void 0 : match.outputFile;
+            if (typeof outputFile === 'string' && _fs().default.existsSync(_path().default.join(apkVariantDirectory, outputFile))) {
+                debug('Resolved ABI-split APK from output-metadata.json:', outputFile);
+                return outputFile;
+            }
+        }
+        return null;
+    }
+    if (elements.length === 1) {
+        var _elements_;
+        const outputFile = (_elements_ = elements[0]) == null ? void 0 : _elements_.outputFile;
+        if (typeof outputFile === 'string' && _fs().default.existsSync(_path().default.join(apkVariantDirectory, outputFile))) {
+            debug('Resolved APK from output-metadata.json:', outputFile);
+            return outputFile;
+        }
+    }
+    // Density/language splits produce multiple elements without ABI filters
+    return null;
+}
 async function resolveInstallApkNameAsync(device, { appName, buildType, flavors, apkVariantDirectory }) {
     const availableCPUs = await (0, _adb.getDeviceABIsAsync)(device);
     availableCPUs.push(_adb.DeviceABI.universal);
@@ -50,7 +96,8 @@ async function resolveInstallApkNameAsync(device, { appName, buildType, flavors,
     if (_fs().default.existsSync(apkPath)) {
         return apkName;
     }
-    return null;
+    // Last resort: read AGP's output-metadata.json to handle custom outputFileName overrides.
+    return resolveApkFromOutputMetadata(apkVariantDirectory, availableCPUs);
 }
 function getApkFileName(appName, buildType, flavors, cpuArch) {
     let apkName = `${appName}-`;

package/build/src/run/android/resolveInstallApkName.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/run/android/resolveInstallApkName.ts"],"sourcesContent":["import fs from 'fs';\nimport path from 'path';\n\nimport type { GradleProps } from './resolveGradlePropsAsync';\nimport type { Device } from '../../start/platforms/android/adb';\nimport { DeviceABI, getDeviceABIsAsync } from '../../start/platforms/android/adb';\n\nconst debug = require('debug')('expo:run:android:resolveInstallApkName') as typeof console.log;\n\nexport async function resolveInstallApkNameAsync(\n  device: Pick<Device, 'name' | 'pid'>,\n  { appName, buildType, flavors, apkVariantDirectory }: GradleProps\n) {\n  const availableCPUs = await getDeviceABIsAsync(device);\n  availableCPUs.push(DeviceABI.universal);\n\n  debug('Supported ABIs: ' + availableCPUs.join(', '));\n  debug('Searching for APK: ' + apkVariantDirectory);\n\n  // Check for cpu specific builds first\n  for (const availableCPU of availableCPUs) {\n    const apkName = getApkFileName(appName, buildType, flavors, availableCPU);\n    const apkPath = path.join(apkVariantDirectory, apkName);\n    debug('Checking for APK at:', apkPath);\n    if (fs.existsSync(apkPath)) {\n      return apkName;\n    }\n  }\n\n  // Otherwise use the default apk named after the variant: app-debug.apk\n  const apkName = getApkFileName(appName, buildType, flavors);\n  const apkPath = path.join(apkVariantDirectory, apkName);\n  debug('Checking for fallback APK at:', apkPath);\n  if (fs.existsSync(apkPath)) {\n    return apkName;\n  }\n\n  return null;\n}\n\nfunction getApkFileName(\n  appName: string,\n  buildType: string,\n  flavors?: string[] | null,\n  cpuArch?: string | null\n) {\n  let apkName = `${appName}-`;\n  if (flavors) {\n    apkName += flavors.reduce((rest, flavor) => `${rest}${flavor}-`, '');\n  }\n  if (cpuArch) {\n    apkName += `${cpuArch}-`;\n  }\n  apkName += `${buildType}.apk`;\n\n  return apkName;\n}\n"],"names":["resolveInstallApkNameAsync","debug","require","device","appName","buildType","flavors","apkVariantDirectory","availableCPUs","getDeviceABIsAsync","push","DeviceABI","universal","join","availableCPU","apkName","getApkFileName","apkPath","path","fs","existsSync","cpuArch","reduce","rest","flavor"],"mappings":";;;;+BASsBA;;;eAAAA;;;;gEATP;;;;;;;gEACE;;;;;;qBAI6B;;;;;;AAE9C,MAAMC,QAAQC,QAAQ,SAAS;AAExB,eAAeF,2BACpBG,MAAoC,EACpC,EAAEC,OAAO,EAAEC,SAAS,EAAEC,OAAO,EAAEC,mBAAmB,EAAe;IAEjE,MAAMC,gBAAgB,MAAMC,IAAAA,uBAAkB,EAACN;IAC/CK,cAAcE,IAAI,CAACC,cAAS,CAACC,SAAS;IAEtCX,MAAM,qBAAqBO,cAAcK,IAAI,CAAC;IAC9CZ,MAAM,wBAAwBM;IAE9B,sCAAsC;IACtC,KAAK,MAAMO,gBAAgBN,cAAe;QACxC,MAAMO,UAAUC,eAAeZ,SAASC,WAAWC,SAASQ;QAC5D,MAAMG,UAAUC,eAAI,CAACL,IAAI,CAACN,qBAAqBQ;QAC/Cd,MAAM,wBAAwBgB;QAC9B,IAAIE,aAAE,CAACC,UAAU,CAACH,UAAU;YAC1B,OAAOF;QACT;IACF;IAEA,uEAAuE;IACvE,MAAMA,UAAUC,eAAeZ,SAASC,WAAWC;IACnD,MAAMW,UAAUC,eAAI,CAACL,IAAI,CAACN,qBAAqBQ;IAC/Cd,MAAM,iCAAiCgB;IACvC,IAAIE,aAAE,CAACC,UAAU,CAACH,UAAU;QAC1B,OAAOF;IACT;IAEA,OAAO;AACT;AAEA,SAASC,eACPZ,OAAe,EACfC,SAAiB,EACjBC,OAAyB,EACzBe,OAAuB;IAEvB,IAAIN,UAAU,GAAGX,QAAQ,CAAC,CAAC;IAC3B,IAAIE,SAAS;QACXS,WAAWT,QAAQgB,MAAM,CAAC,CAACC,MAAMC,SAAW,GAAGD,OAAOC,OAAO,CAAC,CAAC,EAAE;IACnE;IACA,IAAIH,SAAS;QACXN,WAAW,GAAGM,QAAQ,CAAC,CAAC;IAC1B;IACAN,WAAW,GAAGV,UAAU,IAAI,CAAC;IAE7B,OAAOU;AACT"}
+{"version":3,"sources":["../../../../src/run/android/resolveInstallApkName.ts"],"sourcesContent":["import fs from 'fs';\nimport path from 'path';\n\nimport type { GradleProps } from './resolveGradlePropsAsync';\nimport type { Device } from '../../start/platforms/android/adb';\nimport { DeviceABI, getDeviceABIsAsync } from '../../start/platforms/android/adb';\n\nconst debug = require('debug')('expo:run:android:resolveInstallApkName') as typeof console.log;\n\ntype OutputMetadataElement = {\n  filters?: { filterType: string; value: string }[];\n  outputFile: string;\n};\n\ntype OutputMetadata = {\n  elements: OutputMetadataElement[];\n};\n\nfunction resolveApkFromOutputMetadata(\n  apkVariantDirectory: string,\n  availableCPUs: DeviceABI[]\n): string | null {\n  const metadataPath = path.join(apkVariantDirectory, 'output-metadata.json');\n  let metadata: OutputMetadata;\n  try {\n    metadata = JSON.parse(fs.readFileSync(metadataPath, 'utf8'));\n  } catch (error) {\n    debug('Failed to parse output-metadata.json', error);\n    return null;\n  }\n\n  const { elements } = metadata;\n  if (!elements?.length) {\n    return null;\n  }\n\n  // ABI split: match by device ABI. Exclude DeviceABI.universal — AGP never uses it as an ABI filter.\n  const isAbiSplit = elements.some((e) => e?.filters?.some((f) => f?.filterType === 'ABI'));\n  if (isAbiSplit) {\n    for (const cpu of availableCPUs) {\n      if (cpu === DeviceABI.universal) {\n        continue;\n      }\n      const match = elements.find((e) =>\n        e?.filters?.some((f) => f.filterType === 'ABI' && f.value === cpu)\n      );\n      const outputFile = match?.outputFile;\n      if (typeof outputFile === 'string' && fs.existsSync(path.join(apkVariantDirectory, outputFile))) {\n        debug('Resolved ABI-split APK from output-metadata.json:', outputFile);\n        return outputFile;\n      }\n    }\n    return null;\n  }\n\n  if (elements.length === 1) {\n    const outputFile = elements[0]?.outputFile;\n    if (typeof outputFile === 'string' && fs.existsSync(path.join(apkVariantDirectory, outputFile))) {\n      debug('Resolved APK from output-metadata.json:', outputFile);\n      return outputFile;\n    }\n  }\n\n  // Density/language splits produce multiple elements without ABI filters\n  return null;\n}\n\nexport async function resolveInstallApkNameAsync(\n  device: Pick<Device, 'name' | 'pid'>,\n  { appName, buildType, flavors, apkVariantDirectory }: GradleProps\n) {\n  const availableCPUs = await getDeviceABIsAsync(device);\n  availableCPUs.push(DeviceABI.universal);\n\n  debug('Supported ABIs: ' + availableCPUs.join(', '));\n  debug('Searching for APK: ' + apkVariantDirectory);\n\n  // Check for cpu specific builds first\n  for (const availableCPU of availableCPUs) {\n    const apkName = getApkFileName(appName, buildType, flavors, availableCPU);\n    const apkPath = path.join(apkVariantDirectory, apkName);\n    debug('Checking for APK at:', apkPath);\n    if (fs.existsSync(apkPath)) {\n      return apkName;\n    }\n  }\n\n  // Otherwise use the default apk named after the variant: app-debug.apk\n  const apkName = getApkFileName(appName, buildType, flavors);\n  const apkPath = path.join(apkVariantDirectory, apkName);\n  debug('Checking for fallback APK at:', apkPath);\n  if (fs.existsSync(apkPath)) {\n    return apkName;\n  }\n\n  // Last resort: read AGP's output-metadata.json to handle custom outputFileName overrides.\n  return resolveApkFromOutputMetadata(apkVariantDirectory, availableCPUs);\n}\n\nfunction getApkFileName(\n  appName: string,\n  buildType: string,\n  flavors?: string[] | null,\n  cpuArch?: string | null\n) {\n  let apkName = `${appName}-`;\n  if (flavors) {\n    apkName += flavors.reduce((rest, flavor) => `${rest}${flavor}-`, '');\n  }\n  if (cpuArch) {\n    apkName += `${cpuArch}-`;\n  }\n  apkName += `${buildType}.apk`;\n\n  return apkName;\n}\n"],"names":["resolveInstallApkNameAsync","debug","require","resolveApkFromOutputMetadata","apkVariantDirectory","availableCPUs","metadataPath","path","join","metadata","JSON","parse","fs","readFileSync","error","elements","length","isAbiSplit","some","e","filters","f","filterType","cpu","DeviceABI","universal","match","find","value","outputFile","existsSync","device","appName","buildType","flavors","getDeviceABIsAsync","push","availableCPU","apkName","getApkFileName","apkPath","cpuArch","reduce","rest","flavor"],"mappings":"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"}

package/build/src/utils/telemetry/clients/FetchClient.js

@@ -26,7 +26,7 @@ class FetchClient {
         this.headers = {
             accept: 'application/json',
             'content-type': 'application/json',
-            'user-agent': `expo-cli/${"57.0.5"}`,
+            'user-agent': `expo-cli/${"57.0.6"}`,
             authorization: 'Basic ' + _nodebuffer().Buffer.from(`${target}:`).toString('base64')
         };
     }

package/build/src/utils/telemetry/utils/context.js

@@ -83,7 +83,7 @@ function createContext() {
         cpu: summarizeCpuInfo(),
         app: {
             name: 'expo/cli',
-            version: "57.0.5"
+            version: "57.0.6"
         },
         ci: _ciinfo().isCI ? {
             name: _ciinfo().name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/cli",
-  "version": "57.0.5",
+  "version": "57.0.6",
   "description": "The Expo CLI",
   "main": "main.js",
   "bin": {
@@ -38,7 +38,7 @@
   "homepage": "https://github.com/expo/expo/tree/main/packages/@expo/cli",
   "dependencies": {
     "@expo/code-signing-certificates": "^0.0.6",
-    "@expo/config": "~57.0.2",
+    "@expo/config": "~57.0.3",
     "@expo/config-plugins": "~57.0.3",
     "@expo/devcert": "^1.2.1",
     "@expo/env": "~2.4.1",
@@ -156,13 +156,13 @@
     "playwright": "^1.59.0",
     "taskr": "^1.1.0",
     "tree-kill": "^1.2.2",
-    "@expo/fingerprint": "0.20.3",
+    "expo": "57.0.4",
     "expo-module-scripts": "56.0.3",
-    "expo": "57.0.3",
     "expo-modules-autolinking": "57.0.5",
-    "expo-router": "57.0.4"
+    "expo-router": "57.0.4",
+    "@expo/fingerprint": "0.20.3"
   },
-  "gitHead": "6ffed84381e2d2bb80c2fc713d99724f707d6c06",
+  "gitHead": "b31bd70c8873eee2894bc5cc3b3460abca0cdea0",
   "scripts": {
     "build": "taskr",
     "clean": "expo-module clean",