@expo-harmony/prebuild-config 55.0.0-harmony.7 → 55.0.0-harmony.9

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/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 => ({
@@ -171,6 +169,7 @@ function withEntryMods(config) {
                 ...module,
                 name: harmony.moduleName,
                 type: 'entry',
+                srcEntry: './ets/abilitystage/EntryAbilityStage.ets',
                 description: '$string:expo_harmony_module_desc',
                 mainElement: harmony.abilityName,
                 deviceTypes: harmony.deviceTypes,

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

@@ -38,10 +38,11 @@ const config_plugins_1 = require("@expo-harmony/config-plugins");
 const dependencies_1 = require("../dependencies");
 const render = __importStar(require("../renderers"));
 const SourceMods = [
+    [config_plugins_1.withAbilityStage, config_plugins_1.HarmonyPaths.HARMONY_PATHS.abilityStage],
     [config_plugins_1.withEntryAbility, config_plugins_1.HarmonyPaths.HARMONY_PATHS.entryAbility, render.renderEntryAbility],
-    [config_plugins_1.withIndexPage, config_plugins_1.HarmonyPaths.HARMONY_PATHS.indexPage, render.renderIndexPage],
+    [config_plugins_1.withIndexPage, config_plugins_1.HarmonyPaths.HARMONY_PATHS.indexPage],
     [config_plugins_1.withWorker, config_plugins_1.HarmonyPaths.HARMONY_PATHS.worker],
-    [config_plugins_1.withArkTSPackageProvider, config_plugins_1.HarmonyPaths.HARMONY_PATHS.arktsPackageProvider],
+    [config_plugins_1.withArkTSPackageProvider, config_plugins_1.HarmonyPaths.HARMONY_PATHS.arktsPackageProvider, render.renderPackageProvider],
     [config_plugins_1.withCppPackageProvider, config_plugins_1.HarmonyPaths.HARMONY_PATHS.cppPackageProvider],
     [config_plugins_1.withCMakeLists, config_plugins_1.HarmonyPaths.HARMONY_PATHS.cmakeLists],
 ];

package/build/renderers.d.ts

@@ -3,5 +3,5 @@ declare function renderCanonical(source: any, label: any): string;
 declare function renderReactNativeConfig(): string;
 declare function renderRootHvigor(source: any, build: HarmonyBuildDescriptor): any;
 declare function renderEntryAbility(source: any, harmony: any): any;
-declare function renderIndexPage(source: any, harmony: any): any;
-export { renderCanonical, renderEntryAbility, renderIndexPage, renderReactNativeConfig, renderRootHvigor, };
+declare function renderPackageProvider(source: any, harmony: any): any;
+export { renderCanonical, renderEntryAbility, renderPackageProvider, renderReactNativeConfig, renderRootHvigor, };

package/build/renderers.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderCanonical = renderCanonical;
 exports.renderEntryAbility = renderEntryAbility;
-exports.renderIndexPage = renderIndexPage;
+exports.renderPackageProvider = renderPackageProvider;
 exports.renderReactNativeConfig = renderReactNativeConfig;
 exports.renderRootHvigor = renderRootHvigor;
 const template_1 = require("./template");
@@ -39,7 +39,7 @@ function renderEntryAbility(source, harmony) {
     source = renderCanonical(source, 'EntryAbility.ets');
     return replacePlaceholder(source, template_1.TEMPLATE_PLACEHOLDERS.abilityName, harmony.abilityName, 'ability class');
 }
-function renderIndexPage(source, harmony) {
-    source = renderCanonical(source, 'Index.ets');
+function renderPackageProvider(source, harmony) {
+    source = renderCanonical(source, 'PackageProvider.ets');
     return replacePlaceholder(source, JSON.stringify(template_1.TEMPLATE_PLACEHOLDERS.appLabel), JSON.stringify(harmony.label), 'RN instance name');
 }

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.7",
+  "version": "55.0.0-harmony.9",
   "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,9 +43,10 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@expo-harmony/config-plugins": "55.0.10-harmony.3",
-    "@expo-harmony/expo-modules-autolinking": "55.0.25-harmony.3",
-    "@expo-harmony/template": "55.0.0-harmony.4",
+    "@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/config": "55.0.17",
     "@expo/config-plugins": "55.0.10",
     "@react-native-community/cli-config": "15.1.3",
@@ -56,6 +57,9 @@
   },
   "devDependencies": {
     "@types/node": "18.19.0",
+    "expo": "55.0.26",
+    "react": "19.2.3",
+    "react-native": "0.84.1",
     "typescript": "6.0.3"
   },
   "engines": {

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(
@@ -218,6 +216,7 @@ function withEntryMods(config) {
         ...module,
         name: harmony.moduleName,
         type: 'entry',
+        srcEntry: './ets/abilitystage/EntryAbilityStage.ets',
         description: '$string:expo_harmony_module_desc',
         mainElement: harmony.abilityName,
         deviceTypes: harmony.deviceTypes,
@@ -242,6 +241,7 @@ function withEntryMods(config) {
       'strings',
       mod._internal?.harmonyStaleConfigPlugins || []
     );
+
     const app = mod.modResults.app ??= {};
     const entry = mod.modResults.entry ??= {};
 
@@ -263,7 +263,9 @@ function withEntryMods(config) {
       'colors',
       mod._internal?.harmonyStaleConfigPlugins || []
     );
+
     const entry = mod.modResults.entry ??= {};
+
     mod.modResults.entryDark ??= {};
 
     HarmonyResources.setColor(entry, { name: 'expo_harmony_start_window_background', value: harmony.backgroundColor });

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/mods/withSourceMods.ts

@@ -1,16 +1,17 @@
 import {
   normalizeHarmonyConfig, HarmonyPaths, withArkTSPackageProvider, withCMakeLists, withCppPackageProvider,
-  withEntryAbility, withIndexPage, withWorker,
+  withAbilityStage, withEntryAbility, withIndexPage, withWorker,
 } from '@expo-harmony/config-plugins';
 
 import { readTemplateSource } from '../dependencies';
 import * as render from '../renderers';
 
 const SourceMods = [
+  [withAbilityStage, HarmonyPaths.HARMONY_PATHS.abilityStage],
   [withEntryAbility, HarmonyPaths.HARMONY_PATHS.entryAbility, render.renderEntryAbility],
-  [withIndexPage, HarmonyPaths.HARMONY_PATHS.indexPage, render.renderIndexPage],
+  [withIndexPage, HarmonyPaths.HARMONY_PATHS.indexPage],
   [withWorker, HarmonyPaths.HARMONY_PATHS.worker],
-  [withArkTSPackageProvider, HarmonyPaths.HARMONY_PATHS.arktsPackageProvider],
+  [withArkTSPackageProvider, HarmonyPaths.HARMONY_PATHS.arktsPackageProvider, render.renderPackageProvider],
   [withCppPackageProvider, HarmonyPaths.HARMONY_PATHS.cppPackageProvider],
   [withCMakeLists, HarmonyPaths.HARMONY_PATHS.cmakeLists],
 ] as const;

package/src/renderers.ts

@@ -57,8 +57,8 @@ function renderEntryAbility(source, harmony) {
   );
 }
 
-function renderIndexPage(source, harmony) {
-  source = renderCanonical(source, 'Index.ets');
+function renderPackageProvider(source, harmony) {
+  source = renderCanonical(source, 'PackageProvider.ets');
 
   return replacePlaceholder(
     source,
@@ -71,7 +71,7 @@ function renderIndexPage(source, harmony) {
 export {
   renderCanonical,
   renderEntryAbility,
-  renderIndexPage,
+  renderPackageProvider,
   renderReactNativeConfig,
   renderRootHvigor,
 };

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);