@expo-harmony/template 55.0.0-harmony.3 → 55.0.0-harmony.5

package/harmony/build-profile.json5

@@ -3,7 +3,7 @@
     "products": [
       {
         "name": "default",
-        "compatibleSdkVersion": "5.0.1(13)",
+        "compatibleSdkVersion": "6.0.0(20)",
         "targetSdkVersion": "6.1.1(24)",
         "runtimeOS": "HarmonyOS",
         "buildOption": {

package/harmony/entry/src/main/ets/PackageProvider.ets

@@ -1,6 +1,20 @@
-import type { RNPackage, RNPackageContext } from '@rnoh/react-native-openharmony';
+import { ExpoReactHostFactory } from '@expo-harmony/expo';
+import { ExpoRuntimeConfig } from '@expo-harmony/expo-modules-core';
+import type { RNInstanceOptions, RNPackage, RNPackageContext } from '@rnoh/react-native-openharmony';
 import { createRNOHPackages } from './RNOHPackagesFactory';
+import { expoHarmonyHostProvider } from './generated/ExpoHarmonyHostProvider';
 
-export function getRNOHPackages(context: RNPackageContext): RNPackage[] {
-  return createRNOHPackages(context);
+export function getRNOHPackages(context: RNPackageContext, runtimeConfig?: ExpoRuntimeConfig): RNPackage[] {
+  return createRNOHPackages(context, runtimeConfig);
 }
+
+export const expoReactHost = ExpoReactHostFactory.getDefaultReactHost({
+  bundlePath: 'hermes_bundle.hbc',
+  workerScriptUrl: 'entry/ets/workers/RNOHWorker.ets',
+  provider: expoHarmonyHostProvider,
+  createRNInstanceOptions: (headless: boolean): RNInstanceOptions => ({
+    name: "__EXPO_HARMONY_APP_LABEL__",
+    createRNPackages: (context: RNPackageContext): RNPackage[] => getRNOHPackages(context, new ExpoRuntimeConfig({ isHeadless: headless })),
+    fontResourceByFontFamily: {},
+  }),
+});

package/harmony/entry/src/main/ets/abilitystage/EntryAbilityStage.ets

@@ -0,0 +1,14 @@
+import { ExpoAbilityStage } from '@expo-harmony/expo';
+import type { ExpoHarmonyHostProvider, ExpoReactHost } from '@expo-harmony/expo';
+import { expoReactHost } from '../PackageProvider';
+import { expoHarmonyHostProvider } from '../generated/ExpoHarmonyHostProvider';
+
+export default class EntryAbilityStage extends ExpoAbilityStage {
+  protected override getExpoReactHost(): ExpoReactHost {
+    return expoReactHost;
+  }
+
+  protected override getExpoHarmonyHostProvider(): ExpoHarmonyHostProvider {
+    return expoHarmonyHostProvider;
+  }
+}

package/harmony/entry/src/main/ets/entryability/EntryAbility.ets

@@ -2,8 +2,8 @@
  * Automatically generated by @expo-harmony/prebuild-config.
  */
 
-import type { ExpoHarmonyHostProvider } from '@expo-harmony/expo-modules-core/Autolinking';
-import { ExpoRNAbility } from '@expo-harmony/expo-modules-core/Autolinking';
+import type { ExpoHarmonyHostProvider } from '@expo-harmony/expo';
+import { ExpoRNAbility } from '@expo-harmony/expo';
 import { expoHarmonyHostProvider } from '../generated/ExpoHarmonyHostProvider';
 
 export default class __EXPO_HARMONY_ABILITY_NAME__ extends ExpoRNAbility {

package/harmony/entry/src/main/ets/pages/Index.ets

@@ -2,38 +2,25 @@
  * Automatically generated by @expo-harmony/prebuild-config.
  */
 
-import type resmgr from '@ohos.resourceManager';
 import {
-  MetroJSBundleProvider,
   RNOHCoreContext,
   RNOHErrorDialog,
-  ResourceJSBundleProvider,
 } from '@rnoh/react-native-openharmony';
-import { ExpoRNApp } from '@expo-harmony/expo-modules-core';
-import { getRNOHPackages } from '../PackageProvider';
+import type { RNInstanceOptions } from '@rnoh/react-native-openharmony';
+import { ExpoRNApp } from '@expo-harmony/expo';
+import { expoReactHost } from '../PackageProvider';
 import { ExpoHarmonyRootView } from '../generated/ExpoHarmonyHostProvider';
 
-class InMemoryResourceJSBundleProvider extends ResourceJSBundleProvider {
-  private readonly ownedResourceManager: resmgr.ResourceManager;
-  private readonly ownedResourcePath: string;
-
-  constructor(resourceManager: resmgr.ResourceManager, resourcePath: string) {
-    super(resourceManager, resourcePath);
-    this.ownedResourceManager = resourceManager;
-    this.ownedResourcePath = resourcePath;
-  }
-
-  override async getBundle(): Promise<ArrayBuffer> {
-    const bytes = await this.ownedResourceManager.getRawFileContent(this.ownedResourcePath);
-    return bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength);
-  }
-}
-
 @Entry
 @Component
 struct Index {
   @StorageLink('RNOHCoreContext') private rnohCoreContext: RNOHCoreContext | undefined = undefined;
 
+  private instanceOptions(): RNInstanceOptions {
+    const options = expoReactHost.createRNInstanceOptions();
+    return options;
+  }
+
   build(): void {
     Stack() {
       ExpoHarmonyRootView()
@@ -43,19 +30,13 @@ struct Index {
             RNOHErrorDialog({ ctx: this.rnohCoreContext });
           }
           ExpoRNApp({
-            rnInstanceConfig: {
-              name: "__EXPO_HARMONY_APP_LABEL__",
-              createRNPackages: getRNOHPackages,
-              fontResourceByFontFamily: {},
-              enableDebugger: this.rnohCoreContext.isDebugModeEnabled,
-            },
+            reactHost: expoReactHost,
+            rnInstanceConfig: this.instanceOptions(),
             appKey: 'main',
-            jsBundleProvider: this.rnohCoreContext.isDebugModeEnabled
-              ? new MetroJSBundleProvider()
-              : new InMemoryResourceJSBundleProvider(
-                this.rnohCoreContext.uiAbilityContext.resourceManager,
-                'hermes_bundle.hbc',
-              ),
+            jsBundleProvider: expoReactHost.createJSBundleProvider(
+              this.rnohCoreContext.uiAbilityContext,
+              this.rnohCoreContext.isDebugModeEnabled,
+            ),
           });
         }
       }

package/harmony/entry/src/main/module.json5

@@ -2,6 +2,7 @@
   "module": {
     "name": "entry",
     "type": "entry",
+    "srcEntry": "./ets/abilitystage/EntryAbilityStage.ets",
     "description": "$string:expo_harmony_module_desc",
     "mainElement": "EntryAbility",
     "deviceTypes": ["phone", "tablet"],
@@ -13,12 +14,6 @@
         "name": "ohos.permission.INTERNET"
       }
     ],
-    "metadata": [
-      {
-        "name": "expo.harmony.userInterfaceStyle",
-        "value": "light"
-      }
-    ],
     "abilities": [
       {
         "name": "EntryAbility",

package/harmony/hvigorfile.ts

@@ -4,6 +4,7 @@ import { createRequire } from 'node:module';
 import path from 'node:path';
 import { hvigor } from '@ohos/hvigor';
 import { appTasks, OhosPluginId } from '@ohos/hvigor-ohos-plugin';
+import { publishHarmonyNativeRuntime } from '@expo-harmony/cli/native-build';
 import { createRNOHProjectPlugin } from '@rnoh/hvigor-plugin';
 
 import { writeStamp } from './native-inputs-stamp';
@@ -20,21 +21,6 @@ const HermesMagic = 'c61fbc03c103191f';
 let restoreBundle: (() => void) | null = null;
 
 writeStamp(ProjectRoot, HarmonyRoot);
-hvigor.nodesEvaluated(async () => {
-  await refreshExpoConstantsResource();
-});
-
-async function refreshExpoConstantsResource(): Promise<void> {
-  let plugin: { refreshExpoConstantsResourceAsync?: (projectRoot: string, harmonyRoot: string) => Promise<string> };
-  try {
-    plugin = ProjectRequire('@expo-harmony/expo-constants/plugin/withConstants');
-  } catch (error: unknown) {
-    if (error && typeof error === 'object' && 'code' in error && error.code === 'MODULE_NOT_FOUND') return;
-    throw error;
-  }
-
-  await plugin.refreshExpoConstantsResourceAsync?.(ProjectRoot, HarmonyRoot);
-}
 
 function findNodeModules(): string {
   let directory = ProjectRoot;
@@ -205,8 +191,11 @@ const BundlerPlugin = {
     hvigor.nodesEvaluated(() => {
       const appContext = node.getContext(OhosPluginId.OHOS_APP_PLUGIN);
       const buildMode = appContext.getBuildMode();
+      publishHarmonyNativeRuntime(ProjectRoot, buildMode === 'release' ? 'release' : 'debug');
 
-      if (buildMode !== 'release') stashBundle();
+      const config = JSON.parse(fs.readFileSync(path.join(path.dirname(EmbeddedBundle), 'expo-updates/config.json'), 'utf8'));
+      const embedded = buildMode === 'release' || config.useNativeDebug === true;
+      if (!embedded) stashBundle();
 
       node.subNodes((moduleNode) => {
         const hapContext = moduleNode.getContext(OhosPluginId.OHOS_HAP_PLUGIN);
@@ -217,7 +206,7 @@ const BundlerPlugin = {
           moduleNode.registerTask({
             name: `${targetName}@ExpoHarmonyBundle`,
             run: () => {
-              if (buildMode === 'release') bundleRelease();
+              if (embedded) bundleRelease();
             },
             dependencies: [`${targetName}@ProcessResource`],
             postDependencies: [`${targetName}@CompileResource`],

package/harmony/native-inputs-stamp.ts

@@ -2,7 +2,7 @@ import crypto from 'node:crypto';
 import fs from 'node:fs';
 import path from 'node:path';
 
-import { fingerprintHarmonyNativeInputsSync } from '@expo-harmony/config-plugins/native-inputs';
+import { fingerprintHarmonyNativeInputsSync } from '@expo-harmony/config-plugins/internal/native-inputs';
 
 const StampPath = '.hvigor/expo-harmony/native-inputs.cmake';
 
@@ -16,16 +16,16 @@ function readFileIfPresent(file: string): Buffer | null {
   }
 }
 
-export function writeStamp(projectRoot: string, harmonyRoot: string): void {
-  const { artifactCount, fingerprint } = fingerprintHarmonyNativeInputsSync({
-    lockfile: path.join(harmonyRoot, 'oh-package-lock.json5'),
-    manifest: path.join(harmonyRoot, 'oh-package.json5'),
-    projectRoot,
+export function writeStamp(project: string, root: string): void {
+  const { artifactCount: count, fingerprint } = fingerprintHarmonyNativeInputsSync({
+    lockfile: path.join(root, 'oh-package-lock.json5'),
+    manifest: path.join(root, 'oh-package.json5'),
+    projectRoot: project,
   });
-  const file = path.join(harmonyRoot, ...StampPath.split('/'));
+  const file = path.join(root, ...StampPath.split('/'));
   const content = [
     '# Generated by @expo-harmony/template. Do not edit.',
-    `# Native HAR artifacts: ${artifactCount}`,
+    `# Native HAR artifacts: ${count}`,
     `add_compile_definitions(EXPO_HARMONY_NATIVE_INPUTS_SHA256_${fingerprint}=1)`,
     '',
   ].join('\n');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo-harmony/template",
-  "version": "55.0.0-harmony.3",
+  "version": "55.0.0-harmony.5",
   "keywords": [
     "react-native",
     "expo",
@@ -26,8 +26,9 @@
   },
   "dependencies": {
     "@babel/core": "7.29.7",
-    "@expo-harmony/config-plugins": "55.0.10-harmony.2",
-    "@expo-harmony/expo-modules-core": "55.0.25-harmony.2",
+    "@expo-harmony/config-plugins": "55.0.10-harmony.4",
+    "@expo-harmony/expo": "55.0.26-harmony.1",
+    "@expo-harmony/expo-modules-core": "55.0.25-harmony.3",
     "@expo/metro-config": "55.0.26",
     "@expo/metro-runtime": "55.0.12",
     "@react-native-oh/react-native-harmony": "0.84.1",