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

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

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

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

@@ -16,7 +16,7 @@ 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)'],
@@ -219,6 +219,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) {

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo-harmony/config-plugins",
-  "version": "55.0.10-harmony.3",
+  "version": "55.0.10-harmony.4",
   "keywords": [
     "react-native",
     "expo",

package/src/index.ts

@@ -30,6 +30,7 @@ export {
   withCMakeLists,
   withColors,
   withCppPackageProvider,
+  withAbilityStage,
   withEntryAbility,
   withEntryBuildProfile,
   withEntryHvigor,

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

@@ -45,7 +45,7 @@ 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)'],
@@ -338,6 +338,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);
 

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