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

package/README.md

@@ -33,7 +33,7 @@ npm install @expo-harmony/prebuild-config
 }
 ```
 
-`bundleName` 必填，其余字段有默认值。完整列表见 [@expo-harmony/config-plugins](../config-plugins/README.md)。
+`bundleName` 必填，其余字段有默认值。完整列表见 `@expo-harmony/config-plugins` 的 README。
 
 生成或更新原生工程：
 
@@ -48,7 +48,7 @@ npx expo-harmony prebuild
 | 文件                                   | 内容                                                |
 | -------------------------------------- | --------------------------------------------------- |
 | `AppScope/app.json5`                   | 包名、版本号、vendor、应用名和图标引用              |
-| `build-profile.json5`                  | product、module、SDK 版本、ABI 和签名配置           |
+| `build-profile.json5`                  | product、module、SDK 版本、原生编译器和签名配置     |
 | `entry/build-profile.json5`            | Entry 模块的 CMake 路径和 ABI                       |
 | `entry/src/main/module.json5`          | module、Ability、设备类型、权限和 querySchemes      |
 | `entry/src/main/resources/`            | 字符串、颜色和 media 资源                           |

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/withEntryMods.js

@@ -96,7 +96,6 @@ function resolveInputFile(root, value) {
 }
 function withEntryMods(config) {
     config = (0, config_plugins_1.withEntryBuildProfile)(config, (mod) => {
-        const harmony = (0, config_plugins_1.normalizeHarmonyConfig)(mod.modRawConfig);
         const build = (0, reconcile_1.readRecord)(mod.modResults.buildOption);
         const native = (0, reconcile_1.readRecord)(build.externalNativeOptions);
         mod.modResults = {
@@ -107,7 +106,6 @@ function withEntryMods(config) {
                 externalNativeOptions: {
                     ...native,
                     path: './src/main/cpp/CMakeLists.txt',
-                    abiFilters: harmony.abiFilters,
                 },
             },
             targets: (0, reconcile_1.upsertNamed)((0, reconcile_1.upsertNamed)(mod.modResults.targets, 'default', existing => ({

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/build/mods/withProjectMods.js

@@ -102,10 +102,7 @@ function withProjectMods(config) {
             const product = {
                 ...existing,
                 name: productName,
-                compatibleSdkVersion: harmony.compatibleSdkVersionString,
-                targetSdkVersion: harmony.targetSdkVersionString,
                 runtimeOS: 'HarmonyOS',
-                buildOption: { ...(existing.buildOption || {}), nativeCompiler: 'BiSheng' },
                 ...(signing ? { signingConfig: signing.name } : {}),
             };
             if (!signing && product.signingConfig === previousSigning) {

package/build/withHarmonyPrebuildConfig.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withHarmonyPrebuildConfig = void 0;
 const config_plugins_1 = require("@expo-harmony/config-plugins");
+const expo_build_properties_1 = require("@expo-harmony/expo-build-properties");
 const errors_1 = require("./errors");
 const withAutolinkingMods_1 = require("./mods/withAutolinkingMods");
 const withEntryMods_1 = require("./mods/withEntryMods");
@@ -17,6 +18,7 @@ const withDefaults = (config, props) => {
         throw new errors_1.HarmonyPrebuildError('ERR_HARMONY_CONFIG_INVALID', 'Harmony prebuild options only accept buildType: "debug" or "release".', { operation: 'configure-prebuild' });
     }
     config = (0, withPreparationMod_1.withPreparationMod)(config);
+    config = (0, expo_build_properties_1.withBuildPropertiesDefaults)(config);
     config = (0, withProjectMods_1.withProjectMods)(config);
     config = (0, withEntryMods_1.withEntryMods)(config);
     config = (0, withSourceMods_1.withSourceMods)(config);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo-harmony/prebuild-config",
-  "version": "55.0.0-harmony.8",
+  "version": "55.0.22-harmony.2",
   "keywords": [
     "react-native",
     "expo",
@@ -19,7 +19,7 @@
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "scripts": {
-    "prebuild": "yarn workspace @expo-harmony/config-plugins build && yarn workspace @expo-harmony/expo-modules-autolinking build",
+    "prebuild": "yarn workspace @expo-harmony/config-plugins build && yarn workspace @expo-harmony/expo-build-properties build && yarn workspace @expo-harmony/expo-modules-autolinking build",
     "build": "tsc -p tsconfig.json",
     "prepare": "yarn build",
     "typecheck": "tsc --noEmit -p tsconfig.json"
@@ -43,19 +43,23 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@expo-harmony/config-plugins": "55.0.10-harmony.4",
-    "@expo-harmony/expo-modules-autolinking": "55.0.25-harmony.4",
-    "@expo-harmony/template": "55.0.0-harmony.5",
+    "@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.31",
+    "react": "19.2.3",
+    "react-native": "0.84.1",
     "typescript": "6.0.3"
   },
   "engines": {

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/withEntryMods.ts

@@ -103,7 +103,6 @@ function resolveInputFile(root, value) {
 
 function withEntryMods(config) {
   config = withEntryBuildProfile(config, (mod) => {
-    const harmony = normalizeHarmonyConfig(mod.modRawConfig);
     const build = readRecord(mod.modResults.buildOption);
     const native = readRecord(build.externalNativeOptions);
 
@@ -115,7 +114,6 @@ function withEntryMods(config) {
         externalNativeOptions: {
           ...native,
           path: './src/main/cpp/CMakeLists.txt',
-          abiFilters: harmony.abiFilters,
         },
       },
       targets: upsertNamed(

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;

package/src/mods/withProjectMods.ts

@@ -109,10 +109,7 @@ export function withProjectMods(config) {
         const product = {
           ...existing,
           name: productName,
-          compatibleSdkVersion: harmony.compatibleSdkVersionString,
-          targetSdkVersion: harmony.targetSdkVersionString,
           runtimeOS: 'HarmonyOS',
-          buildOption: { ...(existing.buildOption || {}), nativeCompiler: 'BiSheng' },
           ...(signing ? { signingConfig: signing.name } : {}),
         };
 

package/src/withHarmonyPrebuildConfig.ts

@@ -4,6 +4,8 @@ import {
   type HarmonyConfigPlugin,
 } from '@expo-harmony/config-plugins';
 
+import { withBuildPropertiesDefaults } from '@expo-harmony/expo-build-properties';
+
 import { HarmonyPrebuildError } from './errors';
 import { withAutolinkingMods } from './mods/withAutolinkingMods';
 import { withEntryMods } from './mods/withEntryMods';
@@ -29,6 +31,7 @@ const withDefaults: HarmonyConfigPlugin<HarmonyPrebuildOptions | void> = (config
   }
 
   config = withPreparationMod(config);
+  config = withBuildPropertiesDefaults(config);
   config = withProjectMods(config);
   config = withEntryMods(config);
   config = withSourceMods(config);