@expo-harmony/prebuild-config 55.0.0-harmony.9 → 55.0.22-harmony.2

package/build/mods/withAutolinkingMods.js

@@ -31,11 +31,24 @@ function withAutolinkingMods(config, options) {
             const project = await node_fs_1.default.promises.realpath(root);
             const build = (0, buildDescriptor_1.createHarmonyBuildDescriptor)(harmony, mod._internal?.harmonySigningConfig?.name ?? null);
             const platform = (0, buildDescriptor_1.resolveHarmonyBuildPath)(project, build.harmonyRoot);
-            const result = await (0, expo_modules_autolinking_1.linkModulesAsync)({
+            const moduleBuilds = harmony.moduleBuilds || {};
+            const moduleBuildSettings = {
+                compatibleSdkVersion: harmony.compatibleSdkVersionString,
+                targetSdkVersion: harmony.targetSdkVersionString,
+                abiFilters: harmony.abiFilters,
+            };
+            // Normal CLI/DevEco builds relink without evaluating Expo config; retain these inputs.
+            const inputs = node_path_1.default.join(project, '.expo/harmony/module-build-options.json');
+            const linkOptions = {
+                moduleBuilds,
+                moduleBuildSettings,
                 projectRoot: project,
                 harmonyProjectPath: platform,
                 buildType: mode,
-            });
+            };
+            const prepared = await (0, expo_modules_autolinking_1.prepareModulesAsync)(linkOptions);
+            const result = await (0, expo_modules_autolinking_1.linkPreparedModulesAsync)(linkOptions, prepared);
+            (0, config_plugins_1.recordManagedFile)(mod, inputs, 'autolinking');
             mod._internal ??= {};
             mod._internal.harmonyAutolinkingModules = result.modules;
             for (const relative of result.managedArtifacts) {

package/build/mods/withPreparationMod.js

@@ -18,6 +18,10 @@ function withPreparationMod(config) {
         const root = mod.modRequest.projectRoot;
         const platform = mod.modRequest.platformProjectRoot;
         const manifest = mod.modRequest.ignoreExistingNativeFiles ? null : await (0, stale_1.readPreviousCngManifestAsync)(root);
+        // Expo copies the template before mods run; use the state captured by the CLI.
+        const freshPrebuild = process.env.EXPO_HARMONY_PREBUILD_FRESH;
+        const isFreshGeneration = freshPrebuild === '1'
+            || (freshPrebuild === undefined && manifest === null);
         const plugins = (0, internal_1.getHarmonyConfigPlugins)(mod);
         const stale = (0, stale_1.findStaleConfigPlugins)(manifest, plugins);
         mod._internal ??= {};
@@ -35,8 +39,14 @@ function withPreparationMod(config) {
         mod._internal.harmonyStaleConfigPlugins = stale;
         mod._internal.harmonyStalePluginFiles = await (0, stale_1.removeStalePluginFilesAsync)(root, manifest, stale, plugins, mod.modRequest.introspect);
         if (harmony.signingConfigFile) {
-            const signing = await (0, signing_1.readSigningConfigFile)(root, harmony.signingConfigFile);
-            mod._internal.harmonySigningConfig = signing.config;
+            try {
+                const signing = await (0, signing_1.readSigningConfigFile)(root, harmony.signingConfigFile);
+                mod._internal.harmonySigningConfig = signing.config;
+            }
+            catch (cause) {
+                if (!isFreshGeneration)
+                    throw cause;
+            }
         }
         if (mod.modRequest.introspect)
             return mod;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo-harmony/prebuild-config",
-  "version": "55.0.0-harmony.9",
+  "version": "55.0.22-harmony.2",
   "keywords": [
     "react-native",
     "expo",
@@ -43,21 +43,21 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@expo-harmony/config-plugins": "55.0.10-harmony.5",
-    "@expo-harmony/expo-build-properties": "55.0.14-harmony.1",
-    "@expo-harmony/expo-modules-autolinking": "55.0.25-harmony.5",
-    "@expo-harmony/template": "55.0.0-harmony.6",
+    "@expo-harmony/config-plugins": "55.0.11-harmony.2",
+    "@expo-harmony/expo-build-properties": "55.0.18-harmony.2",
+    "@expo-harmony/expo-modules-autolinking": "55.0.27-harmony.2",
+    "@expo-harmony/template": "55.0.0-harmony.9",
     "@expo/config": "55.0.17",
-    "@expo/config-plugins": "55.0.10",
+    "@expo/config-plugins": "55.0.11",
     "@react-native-community/cli-config": "15.1.3",
     "json5": "2.2.3"
   },
   "peerDependencies": {
-    "expo": "55.0.26"
+    "expo": "55.0.31"
   },
   "devDependencies": {
     "@types/node": "18.19.0",
-    "expo": "55.0.26",
+    "expo": "55.0.31",
     "react": "19.2.3",
     "react-native": "0.84.1",
     "typescript": "6.0.3"

package/src/mods/withAutolinkingMods.ts

@@ -1,7 +1,8 @@
 import fs from 'node:fs';
 import path from 'node:path';
 
-import { linkModulesAsync } from '@expo-harmony/expo-modules-autolinking';
+import { linkPreparedModulesAsync, prepareModulesAsync } from '@expo-harmony/expo-modules-autolinking';
+import type { LinkOptions } from '@expo-harmony/expo-modules-autolinking';
 import { normalizeHarmonyConfig, recordManagedFile, stableHarmonyJson, withHarmonyAutolinking } from '@expo-harmony/config-plugins';
 import { getHarmonyConfigPlugins, withCngManifest } from '@expo-harmony/config-plugins/internal';
 
@@ -38,12 +39,26 @@ export function withAutolinkingMods(config, options: HarmonyPrebuildOptions) {
       const build = createHarmonyBuildDescriptor(harmony, mod._internal?.harmonySigningConfig?.name ?? null);
       const platform = resolveHarmonyBuildPath(project, build.harmonyRoot);
 
-      const result = await linkModulesAsync({
+      const moduleBuilds = harmony.moduleBuilds || {};
+      const moduleBuildSettings = {
+        compatibleSdkVersion: harmony.compatibleSdkVersionString,
+        targetSdkVersion: harmony.targetSdkVersionString,
+        abiFilters: harmony.abiFilters,
+      };
+      // Normal CLI/DevEco builds relink without evaluating Expo config; retain these inputs.
+      const inputs = path.join(project, '.expo/harmony/module-build-options.json');
+
+      const linkOptions: LinkOptions = {
+        moduleBuilds,
+        moduleBuildSettings,
         projectRoot: project,
         harmonyProjectPath: platform,
         buildType: mode,
-      });
+      };
+      const prepared = await prepareModulesAsync(linkOptions);
+      const result = await linkPreparedModulesAsync(linkOptions, prepared);
 
+      recordManagedFile(mod, inputs, 'autolinking');
       mod._internal ??= {};
       mod._internal.harmonyAutolinkingModules = result.modules;
 

package/src/mods/withPreparationMod.ts

@@ -19,6 +19,10 @@ function withPreparationMod(config) {
     const root = mod.modRequest.projectRoot;
     const platform = mod.modRequest.platformProjectRoot;
     const manifest = mod.modRequest.ignoreExistingNativeFiles ? null : await readPreviousCngManifestAsync(root);
+    // Expo copies the template before mods run; use the state captured by the CLI.
+    const freshPrebuild = process.env.EXPO_HARMONY_PREBUILD_FRESH;
+    const isFreshGeneration = freshPrebuild === '1'
+      || (freshPrebuild === undefined && manifest === null);
     const plugins = getHarmonyConfigPlugins(mod);
     const stale = findStaleConfigPlugins(manifest, plugins);
 
@@ -40,8 +44,12 @@ function withPreparationMod(config) {
     );
 
     if (harmony.signingConfigFile) {
-      const signing = await readSigningConfigFile(root, harmony.signingConfigFile);
-      mod._internal.harmonySigningConfig = signing.config;
+      try {
+        const signing = await readSigningConfigFile(root, harmony.signingConfigFile);
+        mod._internal.harmonySigningConfig = signing.config;
+      } catch (cause) {
+        if (!isFreshGeneration) throw cause;
+      }
     }
 
     if (mod.modRequest.introspect) return mod;