@callstack/brownfield-cli 6.0.0 → 6.1.0

package/dist/brownfield/utils/resolvePackagedFrameworkName.d.ts

@@ -1,3 +1,4 @@
+import { type AppleSdk } from './destinationSdks.js';
 type Resolution = 'explicit' | 'detected' | 'not_found' | 'ambiguous';
 export interface ResolvePackagedFrameworkNameResult {
     frameworkName: string | null;
@@ -8,7 +9,9 @@ interface ResolvePackagedFrameworkNameOptions {
     explicitScheme?: string;
     productsPath: string;
     configuration: string;
+    /** Slices the build produced; defaults to both. */
+    sdks?: AppleSdk[];
 }
-export declare function resolvePackagedFrameworkName({ explicitScheme, productsPath, configuration, }: ResolvePackagedFrameworkNameOptions): ResolvePackagedFrameworkNameResult;
+export declare function resolvePackagedFrameworkName({ explicitScheme, productsPath, configuration, sdks, }: ResolvePackagedFrameworkNameOptions): ResolvePackagedFrameworkNameResult;
 export {};
 //# sourceMappingURL=resolvePackagedFrameworkName.d.ts.map

package/dist/brownfield/utils/resolvePackagedFrameworkName.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolvePackagedFrameworkName.d.ts","sourceRoot":"","sources":["../../../src/brownfield/utils/resolvePackagedFrameworkName.ts"],"names":[],"mappings":"AAGA,KAAK,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,WAAW,GAAG,WAAW,CAAC;AAEtE,MAAM,WAAW,kCAAkC;IACjD,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,UAAU,mCAAmC;IAC3C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACvB;AA4CD,wBAAgB,4BAA4B,CAAC,EAC3C,cAAc,EACd,YAAY,EACZ,aAAa,GACd,EAAE,mCAAmC,GAAG,kCAAkC,CAkC1E"}
+{"version":3,"file":"resolvePackagedFrameworkName.d.ts","sourceRoot":"","sources":["../../../src/brownfield/utils/resolvePackagedFrameworkName.ts"],"names":[],"mappings":"AAGA,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAErE,KAAK,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,WAAW,GAAG,WAAW,CAAC;AAEtE,MAAM,WAAW,kCAAkC;IACjD,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,UAAU,mCAAmC;IAC3C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,mDAAmD;IACnD,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC;CACnB;AA4CD,wBAAgB,4BAA4B,CAAC,EAC3C,cAAc,EACd,YAAY,EACZ,aAAa,EACb,IAAqB,GACtB,EAAE,mCAAmC,GAAG,kCAAkC,CAwC1E"}

package/dist/brownfield/utils/resolvePackagedFrameworkName.js

@@ -1,5 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
+import { ALL_APPLE_SDKS } from './destinationSdks.js';
 function collectFrameworkCandidates(configurationProductsPath) {
     if (!fs.existsSync(configurationProductsPath)) {
         return [];
@@ -31,15 +32,18 @@ function collectFrameworkCandidates(configurationProductsPath) {
     }
     return [...discoveredFrameworks].sort();
 }
-export function resolvePackagedFrameworkName({ explicitScheme, productsPath, configuration, }) {
+export function resolvePackagedFrameworkName({ explicitScheme, productsPath, configuration, sdks = ALL_APPLE_SDKS, }) {
     if (explicitScheme) {
         return {
             frameworkName: explicitScheme,
             resolution: 'explicit',
         };
     }
-    const configurationProductsPath = path.join(productsPath, `${configuration}-iphoneos`);
-    const candidates = collectFrameworkCandidates(configurationProductsPath);
+    // the JS bundle is emitted per slice, so scan every slice that was built rather
+    // than assuming the device one exists (`--destination simulator` skips it)
+    const candidates = [
+        ...new Set(sdks.flatMap((sdk) => collectFrameworkCandidates(path.join(productsPath, `${configuration}-${sdk}`)))),
+    ].sort();
     if (candidates.length === 1) {
         return {
             frameworkName: candidates[0] ?? null,

package/dist/brownfield/utils/supportsPrebuiltExpo.d.ts

@@ -2,13 +2,33 @@ export declare const MIN_EXPO_SDK_MAJOR_FOR_PREBUILT_EXPO = 56;
 export type PrebuiltExpoSupportResult = {
     supported: true;
     enabledByDefault: boolean;
+    /** Why prebuilts are off by default even though they are supported. */
+    defaultDisabledReason?: string;
     reason?: never;
 } | {
     supported: false;
     enabledByDefault?: never;
     reason: string;
 };
+/**
+ * The React Native version the installed Expo SDK pins. Expo ships its
+ * precompiled modules built against this version.
+ */
+export declare function getExpoReactNativeVersion(projectRoot: string): string | null;
+/**
+ * Describes a React Native version the Expo prebuilts were not built for, or
+ * returns null when they match. Prebuilt Expo modules link against React
+ * Native's C++ API, which changes between minor versions, so a mismatch
+ * crashes at runtime.
+ */
+export declare function getPrebuiltExpoReactNativeMismatch(projectRoot: string): string | null;
 export declare function supportsPrebuiltExpo({ projectRoot, }: {
     projectRoot: string;
 }): PrebuiltExpoSupportResult;
+/**
+ * Whether the project's Podfile turns Expo's precompiled modules off. Expo
+ * Podfiles force `EXPO_USE_PRECOMPILED_MODULES` to '0' when
+ * `ios/Podfile.properties.json` sets it to "false", whatever the environment says.
+ */
+export declare function isPrecompiledExpoDisabledByPodfile(projectRoot: string): boolean;
 //# sourceMappingURL=supportsPrebuiltExpo.d.ts.map

package/dist/brownfield/utils/supportsPrebuiltExpo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"supportsPrebuiltExpo.d.ts","sourceRoot":"","sources":["../../../src/brownfield/utils/supportsPrebuiltExpo.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,oCAAoC,KAAK,CAAC;AAEvD,MAAM,MAAM,yBAAyB,GACjC;IAAE,SAAS,EAAE,IAAI,CAAC;IAAC,gBAAgB,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,KAAK,CAAA;CAAE,GAC9D;IAAE,SAAS,EAAE,KAAK,CAAC;IAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnE,wBAAgB,oBAAoB,CAAC,EACnC,WAAW,GACZ,EAAE;IACD,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,yBAAyB,CAqB5B"}
+{"version":3,"file":"supportsPrebuiltExpo.d.ts","sourceRoot":"","sources":["../../../src/brownfield/utils/supportsPrebuiltExpo.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,oCAAoC,KAAK,CAAC;AAEvD,MAAM,MAAM,yBAAyB,GACjC;IACE,SAAS,EAAE,IAAI,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,uEAAuE;IACvE,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,MAAM,CAAC,EAAE,KAAK,CAAC;CAChB,GACD;IAAE,SAAS,EAAE,KAAK,CAAC;IAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAMnE;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAc5E;AAED;;;;;GAKG;AACH,wBAAgB,kCAAkC,CAChD,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,IAAI,CAYf;AAED,wBAAgB,oBAAoB,CAAC,EACnC,WAAW,GACZ,EAAE;IACD,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,yBAAyB,CAsC5B;AAED;;;;GAIG;AACH,wBAAgB,kCAAkC,CAChD,WAAW,EAAE,MAAM,GAClB,OAAO,CAYT"}

package/dist/brownfield/utils/supportsPrebuiltExpo.js

@@ -1,5 +1,44 @@
-import { getExpoSdkMajor, isExpoProject } from './project.js';
+import fs from 'node:fs';
+import { createRequire } from 'node:module';
+import path from 'node:path';
+import { getReactNativeVersion } from '@rock-js/tools';
+import { getExpoIosUsePrecompiledModules, getExpoSdkMajor, isExpoProject } from './project.js';
 export const MIN_EXPO_SDK_MAJOR_FOR_PREBUILT_EXPO = 56;
+function majorMinor(version) {
+    return version.split('.').slice(0, 2).join('.');
+}
+/**
+ * The React Native version the installed Expo SDK pins. Expo ships its
+ * precompiled modules built against this version.
+ */
+export function getExpoReactNativeVersion(projectRoot) {
+    try {
+        const require = createRequire(path.join(projectRoot, 'package.json'));
+        const expoPackageJson = require.resolve('expo/package.json');
+        const bundledNativeModules = JSON.parse(fs.readFileSync(path.join(path.dirname(expoPackageJson), 'bundledNativeModules.json'), 'utf8'));
+        return bundledNativeModules['react-native'] ?? null;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Describes a React Native version the Expo prebuilts were not built for, or
+ * returns null when they match. Prebuilt Expo modules link against React
+ * Native's C++ API, which changes between minor versions, so a mismatch
+ * crashes at runtime.
+ */
+export function getPrebuiltExpoReactNativeMismatch(projectRoot) {
+    const expected = getExpoReactNativeVersion(projectRoot);
+    const found = getReactNativeVersion(projectRoot);
+    if (!expected || found === 'unknown') {
+        return null;
+    }
+    if (majorMinor(expected) === majorMinor(found)) {
+        return null;
+    }
+    return `Expo's precompiled modules are built for React Native ${majorMinor(expected)}, but this project uses ${found}.`;
+}
 export function supportsPrebuiltExpo({ projectRoot, }) {
     if (!isExpoProject(projectRoot)) {
         return { supported: true, enabledByDefault: false };
@@ -13,8 +52,36 @@ export function supportsPrebuiltExpo({ projectRoot, }) {
             reason: `--use-prebuilt-expo is unsupported in Expo SDK ${sdkLabel}: packaging brownfield with Expo prebuilts requires Expo SDK ${MIN_EXPO_SDK_MAJOR_FOR_PREBUILT_EXPO} or newer.`,
         };
     }
+    const reactNativeMismatch = getPrebuiltExpoReactNativeMismatch(projectRoot);
+    if (reactNativeMismatch) {
+        return {
+            supported: true,
+            enabledByDefault: false,
+            defaultDisabledReason: reactNativeMismatch,
+        };
+    }
+    if (getExpoIosUsePrecompiledModules(projectRoot) === false) {
+        return {
+            supported: false,
+            reason: "--use-prebuilt-expo is unsupported: expo-build-properties sets ios.usePrecompiledModules to false in your Expo config, so prebuilt Expo XCFrameworks are never produced. Set it to true (or remove it) and run 'pod install', or pass --use-prebuilt-expo false to build Expo modules from source.",
+        };
+    }
     return {
         supported: true,
         enabledByDefault: true,
     };
 }
+/**
+ * Whether the project's Podfile turns Expo's precompiled modules off. Expo
+ * Podfiles force `EXPO_USE_PRECOMPILED_MODULES` to '0' when
+ * `ios/Podfile.properties.json` sets it to "false", whatever the environment says.
+ */
+export function isPrecompiledExpoDisabledByPodfile(projectRoot) {
+    try {
+        const properties = JSON.parse(fs.readFileSync(path.join(projectRoot, 'ios', 'Podfile.properties.json'), 'utf8'));
+        return properties.EXPO_USE_PRECOMPILED_MODULES === 'false';
+    }
+    catch {
+        return false;
+    }
+}

package/dist/expoPluginConfig.d.ts

@@ -26,6 +26,7 @@ export type BrownfieldPluginProps = {
         extraProguardRules?: string[];
         useLocalMaven?: boolean;
         missingDimensionStrategies?: string[];
+        excludeDependencies?: string[];
     };
 };
 export type ResolvedBrownfieldPluginAndroidConfig = {
@@ -42,6 +43,7 @@ export type ResolvedBrownfieldPluginAndroidConfig = {
     extraProguardRules: string[];
     useLocalMaven: boolean;
     missingDimensionStrategies: string[];
+    excludeDependencies: string[];
 };
 export type ResolvedBrownfieldPluginIosConfig = {
     frameworkName: string;

package/dist/expoPluginConfig.d.ts.map

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

package/dist/expoPluginConfig.js

@@ -107,6 +107,7 @@ export function resolveBrownfieldPluginConfig(pluginProps, fileConfig, expoConfi
                 extraProguardRules,
                 useLocalMaven: effectiveProps.android?.useLocalMaven ?? false,
                 missingDimensionStrategies: effectiveProps.android?.missingDimensionStrategies ?? [],
+                excludeDependencies: effectiveProps.android?.excludeDependencies ?? [],
                 ...(effectiveProps.android?.targetSdkVersion != null
                     ? { targetSdkVersion: effectiveProps.android.targetSdkVersion }
                     : {}),

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAiFA,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAM3C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AA6FA,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAM3C"}

package/dist/index.js

@@ -5,6 +5,16 @@ import { ExampleUsage } from './shared/index.js';
 import brownfieldCommands, { groupName as brownfieldCommandsGroupName, } from './brownfield/index.js';
 import brownieCommands, { groupName as brownieCommandsGroupName, } from './brownie/index.js';
 import navigationCommands, { groupName as navigationCommandsGroupName, } from './navigation/index.js';
+// CocoaPods (spawned by Rock) raises Encoding::CompatibilityError under a non-UTF-8
+// locale. Ruby resolves the character encoding as LC_ALL > LC_CTYPE > LANG, so check
+// them in that precedence. Default to UTF-8 only when the effective value is missing
+// or non-UTF-8.
+const inheritedCharset = process.env.LC_ALL || process.env.LC_CTYPE || process.env.LANG || '';
+if (!/utf-?8/i.test(inheritedCharset)) {
+    process.env.LANG = 'en_US.UTF-8';
+    process.env.LC_CTYPE = 'en_US.UTF-8';
+    process.env.LC_ALL = 'en_US.UTF-8';
+}
 const program = new Command();
 program
     .name(styleText('magenta', 'brownfield'))

package/dist/types.d.ts

@@ -90,6 +90,12 @@ export type BrownfieldExpoAndroidConfig = {
      * Missing dimension strategies as dimension + flavor(s), e.g. "type, alpha".
      */
     missingDimensionStrategies?: string[];
+    /**
+     * Dependencies to keep out of the published AAR's POM and module.json, as
+     * "group:module" or "group" for a whole group. Written as Gradle excludes
+     * into the generated module, e.g. "com.caverock:androidsvg".
+     */
+    excludeDependencies?: string[];
 };
 /**
  * Expo config plugin options for iOS prebuild scaffolding.

package/dist/types.d.ts.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@callstack/brownfield-cli",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "license": "MIT",
   "author": "Artur Morys-Magiera <artus9033@gmail.com>",
   "bin": {
@@ -88,11 +88,11 @@
     "@expo/config": "^12.0.13",
     "@react-native-community/cli-config": "^20.0.0",
     "@react-native-community/cli-config-android": "^20.0.0",
-    "@rock-js/platform-android": "^0.14.0",
-    "@rock-js/platform-apple-helpers": "^0.14.0",
-    "@rock-js/plugin-brownfield-android": "^0.14.0",
-    "@rock-js/plugin-brownfield-ios": "^0.14.0",
-    "@rock-js/tools": "^0.14.0",
+    "@rock-js/platform-android": "^0.15.4",
+    "@rock-js/platform-apple-helpers": "^0.15.4",
+    "@rock-js/plugin-brownfield-android": "^0.15.4",
+    "@rock-js/plugin-brownfield-ios": "^0.15.4",
+    "@rock-js/tools": "^0.15.4",
     "ajv": "^8.20.0",
     "commander": "^14.0.3",
     "quicktype-core": "^23.2.6",

package/schema.json

@@ -57,6 +57,13 @@
           "description": "Compile SDK version for the Android library. Defaults to 37 on Expo SDK 58 and later, otherwise 35.",
           "type": "number"
         },
+        "excludeDependencies": {
+          "description": "Dependencies to keep out of the published AAR's POM and module.json, as \"group:module\" or \"group\" for a whole group. Written as Gradle excludes into the generated module, e.g. \"com.caverock:androidsvg\".",
+          "items": {
+            "type": "string"
+          },
+          "type": "array"
+        },
         "extraProguardRules": {
           "description": "Extra Proguard rules appended to the default rules.",
           "items": {

package/src/brownfield/commands/packageIos.ts

@@ -18,8 +18,11 @@ import { Command, Option } from 'commander';
 
 import { runExpoPrebuildIfNeeded } from '../utils/expo.js';
 import { findProjectRoot } from '../utils/paths.js';
-import { getProjectInfo } from '../utils/project.js';
-import { supportsPrebuiltExpo } from '../utils/supportsPrebuiltExpo.js';
+import { getProjectInfo, isExpoProject } from '../utils/project.js';
+import {
+  isPrecompiledExpoDisabledByPodfile,
+  supportsPrebuiltExpo,
+} from '../utils/supportsPrebuiltExpo.js';
 import { supportsPrebuiltRNCore } from '../utils/supportsPrebuiltRNCore.js';
 import {
   actionRunner,
@@ -29,6 +32,10 @@ import {
 import { runBrownieCodegenIfApplicable } from '../../brownie/helpers/runBrownieCodegenIfApplicable.js';
 import { runNavigationCodegenIfApplicable } from '../../navigation/helpers/runNavigationCodegenIfApplicable.js';
 import { copyDebugBundleToSimulatorSlice } from '../utils/copyDebugBundleToSimulatorSlice.js';
+import {
+  collectFrameworkPaths,
+  resolveDestinationSdks,
+} from '../utils/destinationSdks.js';
 import { resolvePackagedFrameworkName } from '../utils/resolvePackagedFrameworkName.js';
 import { stripFrameworkBinary } from '../utils/stripFrameworkBinary.js';
 import type { PackageIosOptions } from '../../types.js';
@@ -75,9 +82,7 @@ export function parseUsePrebuiltRnCoreArgument(
   return parseBooleanOptionArgument('--use-prebuilt-rn-core', value);
 }
 
-export function parseUsePrebuiltExpoArgument(
-  value: string | boolean
-): boolean {
+export function parseUsePrebuiltExpoArgument(value: string | boolean): boolean {
   return parseBooleanOptionArgument('--use-prebuilt-expo', value);
 }
 
@@ -125,6 +130,11 @@ export const packageIosCommand = curryOptions(
   .action(
     actionRunner(async (cliOptions: PackageIosOptions) => {
       const options = mergeBrownfieldConfigWithOptions(cliOptions, 'ios');
+      // captured before the version-aware default below, so that a value from
+      // brownfield.config.json counts as explicit
+      const usePrebuiltExpoExplicit = isUsePrebuiltExpoExplicit(
+        options.usePrebuiltExpo
+      );
       const projectRoot = findProjectRoot();
 
       await runExpoPrebuildIfNeeded({ projectRoot, platform: 'ios' });
@@ -139,10 +149,68 @@ export const packageIosCommand = curryOptions(
         ? prebuiltRNCoreSupport.enabledByDefault
         : false;
 
-        // version-aware default when the flag is omitted
-      options.usePrebuiltExpo ??= prebuiltExpoSupport.supported
-        ? prebuiltExpoSupport.enabledByDefault
-        : false;
+      const usePrebuiltExpoWasPassed = options.usePrebuiltExpo !== undefined;
+      const precompiledExpoDisabledByPodfile =
+        isExpoProject(projectRoot) &&
+        isPrecompiledExpoDisabledByPodfile(projectRoot);
+
+      if (precompiledExpoDisabledByPodfile) {
+        if (options.usePrebuiltExpo) {
+          logger.warn(
+            'ios/Podfile.properties.json sets EXPO_USE_PRECOMPILED_MODULES to "false", so pod install builds Expo modules from source and --use-prebuilt-expo will fail. Remove that property or pass --use-prebuilt-expo false.'
+          );
+        } else if (!usePrebuiltExpoWasPassed) {
+          logger.info(
+            'ios/Podfile.properties.json turns Expo precompiled modules off. Building Expo modules from source.'
+          );
+          options.usePrebuiltExpo = false;
+        }
+      } else if (
+        !usePrebuiltExpoWasPassed &&
+        isExpoProject(projectRoot) &&
+        process.env.EXPO_USE_PRECOMPILED_MODULES === '0'
+      ) {
+        // Respect an exported opt-out, the same way Expo's Podfile does.
+        logger.info(
+          'EXPO_USE_PRECOMPILED_MODULES is set to 0. Building Expo modules from source.'
+        );
+        options.usePrebuiltExpo = false;
+      }
+
+      const usePrebuiltExpoWasChosen =
+        usePrebuiltExpoWasPassed || options.usePrebuiltExpo !== undefined;
+
+      // version-aware default when the flag is omitted; Expo's precompiled
+      // modules also need the prebuilt React Native core
+      if (options.usePrebuiltExpo === undefined) {
+        options.usePrebuiltExpo = prebuiltExpoSupport.supported
+          ? prebuiltExpoSupport.enabledByDefault && !!options.usePrebuiltRnCore
+          : false;
+
+        if (
+          prebuiltExpoSupport.enabledByDefault &&
+          !options.usePrebuiltRnCore
+        ) {
+          logger.info(
+            'Expo precompiled modules need the prebuilt React Native core, which is off. Building Expo modules from source.'
+          );
+        }
+      }
+
+      if (
+        prebuiltExpoSupport.supported &&
+        prebuiltExpoSupport.defaultDisabledReason
+      ) {
+        if (usePrebuiltExpoWasChosen && options.usePrebuiltExpo) {
+          logger.warn(
+            `${prebuiltExpoSupport.defaultDisabledReason} The packaged app will likely crash at runtime. Pass --use-prebuilt-expo false to build Expo modules from source.`
+          );
+        } else if (!usePrebuiltExpoWasChosen) {
+          logger.info(
+            `${prebuiltExpoSupport.defaultDisabledReason} Building Expo modules from source.`
+          );
+        }
+      }
 
       if (prebuiltRNCoreSupport) {
         logger.info(
@@ -167,6 +235,31 @@ export const packageIosCommand = curryOptions(
         throw new RockError(prebuiltExpoSupport.reason);
       }
 
+      if (isExpoProject(projectRoot)) {
+        // Read by Expo's autolinking during `pod install`. Expo-generated
+        // Podfiles default it to on, but a React Native CLI app's Podfile
+        // never sets it, so the flag has to drive it.
+        process.env.EXPO_USE_PRECOMPILED_MODULES = options.usePrebuiltExpo
+          ? '1'
+          : '0';
+      }
+
+      if (
+        options.usePrebuiltExpo &&
+        !options.extraParams?.some((param) =>
+          param.startsWith('SWIFT_ENABLE_EXPLICIT_MODULES=')
+        )
+      ) {
+        // Precompiled Expo builds the React Native pods as static libraries.
+        // With explicit modules off (a leftover older React Native versions
+        // wrote into app projects), Xcode cannot find their module maps when
+        // verifying the framework's Swift interface.
+        options.extraParams = [
+          ...(options.extraParams ?? []),
+          'SWIFT_ENABLE_EXPLICIT_MODULES=YES',
+        ];
+      }
+
       if (!userConfig.project.ios) {
         throw new Error('iOS project not found.');
       }
@@ -197,6 +290,9 @@ export const packageIosCommand = curryOptions(
       // Reference: https://github.com/facebook/react-native/blob/490c5e8dcc6cdb19c334cc39e93a39a48ba71e96/packages/react-native/scripts/cocoapods/new_architecture.rb#L171
       const packageDir = path.join(dotBrownfieldDir, 'package', 'build');
       const configuration = options.configuration ?? 'Debug';
+      // `--destination` narrows which slices Xcode emits, so every path below has to
+      // look at those slices only instead of assuming a device + simulator pair
+      const sdks = resolveDestinationSdks(options.destination);
 
       const { hasBrownie } = await runBrownieCodegenIfApplicable(
         projectRoot,
@@ -225,6 +321,11 @@ export const packageIosCommand = curryOptions(
         projectRoot,
         packageDir,
         usePrebuiltExpo: options.usePrebuiltExpo,
+        usePrebuiltExpoExplicit,
+        // keep the generated SPM manifest consistent with the emitted XCFrameworks
+        onDegradeToSource: () => {
+          options.usePrebuiltExpo = false;
+        },
       });
 
       const productsPath = path.join(options.buildFolder, 'Build', 'Products');
@@ -233,6 +334,7 @@ export const packageIosCommand = curryOptions(
           explicitScheme: options.scheme,
           productsPath,
           configuration,
+          sdks,
         });
 
       if (!frameworkName && options.addSpmPackage) {
@@ -251,24 +353,19 @@ export const packageIosCommand = curryOptions(
           productsPath,
           configuration,
           frameworkName,
+          sdks,
         });
 
         if (configuration.includes('Debug')) {
           // Re-merge only Debug frameworks so the simulator slice includes main.jsbundle.
           await mergeFrameworks({
             sourceDir: userConfig.project.ios.sourceDir,
-            frameworkPaths: [
-              path.join(
-                productsPath,
-                `${configuration}-iphoneos`,
-                `${frameworkName}.framework`
-              ),
-              path.join(
-                productsPath,
-                `${configuration}-iphonesimulator`,
-                `${frameworkName}.framework`
-              ),
-            ],
+            frameworkPaths: collectFrameworkPaths({
+              productsPath,
+              configuration,
+              sdks,
+              frameworkName,
+            }),
             outputPath: path.join(packageDir, `${frameworkName}.xcframework`),
           });
         }
@@ -300,20 +397,13 @@ export const packageIosCommand = curryOptions(
 
         await mergeFrameworks({
           sourceDir: userConfig.project.ios.sourceDir,
-          frameworkPaths: [
-            path.join(
-              productsPath,
-              `${configuration}-iphoneos`,
-              'Brownie',
-              'Brownie.framework'
-            ),
-            path.join(
-              productsPath,
-              `${configuration}-iphonesimulator`,
-              'Brownie',
-              'Brownie.framework'
-            ),
-          ],
+          frameworkPaths: collectFrameworkPaths({
+            productsPath,
+            configuration,
+            sdks,
+            frameworkName: 'Brownie',
+            productSubDir: 'Brownie',
+          }),
           outputPath: brownieOutputPath,
         });
 
@@ -335,20 +425,13 @@ export const packageIosCommand = curryOptions(
 
         await mergeFrameworks({
           sourceDir: userConfig.project.ios.sourceDir,
-          frameworkPaths: [
-            path.join(
-              productsPath,
-              `${configuration}-iphoneos`,
-              'BrownfieldNavigation',
-              'BrownfieldNavigation.framework'
-            ),
-            path.join(
-              productsPath,
-              `${configuration}-iphonesimulator`,
-              'BrownfieldNavigation',
-              'BrownfieldNavigation.framework'
-            ),
-          ],
+          frameworkPaths: collectFrameworkPaths({
+            productsPath,
+            configuration,
+            sdks,
+            frameworkName: 'BrownfieldNavigation',
+            productSubDir: 'BrownfieldNavigation',
+          }),
           outputPath: brownfieldNavigationOutputPath,
         });
 
@@ -378,9 +461,20 @@ export const packageIosCommand = curryOptions(
           'In Xcode, choose File > Add Package Dependencies..., click Add Local..., and select that folder.'
         );
       }
+
+      // The dependency prints its own "Success" before the post-build steps above,
+      // so log a final line marking the true end of the run.
+      logger.success(
+        `package:ios finished. Artifacts are in ${colorLink(relativeToCwd(packageDir))}`
+      );
     })
   );
 
+/** Whether `--use-prebuilt-expo` was chosen (CLI or brownfield.config.json) rather than inferred. */
+export function isUsePrebuiltExpoExplicit(value: boolean | undefined) {
+  return value !== undefined;
+}
+
 export const packageIosExample = new ExampleUsage(
   'package:ios --scheme BrownfieldLib --configuration Release',
   "Build iOS XCFramework for 'BrownfieldLib' scheme in Release configuration"

package/src/brownfield/utils/copyDebugBundleToSimulatorSlice.ts

@@ -3,21 +3,31 @@ import path from 'node:path';
 
 import { colorLink, logger, relativeToCwd } from '@rock-js/tools';
 
+import { ALL_APPLE_SDKS, type AppleSdk } from './destinationSdks.js';
+
 interface CopyDebugBundleToSimulatorSliceOptions {
   productsPath: string;
   configuration: string;
   frameworkName: string;
+  /** Slices the build produced; defaults to both. */
+  sdks?: AppleSdk[];
 }
 
 export function copyDebugBundleToSimulatorSlice({
   productsPath,
   configuration,
   frameworkName,
+  sdks = ALL_APPLE_SDKS,
 }: CopyDebugBundleToSimulatorSliceOptions) {
   if (!configuration.includes('Debug')) {
     return;
   }
 
+  // nothing to copy across when only one slice was built
+  if (!sdks.includes('iphoneos') || !sdks.includes('iphonesimulator')) {
+    return;
+  }
+
   const deviceBundlePath = path.join(
     productsPath,
     `${configuration}-iphoneos`,