@expo-harmony/config-plugins 55.0.10-harmony.3 → 55.0.10-harmony.5

package/README.md

@@ -40,9 +40,9 @@ module.exports = defineExpoHarmonyConfig({
 | `vendor` | `expo-harmony` |
 | `versionCode` | `1` |
 | `versionName` | 配置里的 `version`，没有则 `1.0.0` |
-| `targetApiVersion` | `24` |
-| `targetSdkVersion` | 数字或 SDK 标签，默认跟随 `targetApiVersion` |
-| `compatibleSdkVersion` | `13`，不能低于 13，也不能大于 `targetApiVersion` |
+| `targetApiVersion` | 旧版别名，建议改用 `expo-build-properties` 的 `targetSdkVersion` |
+| `targetSdkVersion` | 数字或 SDK 字符串，默认 `24`，兼容旧 `targetApiVersion` |
+| `compatibleSdkVersion` | `20`，不能低于 20，也不能大于 target |
 | `deviceTypes` | `['phone', 'tablet']` |
 | `permissions` | 权限列表，默认包含 `ohos.permission.INTERNET` |
 | `skills` | 技能列表，`scheme` 会追加对应项 |
@@ -56,7 +56,7 @@ module.exports = defineExpoHarmonyConfig({
 | `abiFilters` | `['arm64-v8a', 'x86_64']` |
 | `signingConfigFile` | 签名配置文件路径，不设置则忽略 |
 
-`targetSdkVersion` 和 `compatibleSdkVersion` 可以写数字或带 API 级别的 SDK 标签。内置标签覆盖 API 13、14、20、21、23、24，其他版本写成 `6.1.1(24)` 这样的形式。`backgroundColor` 写 `#RRGGBB` 或 `#RRGGBBAA`，写入原生工程时转成 ARGB。`jsEngine` 目前只能是 `hermes`。
+SDK/ABI 的这些旧字段继续兼容，新项目建议使用 `@expo-harmony/expo-build-properties`。`targetSdkVersion` 和 `compatibleSdkVersion` 可以写数字或带 API 级别的 SDK 标签；API 26 起使用 `26.0.0` 这样的分段版本。内置旧标签覆盖 API 13、14、20、21、23、24，已知 API 不接受错误的标签。`targetApiVersion` 与 `targetSdkVersion` 同时存在时须一致。`backgroundColor` 写 `#RRGGBB` 或 `#RRGGBBAA`，写入原生工程时转成 ARGB。`jsEngine` 目前只能是 `hermes`。
 
 `normalizeHarmonyConfig(config)` 返回补齐默认值并校验后的配置。
 

package/build/config.d.ts

@@ -26,6 +26,7 @@ export interface HarmonyConfig {
     vendor?: string;
     versionCode?: number;
     versionName?: string;
+    /** @deprecated Configure targetSdkVersion in @expo-harmony/expo-build-properties. */
     targetApiVersion?: number;
     targetSdkVersion?: number | string;
     compatibleSdkVersion?: number | string;

package/build/index.d.ts

@@ -11,7 +11,7 @@ export type { HarmonyConfigPluginErrorOptions } from './errors';
 export { atomicWrite, stableJson as stableHarmonyJson } from './files';
 export { normalizeHarmonyConfig } from './normalizeConfig';
 export type { HarmonyExpoConfig, NormalizedHarmonyConfig } from './normalizeConfig';
-export { HarmonyModNames as HARMONY_MOD_NAMES, recordManagedFile, withAppJson, withArkTSPackageProvider, withCMakeLists, withColors, withCppPackageProvider, withEntryAbility, withEntryBuildProfile, withEntryHvigor, withEntryOhPackage, withHarmonyAutolinking, withHarmonyBaseMods, withHarmonyDangerousMod, withHarmonyMod, withHarmonyResources, withHvigorConfig, withIndexPage, withMedia, withModuleJson, withProfiles, withProjectBuildProfile, withReactNativeConfig, withRootHvigor, withRootOhPackage, withStrings, withWorker, } from './mods';
+export { HarmonyModNames as HARMONY_MOD_NAMES, recordManagedFile, withAppJson, withArkTSPackageProvider, withCMakeLists, withColors, withCppPackageProvider, withAbilityStage, withEntryAbility, withEntryBuildProfile, withEntryHvigor, withEntryOhPackage, withHarmonyAutolinking, withHarmonyBaseMods, withHarmonyDangerousMod, withHarmonyMod, withHarmonyResources, withHvigorConfig, withIndexPage, withMedia, withModuleJson, withProfiles, withProjectBuildProfile, withReactNativeConfig, withRootHvigor, withRootOhPackage, withStrings, withWorker, } from './mods';
 export type { HarmonyJson, HarmonyMediaDescriptor, HarmonyMediaMap, HarmonyModName, HarmonyResourceMap, } from './mods';
 export { registerHarmonyConfigPlugin } from './ownership';
 export type { HarmonyConfigPluginOwnership } from './ownership';
@@ -25,3 +25,5 @@ export type { HarmonyResourceFile, HarmonyResourceItem } from './resources';
 export { withHarmonyGeneratedFiles, withRawfile } from './generatedFiles';
 export type { HarmonyFileDescriptor, HarmonyFileMap, HarmonyGeneratedFilesOptions } from './generatedFiles';
 export { HarmonyPermissions, withHarmonyPermissions } from './permissions';
+export { parseHarmonySdkVersion, compareHarmonyApiVersions } from './sdkVersion';
+export type { HarmonySdkVersion } from './sdkVersion';

package/build/index.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withHarmonyPermissions = exports.HarmonyPermissions = exports.withRawfile = exports.withHarmonyGeneratedFiles = exports.HarmonyResources = exports.HarmonyManifest = exports.HarmonyPaths = exports.registerHarmonyConfigPlugin = exports.withWorker = exports.withStrings = exports.withRootOhPackage = exports.withRootHvigor = exports.withReactNativeConfig = exports.withProjectBuildProfile = exports.withProfiles = exports.withModuleJson = exports.withMedia = exports.withIndexPage = exports.withHvigorConfig = exports.withHarmonyResources = exports.withHarmonyMod = exports.withHarmonyDangerousMod = exports.withHarmonyBaseMods = exports.withHarmonyAutolinking = exports.withEntryOhPackage = exports.withEntryHvigor = exports.withEntryBuildProfile = exports.withEntryAbility = exports.withCppPackageProvider = exports.withColors = exports.withCMakeLists = exports.withArkTSPackageProvider = exports.withAppJson = exports.recordManagedFile = exports.HARMONY_MOD_NAMES = exports.normalizeHarmonyConfig = exports.stableHarmonyJson = exports.atomicWrite = exports.HarmonyConfigPluginError = exports.withHarmonyJsonFile = exports.createHarmonyFileMod = exports.compileHarmonyModsAsync = exports.withStaticPlugin = exports.withRunOnce = exports.withPlugins = exports.createRunOncePlugin = exports.defineExpoHarmonyConfig = void 0;
+exports.compareHarmonyApiVersions = exports.parseHarmonySdkVersion = exports.withHarmonyPermissions = exports.HarmonyPermissions = exports.withRawfile = exports.withHarmonyGeneratedFiles = exports.HarmonyResources = exports.HarmonyManifest = exports.HarmonyPaths = exports.registerHarmonyConfigPlugin = exports.withWorker = exports.withStrings = exports.withRootOhPackage = exports.withRootHvigor = exports.withReactNativeConfig = exports.withProjectBuildProfile = exports.withProfiles = exports.withModuleJson = exports.withMedia = exports.withIndexPage = exports.withHvigorConfig = exports.withHarmonyResources = exports.withHarmonyMod = exports.withHarmonyDangerousMod = exports.withHarmonyBaseMods = exports.withHarmonyAutolinking = exports.withEntryOhPackage = exports.withEntryHvigor = exports.withEntryBuildProfile = exports.withEntryAbility = exports.withAbilityStage = exports.withCppPackageProvider = exports.withColors = exports.withCMakeLists = exports.withArkTSPackageProvider = exports.withAppJson = exports.recordManagedFile = exports.HARMONY_MOD_NAMES = exports.normalizeHarmonyConfig = exports.stableHarmonyJson = exports.atomicWrite = exports.HarmonyConfigPluginError = exports.withHarmonyJsonFile = exports.createHarmonyFileMod = exports.compileHarmonyModsAsync = exports.withStaticPlugin = exports.withRunOnce = exports.withPlugins = exports.createRunOncePlugin = exports.defineExpoHarmonyConfig = void 0;
 var config_1 = require("./config");
 Object.defineProperty(exports, "defineExpoHarmonyConfig", { enumerable: true, get: function () { return config_1.defineExpoHarmonyConfig; } });
 var composition_1 = require("./composition");
@@ -61,6 +61,7 @@ Object.defineProperty(exports, "withArkTSPackageProvider", { enumerable: true, g
 Object.defineProperty(exports, "withCMakeLists", { enumerable: true, get: function () { return mods_1.withCMakeLists; } });
 Object.defineProperty(exports, "withColors", { enumerable: true, get: function () { return mods_1.withColors; } });
 Object.defineProperty(exports, "withCppPackageProvider", { enumerable: true, get: function () { return mods_1.withCppPackageProvider; } });
+Object.defineProperty(exports, "withAbilityStage", { enumerable: true, get: function () { return mods_1.withAbilityStage; } });
 Object.defineProperty(exports, "withEntryAbility", { enumerable: true, get: function () { return mods_1.withEntryAbility; } });
 Object.defineProperty(exports, "withEntryBuildProfile", { enumerable: true, get: function () { return mods_1.withEntryBuildProfile; } });
 Object.defineProperty(exports, "withEntryHvigor", { enumerable: true, get: function () { return mods_1.withEntryHvigor; } });
@@ -93,3 +94,6 @@ Object.defineProperty(exports, "withRawfile", { enumerable: true, get: function
 var permissions_1 = require("./permissions");
 Object.defineProperty(exports, "HarmonyPermissions", { enumerable: true, get: function () { return permissions_1.HarmonyPermissions; } });
 Object.defineProperty(exports, "withHarmonyPermissions", { enumerable: true, get: function () { return permissions_1.withHarmonyPermissions; } });
+var sdkVersion_1 = require("./sdkVersion");
+Object.defineProperty(exports, "parseHarmonySdkVersion", { enumerable: true, get: function () { return sdkVersion_1.parseHarmonySdkVersion; } });
+Object.defineProperty(exports, "compareHarmonyApiVersions", { enumerable: true, get: function () { return sdkVersion_1.compareHarmonyApiVersions; } });

package/build/mods.d.ts

@@ -3,7 +3,7 @@ import type { ExpoConfigWithHarmony } from './config';
 import type { HarmonyModuleJson } from './manifest';
 import type { HarmonyConfigPlugin, HarmonyModAction } from './pluginTypes';
 import type { HarmonyResourceFile } from './resources';
-export type HarmonyModName = 'dangerous' | 'reactNativeConfig' | 'appJson' | 'projectBuildProfile' | 'rootOhPackage' | 'rootHvigor' | 'hvigorConfig' | 'entryBuildProfile' | 'entryOhPackage' | 'entryHvigor' | 'moduleJson' | 'strings' | 'colors' | 'media' | 'profiles' | 'entryAbility' | 'indexPage' | 'worker' | 'arktsPackageProvider' | 'cppPackageProvider' | 'cmakeLists' | 'autolinking';
+export type HarmonyModName = 'dangerous' | 'reactNativeConfig' | 'appJson' | 'projectBuildProfile' | 'rootOhPackage' | 'rootHvigor' | 'hvigorConfig' | 'entryBuildProfile' | 'entryOhPackage' | 'entryHvigor' | 'moduleJson' | 'strings' | 'colors' | 'media' | 'profiles' | 'abilityStage' | 'entryAbility' | 'indexPage' | 'worker' | 'arktsPackageProvider' | 'cppPackageProvider' | 'cmakeLists' | 'autolinking';
 export type HarmonyJson = Record<string, unknown>;
 export type HarmonyResourceMap = Record<string, HarmonyResourceFile>;
 export type HarmonyMediaDescriptor = {
@@ -42,6 +42,7 @@ export declare const withStrings: HarmonyConfigPlugin<HarmonyModAction<HarmonyRe
 export declare const withColors: HarmonyConfigPlugin<HarmonyModAction<HarmonyResourceMap>>;
 export declare const withMedia: HarmonyConfigPlugin<HarmonyModAction<HarmonyMediaMap>>;
 export declare const withProfiles: HarmonyConfigPlugin<HarmonyModAction<HarmonyJson>>;
+export declare const withAbilityStage: HarmonyConfigPlugin<HarmonyModAction<string>>;
 export declare const withEntryAbility: HarmonyConfigPlugin<HarmonyModAction<string>>;
 export declare const withIndexPage: HarmonyConfigPlugin<HarmonyModAction<string>>;
 export declare const withWorker: HarmonyConfigPlugin<HarmonyModAction<string>>;

package/build/mods.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withHarmonyResources = exports.withHarmonyDangerousMod = exports.withProjectPatch = exports.withPreparation = exports.withCngManifest = exports.withHarmonyAutolinking = exports.withCMakeLists = exports.withCppPackageProvider = exports.withArkTSPackageProvider = exports.withWorker = exports.withIndexPage = exports.withEntryAbility = exports.withProfiles = exports.withMedia = exports.withColors = exports.withStrings = exports.withModuleJson = exports.withEntryHvigor = exports.withEntryOhPackage = exports.withEntryBuildProfile = exports.withHvigorConfig = exports.withNativeInputsStamp = exports.withRootHvigor = exports.withRootOhPackage = exports.withProjectBuildProfile = exports.withAppJson = exports.withReactNativeConfig = exports.HarmonyModNames = void 0;
+exports.withHarmonyResources = exports.withHarmonyDangerousMod = exports.withProjectPatch = exports.withPreparation = exports.withCngManifest = exports.withHarmonyAutolinking = exports.withCMakeLists = exports.withCppPackageProvider = exports.withArkTSPackageProvider = exports.withWorker = exports.withIndexPage = exports.withEntryAbility = exports.withAbilityStage = exports.withProfiles = exports.withMedia = exports.withColors = exports.withStrings = exports.withModuleJson = exports.withEntryHvigor = exports.withEntryOhPackage = exports.withEntryBuildProfile = exports.withHvigorConfig = exports.withNativeInputsStamp = exports.withRootHvigor = exports.withRootOhPackage = exports.withProjectBuildProfile = exports.withAppJson = exports.withReactNativeConfig = exports.HarmonyModNames = void 0;
 exports.recordManagedFile = recordManagedFile;
 exports.withHarmonyBaseMods = withHarmonyBaseMods;
 exports.withHarmonyMod = withHarmonyMod;
@@ -29,6 +29,7 @@ const TextMods = new Set([
     'rootHvigor',
     'nativeInputsStamp',
     'entryHvigor',
+    'abilityStage',
     'entryAbility',
     'indexPage',
     'worker',
@@ -57,6 +58,7 @@ const AllModNames = Object.freeze([
     'colors',
     'media',
     'profiles',
+    'abilityStage',
     'entryAbility',
     'indexPage',
     'worker',
@@ -397,6 +399,8 @@ const withMedia = (config, action) => withHarmonyMod(config, ['media', action]);
 exports.withMedia = withMedia;
 const withProfiles = (config, action) => withHarmonyMod(config, ['profiles', action]);
 exports.withProfiles = withProfiles;
+const withAbilityStage = (config, action) => withHarmonyMod(config, ['abilityStage', action]);
+exports.withAbilityStage = withAbilityStage;
 const withEntryAbility = (config, action) => withHarmonyMod(config, ['entryAbility', action]);
 exports.withEntryAbility = withEntryAbility;
 const withIndexPage = (config, action) => withHarmonyMod(config, ['indexPage', action]);

package/build/normalizeConfig.d.ts

@@ -16,7 +16,7 @@ interface NormalizedHarmonyConfig {
     querySchemes: string[];
     signingConfigFile?: string;
     skills: NonNullable<HarmonyConfig['skills']>;
-    targetApiVersion: number;
+    targetApiVersion: number | string;
     targetSdkVersionString: string;
     vendor: string;
     versionCode: number;

package/build/normalizeConfig.js

@@ -4,6 +4,7 @@ exports.normalizePermission = normalizePermission;
 exports.normalizeHarmonyConfig = normalizeHarmonyConfig;
 const errors_1 = require("./errors");
 const resources_1 = require("./resources");
+const sdkVersion_1 = require("./sdkVersion");
 const BundlePattern = /^[A-Za-z][A-Za-z0-9_]*(\.[A-Za-z][A-Za-z0-9_]*){2,}$/;
 const IdentifierPattern = /^[A-Za-z][A-Za-z0-9_]*$/;
 const ColorPattern = /^(#[0-9A-Fa-f]{6}|#[0-9A-Fa-f]{8})$/;
@@ -16,16 +17,8 @@ const Orientations = new Set([
     'auto_rotation',
 ]);
 const DeviceTypes = new Set(['phone', 'tablet', '2in1']);
-const MinimumApi = 13;
+const MinimumApi = 20;
 const TargetApi = 24;
-const SdkVersions = new Map([
-    [13, '5.0.1(13)'],
-    [14, '5.0.2(14)'],
-    [20, '6.0.0(20)'],
-    [21, '6.0.1(21)'],
-    [23, '6.1.0(23)'],
-    [24, '6.1.1(24)'],
-]);
 class HarmonyConfigError extends errors_1.HarmonyConfigPluginError {
     constructor(message) {
         super('ERR_HARMONY_CONFIG_INVALID', message, { operation: 'normalize-config' });
@@ -56,43 +49,6 @@ function normalizeColor(value, field, fallback) {
     }
     return (0, resources_1.toArgb)(color);
 }
-function parseSdkApi(value, field) {
-    if (value === undefined)
-        return null;
-    if (typeof value === 'number' && Number.isSafeInteger(value) && value > 0)
-        return value;
-    if (typeof value !== 'string') {
-        throw new HarmonyConfigError(`harmony.${field} must be a positive API number or an SDK label.`);
-    }
-    const match = /\((\d+)\)$/u.exec(value.trim());
-    const api = Number(match?.[1]);
-    if (!match || !Number.isSafeInteger(api) || api <= 0) {
-        throw new HarmonyConfigError(`harmony.${field} must end with its API level in parentheses, for example "6.0.0(20)".`);
-    }
-    return api;
-}
-function resolveSdkVersion(api, field, value) {
-    if (value !== undefined) {
-        if (typeof value === 'number' && Number.isSafeInteger(value) && value > 0) {
-            if (value !== api) {
-                throw new HarmonyConfigError(`harmony.${field} is API ${value}, but the configured API level is ${api}.`);
-            }
-        }
-        else {
-            const version = readString(value, `harmony.${field}`);
-            const parsed = parseSdkApi(version, field);
-            if (parsed !== api) {
-                throw new HarmonyConfigError(`harmony.${field} describes API ${parsed}, but the configured API level is ${api}.`);
-            }
-            return version;
-        }
-    }
-    const version = SdkVersions.get(api);
-    if (!version) {
-        throw new HarmonyConfigError(`Harmony API ${api} has no built-in SDK label. Set harmony.${field} explicitly so new SDK releases do not require a package update.`);
-    }
-    return version;
-}
 function normalizeStringArray(value, field, allowed) {
     if (!Array.isArray(value) || value.length === 0) {
         throw new HarmonyConfigError(`${field} must be a non-empty array.`);
@@ -190,13 +146,19 @@ function normalizeHarmonyConfig(config) {
     }
     const version = readString(harmony.versionName, 'harmony.versionName', config.version || '1.0.0');
     const code = readPositiveInteger(harmony.versionCode, 'versionCode', 1);
-    const target = readPositiveInteger(harmony.targetApiVersion, 'targetApiVersion', parseSdkApi(harmony.targetSdkVersion, 'targetSdkVersion') ?? TargetApi);
-    const compatible = readPositiveInteger(parseSdkApi(harmony.compatibleSdkVersion, 'compatibleSdkVersion') ?? undefined, 'compatibleSdkVersion', MinimumApi);
-    if (compatible < MinimumApi) {
+    const target = (0, sdkVersion_1.parseHarmonySdkVersion)(harmony.targetSdkVersion ?? harmony.targetApiVersion ?? TargetApi, 'harmony.targetSdkVersion');
+    if (harmony.targetApiVersion !== undefined) {
+        const alias = (0, sdkVersion_1.parseHarmonySdkVersion)(harmony.targetApiVersion, 'harmony.targetApiVersion');
+        if ((0, sdkVersion_1.compareHarmonyApiVersions)(alias.api, target.api) !== 0) {
+            throw new HarmonyConfigError('harmony.targetApiVersion conflicts with harmony.targetSdkVersion.');
+        }
+    }
+    const compatible = (0, sdkVersion_1.parseHarmonySdkVersion)(harmony.compatibleSdkVersion ?? MinimumApi, 'harmony.compatibleSdkVersion');
+    if ((0, sdkVersion_1.compareHarmonyApiVersions)(compatible.api, MinimumApi) < 0) {
         throw new HarmonyConfigError(`Harmony compatible API must be ${MinimumApi} or newer.`);
     }
-    if (compatible > target) {
-        throw new HarmonyConfigError('Harmony compatibleSdkVersion cannot exceed targetApiVersion.');
+    if ((0, sdkVersion_1.compareHarmonyApiVersions)(compatible.api, target.api) > 0) {
+        throw new HarmonyConfigError('Harmony compatibleSdkVersion cannot exceed targetSdkVersion.');
     }
     const orientation = harmony.orientation || config.orientation || 'default';
     if (!Orientations.has(orientation)) {
@@ -211,7 +173,7 @@ function normalizeHarmonyConfig(config) {
         ? ['arm64-v8a', 'x86_64']
         : normalizeStringArray(harmony.abiFilters, 'harmony.abiFilters');
     for (const abi of abis) {
-        if (!/^[A-Za-z0-9_-]+$/.test(abi)) {
+        if (!['arm64-v8a', 'x86_64'].includes(abi)) {
             throw new HarmonyConfigError(`Invalid Harmony ABI filter: ${abi}`);
         }
     }
@@ -219,6 +181,10 @@ function normalizeHarmonyConfig(config) {
     if (!permissions.some(permission => permission.name === 'ohos.permission.INTERNET')) {
         permissions.unshift({ name: 'ohos.permission.INTERNET' });
     }
+    if (config.updates?.checkAutomatically === 'WIFI_ONLY'
+        && !permissions.some(permission => permission.name === 'ohos.permission.GET_NETWORK_INFO')) {
+        permissions.push({ name: 'ohos.permission.GET_NETWORK_INFO' });
+    }
     const schemes = readExpoSchemes(config);
     let skills = (harmony.skills || []).map(normalizeSkill);
     for (const scheme of schemes) {
@@ -250,7 +216,7 @@ function normalizeHarmonyConfig(config) {
         abilityName: ability,
         backgroundColor: background,
         bundleName: bundle,
-        compatibleSdkVersionString: resolveSdkVersion(compatible, 'compatibleSdkVersion', harmony.compatibleSdkVersion),
+        compatibleSdkVersionString: compatible.native,
         deviceTypes: devices,
         icon: harmony.icon || config.icon,
         label: readString(harmony.label, 'harmony.label', config.name),
@@ -261,8 +227,8 @@ function normalizeHarmonyConfig(config) {
         querySchemes: queries,
         signingConfigFile: signing,
         skills,
-        targetApiVersion: target,
-        targetSdkVersionString: resolveSdkVersion(target, 'targetSdkVersion', harmony.targetSdkVersion),
+        targetApiVersion: target.api,
+        targetSdkVersionString: target.native,
         vendor: readString(harmony.vendor, 'harmony.vendor', 'expo-harmony'),
         versionCode: code,
         versionName: version,

package/build/paths.d.ts

@@ -9,6 +9,7 @@ export interface HarmonyManagedPaths {
     readonly entryHvigor: string;
     readonly moduleJson: string;
     readonly profiles: string;
+    readonly abilityStage: string;
     readonly entryAbility: string;
     readonly indexPage: string;
     readonly worker: string;

package/build/paths.js

@@ -24,6 +24,7 @@ const ManagedPaths = Object.freeze({
     entryHvigor: 'entry/hvigorfile.ts',
     moduleJson: 'entry/src/main/module.json5',
     profiles: 'entry/src/main/resources/base/profile/main_pages.json',
+    abilityStage: 'entry/src/main/ets/abilitystage/EntryAbilityStage.ets',
     entryAbility: 'entry/src/main/ets/entryability/EntryAbility.ets',
     indexPage: 'entry/src/main/ets/pages/Index.ets',
     worker: 'entry/src/main/ets/workers/RNOHWorker.ets',

package/build/sdkVersion.d.ts

@@ -0,0 +1,6 @@
+export interface HarmonySdkVersion {
+    api: number | string;
+    native: string;
+}
+export declare function parseHarmonySdkVersion(value: unknown, field?: string): HarmonySdkVersion;
+export declare function compareHarmonyApiVersions(left: number | string, right: number | string): number;

package/build/sdkVersion.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseHarmonySdkVersion = parseHarmonySdkVersion;
+exports.compareHarmonyApiVersions = compareHarmonyApiVersions;
+const errors_1 = require("./errors");
+const Labels = new Map([
+    [13, '5.0.1(13)'], [14, '5.0.2(14)'], [20, '6.0.0(20)'],
+    [21, '6.0.1(21)'], [23, '6.1.0(23)'], [24, '6.1.1(24)'],
+]);
+function parseHarmonySdkVersion(value, field = 'SDK version') {
+    if (typeof value === 'number') {
+        if (!Number.isSafeInteger(value) || value < 1 || value > 999) {
+            throw new errors_1.HarmonyConfigPluginError('ERR_HARMONY_CONFIG_INVALID', `${field}: expected a positive API level.`);
+        }
+        if (value >= 26)
+            return { api: `${value}.0.0`, native: `${value}.0.0` };
+        const native = Labels.get(value);
+        if (!native) {
+            throw new errors_1.HarmonyConfigPluginError('ERR_HARMONY_CONFIG_INVALID', `${field}: API ${value} requires an explicit HarmonyOS SDK label.`);
+        }
+        return { api: value, native };
+    }
+    if (typeof value !== 'string') {
+        throw new errors_1.HarmonyConfigPluginError('ERR_HARMONY_CONFIG_INVALID', `${field}: expected an API number or HarmonyOS SDK version.`);
+    }
+    const version = value.trim();
+    const dotted = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/.exec(version);
+    if (dotted && Number(dotted[1]) >= 26
+        && dotted.slice(1).every(part => String(Number(part)) === part)) {
+        return { api: version, native: version };
+    }
+    const label = /^\d+\.\d+\.\d+\(([1-9]\d*)\)$/.exec(version);
+    if (label && Number(label[1]) < 26) {
+        const api = Number(label[1]);
+        const known = Labels.get(api);
+        if (known && known !== version) {
+            throw new errors_1.HarmonyConfigPluginError('ERR_HARMONY_CONFIG_INVALID', `${field}: API ${api} uses SDK label ${known}.`);
+        }
+        return { api, native: version };
+    }
+    throw new errors_1.HarmonyConfigPluginError('ERR_HARMONY_CONFIG_INVALID', `${field}: expected an SDK label such as "6.1.1(24)", or a dotted API version such as "26.0.0".`);
+}
+function compareHarmonyApiVersions(left, right) {
+    const a = String(left).split('.').map(Number);
+    const b = String(right).split('.').map(Number);
+    for (let i = 0; i < 3; i++) {
+        const delta = (a[i] ?? 0) - (b[i] ?? 0);
+        if (delta)
+            return delta;
+    }
+    return 0;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo-harmony/config-plugins",
-  "version": "55.0.10-harmony.3",
+  "version": "55.0.10-harmony.5",
   "keywords": [
     "react-native",
     "expo",
@@ -46,9 +46,6 @@
     "@expo/config-types": "^55.0.5",
     "json5": "2.2.3"
   },
-  "peerDependencies": {
-    "@expo/config": "55.0.17"
-  },
   "devDependencies": {
     "@types/node": "18.19.0",
     "typescript": "^6.0.3"

package/src/config.ts

@@ -34,6 +34,7 @@ export interface HarmonyConfig {
   vendor?: string;
   versionCode?: number;
   versionName?: string;
+  /** @deprecated Configure targetSdkVersion in @expo-harmony/expo-build-properties. */
   targetApiVersion?: number;
   targetSdkVersion?: number | string;
   compatibleSdkVersion?: number | string;

package/src/index.ts

@@ -30,6 +30,7 @@ export {
   withCMakeLists,
   withColors,
   withCppPackageProvider,
+  withAbilityStage,
   withEntryAbility,
   withEntryBuildProfile,
   withEntryHvigor,
@@ -77,3 +78,6 @@ export type { HarmonyResourceFile, HarmonyResourceItem } from './resources';
 export { withHarmonyGeneratedFiles, withRawfile } from './generatedFiles';
 export type { HarmonyFileDescriptor, HarmonyFileMap, HarmonyGeneratedFilesOptions } from './generatedFiles';
 export { HarmonyPermissions, withHarmonyPermissions } from './permissions';
+
+export { parseHarmonySdkVersion, compareHarmonyApiVersions } from './sdkVersion';
+export type { HarmonySdkVersion } from './sdkVersion';

package/src/mods.ts

@@ -34,6 +34,7 @@ export type HarmonyModName
     | 'colors'
     | 'media'
     | 'profiles'
+    | 'abilityStage'
     | 'entryAbility'
     | 'indexPage'
     | 'worker'
@@ -97,6 +98,7 @@ const TextMods = new Set<FileModName>([
   'rootHvigor',
   'nativeInputsStamp',
   'entryHvigor',
+  'abilityStage',
   'entryAbility',
   'indexPage',
   'worker',
@@ -126,6 +128,7 @@ const AllModNames: readonly AnyModName[] = Object.freeze([
   'colors',
   'media',
   'profiles',
+  'abilityStage',
   'entryAbility',
   'indexPage',
   'worker',
@@ -195,6 +198,7 @@ function withFileProvider(config: ExpoConfig, name: FileModName): ExpoConfig {
 
       const context = { ...request, modFile: file, modFileExists: exists } as typeof value.modRequest;
       const result = await next!({ ...value, modRequest: context, modResults: data });
+
       assertModResults(name, result.modResults, JsonMods.has(name) ? 'json' : 'text');
 
       if (!result.modRequest.introspect) {
@@ -239,6 +243,7 @@ async function readMediaMap(root: string): Promise<HarmonyMediaMap> {
     const directory = await resolveHarmonyPath(root, relative);
 
     media[scope] = {};
+
     let names: string[] = [];
 
     try {
@@ -292,6 +297,7 @@ async function writeMediaMap(
           { operation: 'harmony.media.write' }
         );
       }
+
       if (!descriptor || typeof descriptor !== 'object' || Array.isArray(descriptor)) {
         throw new HarmonyConfigPluginError(
           'ERR_HARMONY_CONFIG_INVALID',
@@ -308,6 +314,7 @@ async function writeMediaMap(
           { operation: 'harmony.media.write' }
         );
       }
+
       if (item.replaceBase !== undefined && typeof item.replaceBase !== 'boolean') {
         throw new HarmonyConfigPluginError(
           'ERR_HARMONY_CONFIG_INVALID',
@@ -414,6 +421,7 @@ function withResourceProvider(config: ExpoConfig, name: ResourceModName): ExpoCo
         : {};
 
       const result = await next!({ ...value, modRequest: request, modResults: data });
+
       assertModResults(name, result.modResults, 'resource');
 
       if (!result.modRequest.introspect) {
@@ -563,6 +571,7 @@ export function registerMod<T, Config extends ExpoConfigWithHarmony>(
       action: action as unknown as Parameters<typeof withMod<T>>[1]['action'],
     });
     const interceptor = (carrier.mods as unknown as Record<string, Record<string, HarmonyModAction>>).harmony[name];
+
     provider.expoHarmonyLateActions.push(interceptor);
 
     return config;
@@ -605,6 +614,8 @@ export const withMedia: HarmonyConfigPlugin<HarmonyModAction<HarmonyMediaMap>>
   = (config, action) => withHarmonyMod(config, ['media', action]);
 export const withProfiles: HarmonyConfigPlugin<HarmonyModAction<HarmonyJson>>
   = (config, action) => withHarmonyMod(config, ['profiles', action]);
+export const withAbilityStage: HarmonyConfigPlugin<HarmonyModAction<string>>
+  = (config, action) => withHarmonyMod(config, ['abilityStage', action]);
 export const withEntryAbility: HarmonyConfigPlugin<HarmonyModAction<string>>
   = (config, action) => withHarmonyMod(config, ['entryAbility', action]);
 export const withIndexPage: HarmonyConfigPlugin<HarmonyModAction<string>>

package/src/normalizeConfig.ts

@@ -7,6 +7,7 @@ import type {
 } from './config';
 import { HarmonyConfigPluginError } from './errors';
 import { toArgb } from './resources';
+import { compareHarmonyApiVersions, parseHarmonySdkVersion } from './sdkVersion';
 
 type HarmonyExpoConfig = ExpoConfigWithHarmony;
 
@@ -26,7 +27,7 @@ interface NormalizedHarmonyConfig {
   querySchemes: string[];
   signingConfigFile?: string;
   skills: NonNullable<HarmonyConfig['skills']>;
-  targetApiVersion: number;
+  targetApiVersion: number | string;
   targetSdkVersionString: string;
   vendor: string;
   versionCode: number;
@@ -45,16 +46,8 @@ const Orientations = new Set([
   'auto_rotation',
 ]);
 const DeviceTypes = new Set<HarmonyDeviceType>(['phone', 'tablet', '2in1']);
-const MinimumApi = 13;
+const MinimumApi = 20;
 const TargetApi = 24;
-const SdkVersions = new Map([
-  [13, '5.0.1(13)'],
-  [14, '5.0.2(14)'],
-  [20, '6.0.0(20)'],
-  [21, '6.0.1(21)'],
-  [23, '6.1.0(23)'],
-  [24, '6.1.1(24)'],
-]);
 
 class HarmonyConfigError extends HarmonyConfigPluginError {
   constructor(message: string) {
@@ -96,58 +89,6 @@ function normalizeColor(value: unknown, field: string, fallback: string): string
   return toArgb(color);
 }
 
-function parseSdkApi(value: unknown, field: string): number | null {
-  if (value === undefined) return null;
-  if (typeof value === 'number' && Number.isSafeInteger(value) && value > 0) return value;
-  if (typeof value !== 'string') {
-    throw new HarmonyConfigError(`harmony.${field} must be a positive API number or an SDK label.`);
-  }
-
-  const match = /\((\d+)\)$/u.exec(value.trim());
-  const api = Number(match?.[1]);
-
-  if (!match || !Number.isSafeInteger(api) || api <= 0) {
-    throw new HarmonyConfigError(
-      `harmony.${field} must end with its API level in parentheses, for example "6.0.0(20)".`
-    );
-  }
-
-  return api;
-}
-
-function resolveSdkVersion(api: number, field: string, value?: unknown): string {
-  if (value !== undefined) {
-    if (typeof value === 'number' && Number.isSafeInteger(value) && value > 0) {
-      if (value !== api) {
-        throw new HarmonyConfigError(
-          `harmony.${field} is API ${value}, but the configured API level is ${api}.`
-        );
-      }
-    } else {
-      const version = readString(value, `harmony.${field}`);
-      const parsed = parseSdkApi(version, field);
-
-      if (parsed !== api) {
-        throw new HarmonyConfigError(
-          `harmony.${field} describes API ${parsed}, but the configured API level is ${api}.`
-        );
-      }
-
-      return version;
-    }
-  }
-
-  const version = SdkVersions.get(api);
-
-  if (!version) {
-    throw new HarmonyConfigError(
-      `Harmony API ${api} has no built-in SDK label. Set harmony.${field} explicitly so new SDK releases do not require a package update.`
-    );
-  }
-
-  return version;
-}
-
 function normalizeStringArray<T extends string = string>(
   value: unknown,
   field: string,
@@ -286,24 +227,25 @@ function normalizeHarmonyConfig(config: HarmonyExpoConfig): NormalizedHarmonyCon
   const version = readString(harmony.versionName, 'harmony.versionName', config.version || '1.0.0');
   const code = readPositiveInteger(harmony.versionCode, 'versionCode', 1);
 
-  const target = readPositiveInteger(
-    harmony.targetApiVersion,
-    'targetApiVersion',
-    parseSdkApi(harmony.targetSdkVersion, 'targetSdkVersion') ?? TargetApi
-  );
-  const compatible = readPositiveInteger(
-    parseSdkApi(harmony.compatibleSdkVersion, 'compatibleSdkVersion') ?? undefined,
-    'compatibleSdkVersion',
-    MinimumApi
+  const target = parseHarmonySdkVersion(
+    harmony.targetSdkVersion ?? harmony.targetApiVersion ?? TargetApi, 'harmony.targetSdkVersion'
   );
 
-  if (compatible < MinimumApi) {
-    throw new HarmonyConfigError(
-      `Harmony compatible API must be ${MinimumApi} or newer.`
-    );
+  if (harmony.targetApiVersion !== undefined) {
+    const alias = parseHarmonySdkVersion(harmony.targetApiVersion, 'harmony.targetApiVersion');
+
+    if (compareHarmonyApiVersions(alias.api, target.api) !== 0) {
+      throw new HarmonyConfigError('harmony.targetApiVersion conflicts with harmony.targetSdkVersion.');
+    }
+  }
+
+  const compatible = parseHarmonySdkVersion(harmony.compatibleSdkVersion ?? MinimumApi, 'harmony.compatibleSdkVersion');
+
+  if (compareHarmonyApiVersions(compatible.api, MinimumApi) < 0) {
+    throw new HarmonyConfigError(`Harmony compatible API must be ${MinimumApi} or newer.`);
   }
-  if (compatible > target) {
-    throw new HarmonyConfigError('Harmony compatibleSdkVersion cannot exceed targetApiVersion.');
+  if (compareHarmonyApiVersions(compatible.api, target.api) > 0) {
+    throw new HarmonyConfigError('Harmony compatibleSdkVersion cannot exceed targetSdkVersion.');
   }
 
   const orientation = harmony.orientation || config.orientation || 'default';
@@ -327,7 +269,7 @@ function normalizeHarmonyConfig(config: HarmonyExpoConfig): NormalizedHarmonyCon
     : normalizeStringArray(harmony.abiFilters, 'harmony.abiFilters');
 
   for (const abi of abis) {
-    if (!/^[A-Za-z0-9_-]+$/.test(abi)) {
+    if (!['arm64-v8a', 'x86_64'].includes(abi)) {
       throw new HarmonyConfigError(`Invalid Harmony ABI filter: ${abi}`);
     }
   }
@@ -338,6 +280,11 @@ function normalizeHarmonyConfig(config: HarmonyExpoConfig): NormalizedHarmonyCon
     permissions.unshift({ name: 'ohos.permission.INTERNET' });
   }
 
+  if (config.updates?.checkAutomatically === 'WIFI_ONLY'
+    && !permissions.some(permission => permission.name === 'ohos.permission.GET_NETWORK_INFO')) {
+    permissions.push({ name: 'ohos.permission.GET_NETWORK_INFO' });
+  }
+
   const schemes = readExpoSchemes(config);
   let skills = (harmony.skills || []).map(normalizeSkill);
 
@@ -378,11 +325,7 @@ function normalizeHarmonyConfig(config: HarmonyExpoConfig): NormalizedHarmonyCon
     abilityName: ability,
     backgroundColor: background,
     bundleName: bundle,
-    compatibleSdkVersionString: resolveSdkVersion(
-      compatible,
-      'compatibleSdkVersion',
-      harmony.compatibleSdkVersion
-    ),
+    compatibleSdkVersionString: compatible.native,
     deviceTypes: devices,
     icon: harmony.icon || config.icon,
     label: readString(harmony.label, 'harmony.label', config.name),
@@ -393,12 +336,8 @@ function normalizeHarmonyConfig(config: HarmonyExpoConfig): NormalizedHarmonyCon
     querySchemes: queries,
     signingConfigFile: signing,
     skills,
-    targetApiVersion: target,
-    targetSdkVersionString: resolveSdkVersion(
-      target,
-      'targetSdkVersion',
-      harmony.targetSdkVersion
-    ),
+    targetApiVersion: target.api,
+    targetSdkVersionString: target.native,
     vendor: readString(harmony.vendor, 'harmony.vendor', 'expo-harmony'),
     versionCode: code,
     versionName: version,

package/src/paths.ts

@@ -14,6 +14,7 @@ export interface HarmonyManagedPaths {
   readonly entryHvigor: string;
   readonly moduleJson: string;
   readonly profiles: string;
+  readonly abilityStage: string;
   readonly entryAbility: string;
   readonly indexPage: string;
   readonly worker: string;
@@ -60,6 +61,7 @@ const ManagedPaths: HarmonyManagedPaths & { readonly nativeInputsStamp: string }
   entryHvigor: 'entry/hvigorfile.ts',
   moduleJson: 'entry/src/main/module.json5',
   profiles: 'entry/src/main/resources/base/profile/main_pages.json',
+  abilityStage: 'entry/src/main/ets/abilitystage/EntryAbilityStage.ets',
   entryAbility: 'entry/src/main/ets/entryability/EntryAbility.ets',
   indexPage: 'entry/src/main/ets/pages/Index.ets',
   worker: 'entry/src/main/ets/workers/RNOHWorker.ets',
@@ -114,6 +116,7 @@ export async function assertNoExternalSymlink(root: string, target: string): Pro
     current = path.join(current, segment);
 
     let stat: fs.Stats;
+
     try {
       stat = await fs.promises.lstat(current);
     } catch (cause) {
@@ -173,6 +176,7 @@ export async function resolveProjectPath(
   name: keyof HarmonyProjectPaths
 ): Promise<string> {
   const candidates = ProjectPathCandidates[name] || [ProjectPaths[name]];
+
   for (const candidate of candidates) {
     if (fs.existsSync(path.join(root, candidate))) return resolveHarmonyPath(root, candidate);
   }

package/src/sdkVersion.ts

@@ -0,0 +1,69 @@
+import { HarmonyConfigPluginError } from './errors';
+
+export interface HarmonySdkVersion {
+  api: number | string;
+  native: string;
+}
+
+const Labels = new Map([
+  [13, '5.0.1(13)'], [14, '5.0.2(14)'], [20, '6.0.0(20)'],
+  [21, '6.0.1(21)'], [23, '6.1.0(23)'], [24, '6.1.1(24)'],
+]);
+
+export function parseHarmonySdkVersion(value: unknown, field = 'SDK version'): HarmonySdkVersion {
+  if (typeof value === 'number') {
+    if (!Number.isSafeInteger(value) || value < 1 || value > 999) {
+      throw new HarmonyConfigPluginError('ERR_HARMONY_CONFIG_INVALID', `${field}: expected a positive API level.`);
+    }
+    if (value >= 26) return { api: `${value}.0.0`, native: `${value}.0.0` };
+
+    const native = Labels.get(value);
+
+    if (!native) {
+      throw new HarmonyConfigPluginError('ERR_HARMONY_CONFIG_INVALID', `${field}: API ${value} requires an explicit HarmonyOS SDK label.`);
+    }
+
+    return { api: value, native };
+  }
+  if (typeof value !== 'string') {
+    throw new HarmonyConfigPluginError('ERR_HARMONY_CONFIG_INVALID', `${field}: expected an API number or HarmonyOS SDK version.`);
+  }
+
+  const version = value.trim();
+  const dotted = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/.exec(version);
+
+  if (dotted && Number(dotted[1]) >= 26
+    && dotted.slice(1).every(part => String(Number(part)) === part)) {
+    return { api: version, native: version };
+  }
+
+  const label = /^\d+\.\d+\.\d+\(([1-9]\d*)\)$/.exec(version);
+
+  if (label && Number(label[1]) < 26) {
+    const api = Number(label[1]);
+    const known = Labels.get(api);
+
+    if (known && known !== version) {
+      throw new HarmonyConfigPluginError('ERR_HARMONY_CONFIG_INVALID', `${field}: API ${api} uses SDK label ${known}.`);
+    }
+
+    return { api, native: version };
+  }
+
+  throw new HarmonyConfigPluginError(
+    'ERR_HARMONY_CONFIG_INVALID',
+    `${field}: expected an SDK label such as "6.1.1(24)", or a dotted API version such as "26.0.0".`
+  );
+}
+
+export function compareHarmonyApiVersions(left: number | string, right: number | string): number {
+  const a = String(left).split('.').map(Number);
+  const b = String(right).split('.').map(Number);
+
+  for (let i = 0; i < 3; i++) {
+    const delta = (a[i] ?? 0) - (b[i] ?? 0);
+    if (delta) return delta;
+  }
+
+  return 0;
+}